summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-12-02 16:24:20 +1000
committerBen Skeggs <bskeggs@redhat.com>2021-02-11 10:14:03 +1000
commitf5cfbd99aa63d40222826aeed4728bea9a8e9986 (patch)
tree54212b8d6f617f54b6b5f6e1224069b4ed2c8eb9 /drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
parent71ccf2a04ecf98f3abeb0ed129b59bb4b54337cd (diff)
downloadlinux-f5cfbd99aa63d40222826aeed4728bea9a8e9986.tar.bz2
drm/nouveau/fb: protect comptags with private mutex
nvkm_subdev.mutex is going away. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h')
-rw-r--r--drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index 2ecd52aec1d1..38c2a5fb418a 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -36,7 +36,11 @@ struct nvkm_fb {
struct nvkm_blob vpr_scrubber;
struct nvkm_ram *ram;
- struct nvkm_mm tags;
+
+ struct {
+ struct mutex mutex; /* protects mm and nvkm_memory::tags */
+ struct nvkm_mm mm;
+ } tags;
struct {
struct nvkm_fb_tile region[16];