drm/nouveau: protect gpuobj list + global instmem heap with spinlock

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 8ee854a4b3f5..0844f27651c0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -514,11 +514,13 @@ struct drm_nouveau_private {
 
         void __iomem *mmio;
 
+        spinlock_t ramin_lock;
         void __iomem *ramin;
         u32 ramin_size;
         u32 ramin_base;
         bool ramin_available;
-        spinlock_t ramin_lock;
+        struct drm_mm ramin_heap;
+        struct list_head gpuobj_list;
 
         struct nouveau_bo *vga_ram;
 
@@ -592,10 +594,6 @@ struct drm_nouveau_private {
         struct nouveau_gpuobj *vm_vram_pt[NV50_VM_VRAM_NR];
         int vm_vram_pt_nr;
 
-        struct drm_mm ramin_heap;
-
-        struct list_head gpuobj_list;
-
         struct nvbios vbios;
 
         struct nv04_mode_state mode_reg;