From: Ben Skeggs Date: Tue, 20 May 2014 06:13:54 +0000 (+1000) Subject: drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup X-Git-Tag: firefly_0821_release~3679^2~2131 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df9cddcf99bfe73a6b4328c14593749f3facfa89;p=firefly-linux-kernel-4.4.55.git drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup commit 0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265 upstream. Fixes a LVDS bleed issue on Lenovo W530 that can occur under a number of circumstances. Signed-off-by: Ben Skeggs Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index 019eacd8a68f..9ee40042fa3a 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -679,7 +679,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, } if (outp == 8) - return false; + return conf; data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1); if (data == 0x0000)