diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-20 16:13:54 +1000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-20 17:33:55 +0200 |
| commit | afb44e1758741b45be382544527b6edf99fd2f6f (patch) | |
| tree | bbbd84a491c44b3ca973182bbbfccc20f218a686 | |
| parent | 1b2b80af293d868bdb762fa896d5b851248ba566 (diff) | |
| download | lwn-afb44e1758741b45be382544527b6edf99fd2f6f.tar.gz lwn-afb44e1758741b45be382544527b6edf99fd2f6f.zip | |
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: Jiri Slaby <jslaby@suse.cz>
| -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 52dd7a1db729..8f336558c681 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -678,7 +678,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) |