lkml.org 
[lkml]   [2022]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 165/219] drm/amd/display: Fix allocate_mst_payload assert on resume
    Date
    From: Roman Li <Roman.Li@amd.com>

    [ Upstream commit f4346fb3edf7720db3f7f5e1cab1f667cd024280 ]

    [Why]
    On resume we do link detection for all non-MST connectors.
    MST is handled separately. However the condition for telling
    if connector is on mst branch is not enough for mst hub case.
    Link detection for mst branch link leads to mst topology reset.
    That causes assert in dc_link_allocate_mst_payload()

    [How]
    Use link type as indicator for mst link.

    Reviewed-by: Wayne Lin <Wayne.Lin@amd.com>
    Acked-by: Alex Hung <alex.hung@amd.com>
    Signed-off-by: Roman Li <Roman.Li@amd.com>
    Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    index 90c017859ad4..24db2297857b 100644
    --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
    @@ -2693,7 +2693,8 @@ static int dm_resume(void *handle)
    * this is the case when traversing through already created
    * MST connectors, should be skipped
    */
    - if (aconnector->mst_port)
    + if (aconnector->dc_link &&
    + aconnector->dc_link->type == dc_connection_mst_branch)
    continue;

    mutex_lock(&aconnector->hpd_lock);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-18 14:33    [W:2.162 / U:1.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site