summaryrefslogtreecommitdiff
path: root/shared-core/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <darktama@iinet.net.au>2007-01-08 00:37:39 +1100
committerBen Skeggs <darktama@iinet.net.au>2007-01-08 00:44:02 +1100
commitfaa46122993bc5970b3d67933bd81d863a3c4762 (patch)
treea0cbd550d458c4111c6bf045082e7275ae5461f6 /shared-core/nouveau_drv.h
parentcd3711455e7e5e69448b4805bddc2adcd480c6d5 (diff)
nouveau: avoid allocating vram that's used as instance memory.
Diffstat (limited to 'shared-core/nouveau_drv.h')
-rw-r--r--shared-core/nouveau_drv.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h
index 7b366f14..6b09046c 100644
--- a/shared-core/nouveau_drv.h
+++ b/shared-core/nouveau_drv.h
@@ -120,7 +120,8 @@ typedef struct drm_nouveau_private {
int fifo_alloc_count;
struct nouveau_fifo fifos[NV_MAX_FIFO_NUMBER];
- /* RAMFC and RAMRO offsets */
+ /* RAMIN configuration, RAMFC, RAMHT and RAMRO offsets */
+ uint32_t ramin_size;
uint32_t ramht_offset;
uint32_t ramht_size;
uint32_t ramht_bits;
@@ -165,7 +166,7 @@ extern void nouveau_mem_free(struct drm_device* dev, struct mem_blo
extern int nouveau_mem_init(struct drm_device *dev);
extern void nouveau_mem_close(struct drm_device *dev);
extern int nouveau_instmem_init(struct drm_device *dev,
- uint32_t offset, uint32_t size);
+ uint32_t offset);
extern struct mem_block* nouveau_instmem_alloc(struct drm_device *dev,
uint32_t size, uint32_t align);
extern void nouveau_instmem_free(struct drm_device *dev,