lkml.org 
[lkml]   [2016]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 072/210] drm/dp/mst: fix in MSTB RAD initialization
    Date
    3.19.8-ckt14 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Mykola Lysenko <Mykola.Lysenko@amd.com>

    commit 75af4c8c4c0f60d7ad135419805798f144e9baf9 upstream.

    This fix is needed to support more then two
    branch displays, so RAD address consist at
    least of 2 elements

    Acked-by: Dave Airlie <airlied@gmail.com>
    Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/drm_dp_mst_topology.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
    index 9840074..4710d2f 100644
    --- a/drivers/gpu/drm/drm_dp_mst_topology.c
    +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
    @@ -969,17 +969,17 @@ static struct drm_dp_mst_port *drm_dp_get_port(struct drm_dp_mst_branch *mstb, u
    static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port,
    u8 *rad)
    {
    - int lct = port->parent->lct;
    + int parent_lct = port->parent->lct;
    int shift = 4;
    - int idx = lct / 2;
    - if (lct > 1) {
    - memcpy(rad, port->parent->rad, idx);
    - shift = (lct % 2) ? 4 : 0;
    + int idx = (parent_lct - 1) / 2;
    + if (parent_lct > 1) {
    + memcpy(rad, port->parent->rad, idx + 1);
    + shift = (parent_lct % 2) ? 4 : 0;
    } else
    rad[0] = 0;

    rad[idx] |= port->port_num << shift;
    - return lct + 1;
    + return parent_lct + 1;
    }

    /*
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-29 03:41    [W:4.307 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site