releases/3.14.7/drm-gf119-disp-fix-nasty-bug-which-can-clobber-sor0-s-clock-setup.patch

   1 From 0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265 Mon Sep 17 00:00:00 2001
   2 From: Ben Skeggs <bskeggs@redhat.com>
   3 Date: Tue, 20 May 2014 16:13:54 +1000
   4 Subject: drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
   5
   6 From: Ben Skeggs <bskeggs@redhat.com>
   7
   8 commit 0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265 upstream.
   9
  10 Fixes a LVDS bleed issue on Lenovo W530 that can occur under a
  11 number of circumstances.
  12
  13 Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c |    2 +-
  18  1 file changed, 1 insertion(+), 1 deletion(-)
  19
  20 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
  21 +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
  22 @@ -732,7 +732,7 @@ exec_clkcmp(struct nv50_disp_priv *priv,
  23         }
  24
  25         if (outp == 8)
  26 -               return false;
  27 +               return conf;
  28
  29         data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1);
  30         if (data == 0x0000)