drm/nv50/disp: fix dpms regression on certain boards
authorBen Skeggs <bskeggs@redhat.com>
Tue, 30 Sep 2014 00:27:08 +0000 (10:27 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 2 Oct 2014 03:32:23 +0000 (13:32 +1000)
Reported in fdo#82527 comment #2.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

index 4b5bb5d..f8cbb51 100644 (file)
@@ -1763,9 +1763,10 @@ nv50_disp_intr_unk40_0_tmds(struct nv50_disp_priv *priv, struct dcb_output *outp
        const int   or = ffs(outp->or) - 1;
        const u32 loff = (or * 0x800) + (link * 0x80);
        const u16 mask = (outp->sorconf.link << 6) | outp->or;
+       struct dcb_output match;
        u8  ver, hdr;
 
-       if (dcb_outp_match(bios, DCB_OUTPUT_DP, mask, &ver, &hdr, outp))
+       if (dcb_outp_match(bios, DCB_OUTPUT_DP, mask, &ver, &hdr, &match))
                nv_mask(priv, 0x61c10c + loff, 0x00000001, 0x00000000);
 }