On Fri, 26 Jul 2024 14:38:08 +1000
Ben Skeggs <bskeggs@xxxxxxxxxx> wrote:
Reviewed-by: Zhi Wang <zhiw@xxxxxxxxxx>
> Make use of nouveau_cli.name instead of nvkm_client.name.
>
> Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
> ---
> drivers/gpu/drm/nouveau/include/nvif/client.h | 5 -----
> drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_drm.c | 3 ---
> drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
> 4 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/include/nvif/client.h
> b/drivers/gpu/drm/nouveau/include/nvif/client.h index
> 64b033222c56..5210007d7669 100644 ---
> 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
> f568ea251e3b..a58185171db8 100644 ---
> 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
> 950184b2c1c2..526c16f79196 100644 ---
> 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
> ba469767a20f..1450fb8c57c3 100644 ---
> 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)
