summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_instmem.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-09-06 20:25:28 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 16:25:28 +1000
commit35fd5b42f035c795bd9c6649591f59b500cb62b3 (patch)
tree9dfd6261e0e7951d804f4a9a66fb24f8b4bfb9d0 /drivers/gpu/drm/nouveau/nv04_instmem.c
parentde5899bdaccaabfaab894559a7eec3302ae88b52 (diff)
downloadop-kernel-dev-35fd5b42f035c795bd9c6649591f59b500cb62b3.zip
op-kernel-dev-35fd5b42f035c795bd9c6649591f59b500cb62b3.tar.gz
drm/nouveau: PRAMIN is available from the start on pre-nv50.
This makes sure that RAMHT is cleared correctly on start up. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_instmem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_instmem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index 8831610..0b5ae29 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv04_instmem.c
@@ -25,6 +25,9 @@ int nv04_instmem_init(struct drm_device *dev)
u32 offset, length;
int ret;
+ /* RAMIN always available */
+ dev_priv->ramin_available = true;
+
/* Setup shared RAMHT */
ret = nouveau_gpuobj_new_fake(dev, 0x10000, ~0, 4096,
NVOBJ_FLAG_ZERO_ALLOC, &ramht);
@@ -81,7 +84,6 @@ int nv04_instmem_init(struct drm_device *dev)
return ret;
}
- dev_priv->ramin_available = true;
return 0;
}
OpenPOWER on IntegriCloud