From: Stuart Bennett <sb476@cam.ac.uk>
Date: Tue, 25 Mar 2008 18:30:05 +0000 (+0000)
Subject: nouveau: nv20 bios does not initialise PTIMER
X-Git-Tag: libdrm-2.3.1~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a81d07f64d7557da3c4888867a20d2eec94b4ec1;p=platform%2Fupstream%2Flibdrm.git

nouveau: nv20 bios does not initialise PTIMER

The wait functions depend on PTIMER, so write the old (incorrect, but working) values for uninitialised hw
---

diff --git a/shared-core/nv04_timer.c b/shared-core/nv04_timer.c
index fbf185b..616f197 100644
--- a/shared-core/nv04_timer.c
+++ b/shared-core/nv04_timer.c
@@ -11,15 +11,17 @@ nv04_timer_init(struct drm_device *dev)
 	NV_WRITE(NV04_PTIMER_INTR_EN_0, 0x00000000);
 	NV_WRITE(NV04_PTIMER_INTR_0, 0xFFFFFFFF);
 
-	/* Just use the pre-existing values for now; these regs are not written
-	 * in nv (driver writer missed a /4 on the address), and writing 8 and 3
-	 * to the correct regs breaks the timings on the LVDS hardware
-	 * sequencing microcode.
+	/* Just use the pre-existing values when possible for now; these regs
+	 * are not written in nv (driver writer missed a /4 on the address), and
+	 * writing 8 and 3 to the correct regs breaks the timings on the LVDS
+	 * hardware sequencing microcode.
 	 * A correct solution (involving calculations with the GPU PLL) can
 	 * be done when kernel modesetting lands
-	NV_WRITE(NV04_PTIMER_NUMERATOR, 0x00000008);
-	NV_WRITE(NV04_PTIMER_DENOMINATOR, 0x00000003);
 	 */
+	if (!NV_READ(NV04_PTIMER_NUMERATOR) || !NV_READ(NV04_PTIMER_DENOMINATOR)) {
+		NV_WRITE(NV04_PTIMER_NUMERATOR, 0x00000008);
+		NV_WRITE(NV04_PTIMER_DENOMINATOR, 0x00000003);
+	}
 
 	return 0;
 }