lkml.org 
[lkml]   [2016]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 101/273] drm/dp/mst: Reverse order of MST enable and clearing VC payload table.
    Date
    4.2.8-ckt5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>

    commit c175cd16df272119534058f28cbd5eeac6ff2d24 upstream.

    On DELL U3014 if you clear the table before enabling MST it sometimes
    hangs the receiver.

    Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
    Reviewed-by: Harry Wentland <harry.wentland@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.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 0ec9ad5..2c691b3 100644
    --- a/drivers/gpu/drm/drm_dp_mst_topology.c
    +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
    @@ -1969,6 +1969,12 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
    mgr->mst_primary = mstb;
    kref_get(&mgr->mst_primary->kref);

    + ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,
    + DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);
    + if (ret < 0) {
    + goto out_unlock;
    + }
    +
    {
    struct drm_dp_payload reset_pay;
    reset_pay.start_slot = 0;
    @@ -1976,12 +1982,6 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
    drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);
    }

    - ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,
    - DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);
    - if (ret < 0) {
    - goto out_unlock;
    - }
    -

    /* sort out guid */
    ret = drm_dp_dpcd_read(mgr->aux, DP_GUID, mgr->guid, 16);
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-08 02:21    [W:4.702 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site