mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-13 03:50:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/nvif: remove nvxx_client()

Browse Source 
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
This commit is contained in:
Ben Skeggs
2024-07-26 14:38:08 +10:00
committed by Danilo Krummrich
parent 455167e875
commit ffe9f1bfb3
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/include/nvif/client.h
View File

@@ -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

2
drivers/gpu/drm/nouveau/nouveau_chan.c
View File

@@ -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;
}
}

3
drivers/gpu/drm/nouveau/nouveau_drm.c
View File

@@ -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);

2
drivers/gpu/drm/nouveau/nouveau_fence.c
View File

@@ -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)