From: Ben Skeggs <skeggsb@gmail.com>
Date: Wed, 11 Feb 2009 00:48:36 +0000 (+1000)
Subject: drm/nv50: fix nv9x chipsets
X-Git-Tag: libdrm-2.4.5~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc92c0edf33f3f38275f6aa4e0639b3ddeef68ca;p=platform%2Fupstream%2Flibdrm.git

drm/nv50: fix nv9x chipsets

NVIDIA do this fun little sequence after updating the PRAMIN page tables.

On 9xxx chips, none of the PRAMIN BAR bindings (except the initial one)
worked, hence the majority of the setup needed to create a channel
ended up in the wrong place, causing all sorts of fun.

This is done by NVIDIA on nv8x chips also, so we'll do it for them too,
even though they appear to work without it.
---

diff --git a/shared-core/nv50_instmem.c b/shared-core/nv50_instmem.c
index b7a51f0..d76ebf3 100644
--- a/shared-core/nv50_instmem.c
+++ b/shared-core/nv50_instmem.c
@@ -297,6 +297,13 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 		vram += NV50_INSTMEM_PAGE_SIZE;
 	}
 
+	NV_WRITE(0x070000, 0x00000001);
+	while(NV_READ(0x070000) & 1);
+	NV_WRITE(0x100c80, 0x00040001);
+	while(NV_READ(0x100c80) & 1);
+	NV_WRITE(0x100c80, 0x00060001);
+	while(NV_READ(0x100c80) & 1);
+
 	gpuobj->im_bound = 1;
 	return 0;
 }