lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 498/846] drm/amd/display: add else to avoid double destroy clk_mgr
    Date
    From: Martin Leung <Martin.Leung@amd.com>

    [ Upstream commit 11dff0e871037a6ad978e52f826a2eb7f5fb274a ]

    [Why & How]
    when changing some code we accidentally
    changed else if-> if. reverting that.

    Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
    Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
    Signed-off-by: Martin Leung <Martin.Leung@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/dc/clk_mgr/clk_mgr.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
    index bb31541f80723..6420527fe476c 100644
    --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
    +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
    @@ -306,8 +306,7 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
    case FAMILY_NV:
    if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {
    dcn3_clk_mgr_destroy(clk_mgr);
    - }
    - if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {
    + } else if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {
    dcn3_clk_mgr_destroy(clk_mgr);
    }
    if (ASICREV_IS_BEIGE_GOBY_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 03:48    [W:2.044 / U:1.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site