lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 636/717] drm/amdgpu: only set DP subconnector type on DP and eDP connectors
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    commit 05211e7fbbf042dd7f51155ebe64eb2ecacb25cb upstream.

    Fixes a crash in drm_object_property_set_value() because the property
    is not set for internal DP ports that connect to a bridge chips
    (e.g., DP to VGA or DP to LVDS).

    Bug: https://bugzilla.kernel.org/show_bug.cgi?id=210739
    Fixes: 65bf2cf95d3ade ("drm/amdgpu: utilize subconnector property for DP through atombios")
    Tested-By: Kris Karas <bugs-a17@moonlit-rail.com>
    Cc: Oleg Vasilev <oleg.vasilev@intel.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org # 5.10.x
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
    @@ -1414,10 +1414,12 @@ out:
    pm_runtime_put_autosuspend(connector->dev->dev);
    }

    - drm_dp_set_subconnector_property(&amdgpu_connector->base,
    - ret,
    - amdgpu_dig_connector->dpcd,
    - amdgpu_dig_connector->downstream_ports);
    + if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
    + connector->connector_type == DRM_MODE_CONNECTOR_eDP)
    + drm_dp_set_subconnector_property(&amdgpu_connector->base,
    + ret,
    + amdgpu_dig_connector->dpcd,
    + amdgpu_dig_connector->downstream_ports);
    return ret;
    }


    \
     
     \ /
      Last update: 2020-12-28 15:32    [W:4.091 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site