From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 21 Jul 2011 05:54:48 +0000 (+1000)
Subject: drm/nva3/pm: fixup for NVAF special
X-Git-Tag: MMI-PSA29.97-13-9~18200^2~58^2~35
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=378f85ed54a424bc7e1edb9c3c7cd3a7efef9f9c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/nva3/pm: fixup for NVAF special

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

diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index ec684f56dfc6..618c144b7a30 100644
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -46,8 +46,14 @@ read_clk(struct drm_device *dev, int clk, bool ignore_en)
 	u32 sctl, sdiv, sclk;
 
 	/* refclk for the 0xe8xx plls is a fixed frequency */
-	if (clk >= 0x40)
+	if (clk >= 0x40) {
+		if (dev_priv->chipset == 0xaf) {
+			/* no joke.. seriously.. sigh.. */
+			return nv_rd32(dev, 0x00471c) * 1000;
+		}
+
 		return dev_priv->crystal;
+	}
 
 	sctl = nv_rd32(dev, 0x4120 + (clk * 4));
 	if (!ignore_en && !(sctl & 0x00000100))