summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-09-01 15:24:33 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 16:20:28 +1000
commit5125bfd88608012d58652ac7ea6a03a78773200f (patch)
tree8ccb36c6a023392e3c8a9f2c4e84c74ccdcaeb44 /drivers/gpu/drm/nouveau/nouveau_drv.h
parent43efc9ce25c6956133c07394a6fa44ef2c9268a4 (diff)
downloadlwn-5125bfd88608012d58652ac7ea6a03a78773200f.tar.gz
lwn-5125bfd88608012d58652ac7ea6a03a78773200f.zip
drm/nv50: allow gpuobjs that aren't mapped into aperture
Reviewed-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index f8476f14c15c..ec1be3fc80fc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -513,8 +513,12 @@ struct drm_nouveau_private {
int flags;
void __iomem *mmio;
+
void __iomem *ramin;
- uint32_t ramin_size;
+ u32 ramin_size;
+ u32 ramin_base;
+ bool ramin_available;
+ spinlock_t ramin_lock;
struct nouveau_bo *vga_ram;