drm/nouveau/nvif: remove nvxx_client()

Make use of nouveau_cli.name instead of nvkm_client.name.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-18-bskeggs@nvidia.com

diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h b/drivers/gpu/drm/nouveau/include/nvif/client.h
index 64b033222c564683ac78ff9c32f8a12412cc2132..5210007d7669475eb68a93ba1396f4006a25047a 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/client.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/client.h
@@ -18,9 +18,4 @@ int  nvif_client_suspend(struct nvif_client *);
 int  nvif_client_resume(struct nvif_client *);
 
 /*XXX*/
-#include <core/client.h>
-#define nvxx_client(a) ({                                                      \
-       struct nvif_client *_client = (a);                                     \
-       (struct nvkm_client *)_client->object.priv;                            \
-})
 #endif

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index f568ea251e3b03471e5f8f5af6aa6f7b0b7946cf..a58185171db80ab5eed79b18073d6068357b467b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -78,7 +78,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
 
                if (ret) {
                        NV_PRINTK(err, cli, "failed to idle channel %d [%s]\n",
-                                 chan->chid, nvxx_client(&cli->base)->name);
+                                 chan->chid, cli->name);
                        return ret;
                }
        }

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 950184b2c1c29cc0e54b9a47abf7f60fdf111cc6..526c16f7919632262b4c873b259c5bb2fc3de04d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -644,9 +644,6 @@ nouveau_drm_device_init(struct nouveau_drm *drm)
        if (ret)
                goto fail_master;
 
-       nvxx_client(&drm->client.base)->debug =
-               nvkm_dbgopt(nouveau_debug, "DRM");
-
        INIT_LIST_HEAD(&drm->clients);
        mutex_init(&drm->clients_lock);
        spin_lock_init(&drm->tile.lock);

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index ba469767a20fd9d203c7e2eac56250c80d1de1e8..1450fb8c57c33512eca28385dd76b59a92ee121c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -200,7 +200,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
        else if (chan == chan->drm->channel)
                strcpy(fctx->name, "generic kernel channel");
        else
-               strcpy(fctx->name, nvxx_client(&cli->base)->name);
+               strcpy(fctx->name, cli->name);
 
        kref_init(&fctx->fence_ref);
        if (!priv->uevent)