lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 055/254] drm/nv50/disp: fix dpms regression on certain boards
    Date
    3.16.7-ckt2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Skeggs <bskeggs@redhat.com>

    commit 5838ae610ff36777b8fce6f353c2417980c1a1fa upstream.

    Reported in fdo#82527 comment #2.

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Cc: Sven Joachim <svenjoac@gmx.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
    index 2283c442a10d..90b0eb1d042b 100644
    --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
    +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
    @@ -1570,9 +1570,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);
    }

    --
    2.1.0


    \
     
     \ /
      Last update: 2014-11-25 13:21    [W:4.121 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site