diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 8 |
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 { | |||
514 | 514 | ||
515 | void __iomem *mmio; | 515 | void __iomem *mmio; |
516 | 516 | ||
517 | spinlock_t ramin_lock; | ||
517 | void __iomem *ramin; | 518 | void __iomem *ramin; |
518 | u32 ramin_size; | 519 | u32 ramin_size; |
519 | u32 ramin_base; | 520 | u32 ramin_base; |
520 | bool ramin_available; | 521 | bool ramin_available; |
521 | spinlock_t ramin_lock; | 522 | struct drm_mm ramin_heap; |
523 | struct list_head gpuobj_list; | ||
522 | 524 | ||
523 | struct nouveau_bo *vga_ram; | 525 | struct nouveau_bo *vga_ram; |
524 | 526 | ||
@@ -592,10 +594,6 @@ struct drm_nouveau_private { | |||
592 | struct nouveau_gpuobj *vm_vram_pt[NV50_VM_VRAM_NR]; | 594 | struct nouveau_gpuobj *vm_vram_pt[NV50_VM_VRAM_NR]; |
593 | int vm_vram_pt_nr; | 595 | int vm_vram_pt_nr; |
594 | 596 | ||
595 | struct drm_mm ramin_heap; | ||
596 | |||
597 | struct list_head gpuobj_list; | ||
598 | |||
599 | struct nvbios vbios; | 597 | struct nvbios vbios; |
600 | 598 | ||
601 | struct nv04_mode_state mode_reg; | 599 | struct nv04_mode_state mode_reg; |