From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 6 Jul 2011 00:29:49 +0000 (+1000)
Subject: drm/nvd0/disp: some magic to make evo happeir
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1d6e7a59f70b3107a75672f365be2fec2ee43a36;p=deliverable%2Flinux.git

drm/nvd0/disp: some magic to make evo happeir

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index cf294886a696..0afc5e1ad845 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -850,6 +850,18 @@ nvd0_display_init(struct drm_device *dev)
 	u32 *push;
 	int i;
 
+	/*XXX: wrong, and wtf is it for? */
+	for (i = 0; i < 3; i++) {
+		u32 dac = nv_rd32(dev, 0x61a000 + (i * 0x800));
+		nv_wr32(dev, 0x6101c0 + (i * 0x800), dac);
+	}
+
+	/*XXX: wrong, and wtf is it for? SOR_MODE_CTRL is an error without..  */
+	for (i = 0; i < 4; i++) {
+		u32 sor = nv_rd32(dev, 0x61c000 + (i * 0x800));
+		nv_wr32(dev, 0x6301c4 + (i * 0x800), sor);
+	}
+
 	if (nv_rd32(dev, 0x6100ac) & 0x00000100) {
 		nv_wr32(dev, 0x6100ac, 0x00000100);
 		nv_mask(dev, 0x6194e8, 0x00000001, 0x00000000);