lkml.org 
[lkml]   [2013]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 121/145] drm/nva3/disp: Fix HDMI audio regression
    Date
    3.8.13.5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Ilia Mirkin <imirkin@alum.mit.edu>

    commit bf03d1b293cc556df53545e318110505014d805e upstream.

    This is the nva3 counterpart to commit beba44b17 (drm/nv84/disp: Fix
    HDMI audio regression). The regression happened as a result of
    refactoring in commit 8e9e3d2de (drm/nv84/disp: move hdmi control into
    core).

    Reported-and-tested-by: Max Baldwin <archerseven@gmail.com>
    Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c b/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c
    index f065fc2..db8c6fd 100644
    --- a/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c
    +++ b/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c
    @@ -55,6 +55,10 @@ nva3_hdmi_ctrl(struct nv50_disp_priv *priv, int head, int or, u32 data)
    nv_wr32(priv, 0x61c510 + soff, 0x00000000);
    nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000001);

    + nv_mask(priv, 0x61c5d0 + soff, 0x00070001, 0x00010001); /* SPARE, HW_CTS */
    + nv_mask(priv, 0x61c568 + soff, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */
    + nv_mask(priv, 0x61c578 + soff, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */
    +
    /* ??? */
    nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */
    nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-18 10:21    [W:2.701 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site