[RARING] [SRU] [PATCH 1/1] drm/nouveau: fix reclocking on nv40

Brad Figg brad.figg at canonical.com
Mon Sep 9 16:08:47 UTC 2013


From: Pali Rohár <pali.rohar at gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1222898

In commit 77145f1cbdf8d28b46ff8070ca749bad821e0774 was introduced
error which cause that reclocking on nv40 not working anymore.
There is missing assigment of return value from pll_calc to ret.

Signed-off-by: Pali Rohár <pali.rohar at gmail.com>
Signed-off-by: Martin Peres <martin.peres at labri.fr>
Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 drivers/gpu/drm/nouveau/nv40_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c
index 3382064..5ee23fb 100644
--- a/drivers/gpu/drm/nouveau/nv40_pm.c
+++ b/drivers/gpu/drm/nouveau/nv40_pm.c
@@ -131,7 +131,7 @@ nv40_calc_pll(struct drm_device *dev, u32 reg, struct nvbios_pll *pll,
 	if (clk < pll->vco1.max_freq)
 		pll->vco2.max_freq = 0;
 
-	pclk->pll_calc(pclk, pll, clk, &coef);
+	ret = pclk->pll_calc(pclk, pll, clk, &coef);
 	if (ret == 0)
 		return -ERANGE;
 
-- 
1.8.1.2





More information about the kernel-team mailing list