Commit ffe9f1bf authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich

drm/nouveau/nvif: remove nvxx_client()

Make use of nouveau_cli.name instead of nvkm_client.name.
Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-18-bskeggs@nvidia.com
parent 455167e8
...@@ -18,9 +18,4 @@ int nvif_client_suspend(struct nvif_client *); ...@@ -18,9 +18,4 @@ int nvif_client_suspend(struct nvif_client *);
int nvif_client_resume(struct nvif_client *); int nvif_client_resume(struct nvif_client *);
/*XXX*/ /*XXX*/
#include <core/client.h>
#define nvxx_client(a) ({ \
struct nvif_client *_client = (a); \
(struct nvkm_client *)_client->object.priv; \
})
#endif #endif
...@@ -78,7 +78,7 @@ nouveau_channel_idle(struct nouveau_channel *chan) ...@@ -78,7 +78,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
if (ret) { if (ret) {
NV_PRINTK(err, cli, "failed to idle channel %d [%s]\n", NV_PRINTK(err, cli, "failed to idle channel %d [%s]\n",
chan->chid, nvxx_client(&cli->base)->name); chan->chid, cli->name);
return ret; return ret;
} }
} }
......
...@@ -644,9 +644,6 @@ nouveau_drm_device_init(struct nouveau_drm *drm) ...@@ -644,9 +644,6 @@ nouveau_drm_device_init(struct nouveau_drm *drm)
if (ret) if (ret)
goto fail_master; goto fail_master;
nvxx_client(&drm->client.base)->debug =
nvkm_dbgopt(nouveau_debug, "DRM");
INIT_LIST_HEAD(&drm->clients); INIT_LIST_HEAD(&drm->clients);
mutex_init(&drm->clients_lock); mutex_init(&drm->clients_lock);
spin_lock_init(&drm->tile.lock); spin_lock_init(&drm->tile.lock);
......
...@@ -200,7 +200,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha ...@@ -200,7 +200,7 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
else if (chan == chan->drm->channel) else if (chan == chan->drm->channel)
strcpy(fctx->name, "generic kernel channel"); strcpy(fctx->name, "generic kernel channel");
else else
strcpy(fctx->name, nvxx_client(&cli->base)->name); strcpy(fctx->name, cli->name);
kref_init(&fctx->fence_ref); kref_init(&fctx->fence_ref);
if (!priv->uevent) if (!priv->uevent)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment