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

login
register
mail settings
Submitter Brad Figg
Date Sept. 9, 2013, 4:08 p.m.
Message ID <1378742927-6190-2-git-send-email-brad.figg@canonical.com>
Download mbox | patch
Permalink /patch/273614/
State New
Headers show

Comments

Brad Figg - Sept. 9, 2013, 4:08 p.m.
From: Pali Rohár <pali.rohar@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@gmail.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
---
 drivers/gpu/drm/nouveau/nv40_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tim Gardner - Sept. 9, 2013, 4:12 p.m.

Tim Gardner - Sept. 9, 2013, 4:22 p.m.
trivial and obvious

Patch

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;