From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 6 Sep 2010 18:25:28 +0000 (+0200)
Subject: drm/nouveau: PRAMIN is available from the start on pre-nv50.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=35fd5b42f035c795bd9c6649591f59b500cb62b3;p=deliverable%2Flinux.git

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>
---

diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c
index 88316100389b..0b5ae297abde 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;
 }