diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-20 16:13:54 +1000 |
---|---|---|
committer | Show Liu <show.liu@linaro.org> | 2014-06-18 12:05:18 +0800 |
commit | 26717831e51caa4c85494f2d346b3846d41bc2ef (patch) | |
tree | 0cc687a71ede8a7e6dfed2566866439d9d951640 | |
parent | 1a1affd1b59fd718bbac97be618455068bd4a16d (diff) |
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 <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index 1c5e4e8b2c8..e031d7c88fa 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -732,7 +732,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) |