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 033/717] drm/amdgpu: fix incorrect enum type
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit a110f3750bf8b93764f13bd1402c7cba03d15d61 ]

    core_link_write_dpcd() returns enum dc_status, not ddc_result:

    display/dc/core/dc_link_dp.c: In function 'dp_set_panel_mode':
    display/dc/core/dc_link_dp.c:4237:11: warning: implicit conversion from 'enum dc_status' to 'enum ddc_result'
    [-Wenum-conversion]

    Avoid the warning by using the correct enum in the caller.

    Fixes: 0b226322434c ("drm/amd/display: Synchronous DisplayPort Link Training")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
    index ff1e9963ec7a2..98464886341f6 100644
    --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
    +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
    @@ -4230,7 +4230,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)

    if (edp_config_set.bits.PANEL_MODE_EDP
    != panel_mode_edp) {
    - enum ddc_result result = DDC_RESULT_UNKNOWN;
    + enum dc_status result = DC_ERROR_UNEXPECTED;

    edp_config_set.bits.PANEL_MODE_EDP =
    panel_mode_edp;
    @@ -4240,7 +4240,7 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode)
    &edp_config_set.raw,
    sizeof(edp_config_set.raw));

    - ASSERT(result == DDC_RESULT_SUCESSFULL);
    + ASSERT(result == DC_OK);
    }
    }
    DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d "
    --
    2.27.0


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