diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-11-30 10:31:42 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-11-30 10:31:42 +1100 |
| commit | 80d75cf6950acf1a00a031ceb6511b26dcc9b056 (patch) | |
| tree | 77241d73a4ef58f6dff129d9184928edd09bc330 /shared-core/nouveau_fifo.c | |
| parent | b1a9a769711d83af8ab4c7ba4eec52a05a351533 (diff) | |
Use nouveau_mem.c to allocate RAMIN.
Diffstat (limited to 'shared-core/nouveau_fifo.c')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 9ff0563c..94762139 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -69,6 +69,7 @@ static int nouveau_fifo_ctx_size(drm_device_t* dev) static int nouveau_fifo_instmem_configure(drm_device_t *dev) { drm_nouveau_private_t *dev_priv = dev->dev_private; + uint32_t obj_base, obj_size; int i; /* Clear RAMIN */ @@ -123,6 +124,13 @@ static int nouveau_fifo_instmem_configure(drm_device_t *dev) dev_priv->ramfc_offset, dev_priv->ramfc_size); + obj_base = dev_priv->ramfc_offset + dev_priv->ramfc_size; + obj_size = (512*1024) - obj_base; /*XXX: probably wrong on some cards*/ + if (nouveau_instmem_init(dev, obj_base, obj_size)) + return 1; + DRM_DEBUG("RAMIN object space: offset=0x%08x, size=%dKiB\n", + obj_base, obj_size>>10); + return 0; } |