diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-20 16:13:54 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-05-20 16:28:57 +1000 |
commit | 0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265 (patch) | |
tree | f494ef1ba9cc5525ac360353ef0063a10167c416 | |
parent | 6679b2ccc914e84384b1acf0de4423e3738cce9f (diff) | |
download | linux-0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265.tar.bz2 |
drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
Fixes a LVDS bleed issue on Lenovo W530 that can occur under a
number of circumstances.
Cc: <stable@vger.kernel.org > # v3.9+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-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 7762665ad8fd..876de9ac3793 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -1009,7 +1009,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) |