diff options
| author | Ben Skeggs <bskeggs@nvidia.com> | 2024-07-26 14:38:25 +1000 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2024-07-27 03:05:48 +0200 |
| commit | 034142a303fed2903957b06a7c91abdff5531bcf (patch) | |
| tree | 88d6d8451f373c5e3b1da86585dd39dc0591a18c /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | 3543e84e20fbd60e02264f757c77c7dbdfd1ee4a (diff) | |
drm/nouveau: remove master
The only remaining nouveau_drm.master struct member that's being used is
the mutex that protects its object tree. Move that into nouveau_drm and
remove nouveau_drm.master entirely.
A pending series to remove the "ioctl" layer between DRM and NVKM also
removes the need for object handle lookups, and hence this mutex, but
it's still required for the moment.
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-35-bskeggs@nvidia.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index c55665faf2c1..f3da66a12dd3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -203,10 +203,11 @@ u_memcpya(uint64_t user, unsigned int nmemb, unsigned int size) struct nouveau_drm { struct nvkm_device *nvkm; struct nvif_parent parent; + struct mutex client_mutex; + struct nvif_client _client; struct nvif_device device; struct nvif_mmu mmu; - struct nouveau_cli master; struct nouveau_cli client; struct drm_device *dev; |