[Public]

Hi Alex,

Thank you for the advice! Last week's DC candidate has in fact already been merged to upstream, but I will bring up your suggestion to the patch author for review.

Thank you,
Lillian
From: Deucher, Alexander <Alexander.Deucher@amd.com>
Sent: Monday, November 22, 2021 10:38 AM
To: Zhuo, Qingqing (Lillian) <Qingqing.Zhuo@amd.com>; amd-gfx@lists.freedesktop.org
Cc: Wang, Chao-kai (Stylon) <Stylon.Wang@amd.com>; Cyr, Aric <Aric.Cyr@amd.com>; Chiu, Solomon <Solomon.Chiu@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>; Leung, Martin <Martin.Leung@amd.com>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; Li, Roman <Roman.Li@amd.com>; Jacob, Anson <Anson.Jacob@amd.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com>; Lin, Wayne <Wayne.Lin@amd.com>; Lipski, Mikita <Mikita.Lipski@amd.com>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>; Gutierrez, Agustin <Agustin.Gutierrez@amd.com>; Kotarac, Pavle <Pavle.Kotarac@amd.com>
Subject: Re: [PATCH 14/16] drm/amd/display: add else to avoid double destroy clk_mgr


[Public]

Do you want to change the ASICREV_IS_BEIGE_GOBY_P() check to else if as well?  maybe something like:

if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev) ||
    ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev) ||
     ASICREV_IS_BEIGE_GOBY_P(clk_mgr_base->ctx->asic_id.hw_internal_rev))
         dcn3_clk_mgr_destroy(clk_mgr);

Alex
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org<mailto:amd-gfx-bounces@lists.freedesktop.org>> on behalf of Qingqing Zhuo <qingqing.zhuo@amd.com<mailto:qingqing.zhuo@amd.com>>
Sent: Friday, November 19, 2021 2:43 PM
To: amd-gfx@lists.freedesktop.org<mailto:amd-gfx@lists.freedesktop.org> <amd-gfx@lists.freedesktop.org<mailto:amd-gfx@lists.freedesktop.org>>
Cc: Wang, Chao-kai (Stylon) <Stylon.Wang@amd.com<mailto:Stylon.Wang@amd.com>>; Cyr, Aric <Aric.Cyr@amd.com<mailto:Aric.Cyr@amd.com>>; Chiu, Solomon <Solomon.Chiu@amd.com<mailto:Solomon.Chiu@amd.com>>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com<mailto:Sunpeng.Li@amd.com>>; Wentland, Harry <Harry.Wentland@amd.com<mailto:Harry.Wentland@amd.com>>; Zhuo, Qingqing (Lillian) <Qingqing.Zhuo@amd.com<mailto:Qingqing.Zhuo@amd.com>>; Leung, Martin <Martin.Leung@amd.com<mailto:Martin.Leung@amd.com>>; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com<mailto:Rodrigo.Siqueira@amd.com>>; Li, Roman <Roman.Li@amd.com<mailto:Roman.Li@amd.com>>; Jacob, Anson <Anson.Jacob@amd.com<mailto:Anson.Jacob@amd.com>>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com<mailto:Aurabindo.Pillai@amd.com>>; Lin, Wayne <Wayne.Lin@amd.com<mailto:Wayne.Lin@amd.com>>; Lipski, Mikita <Mikita.Lipski@amd.com<mailto:Mikita.Lipski@amd.com>>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com<mailto:Bhawanpreet.Lakha@amd.com>>; Gutierrez, Agustin <Agustin.Gutierrez@amd.com<mailto:Agustin.Gutierrez@amd.com>>; Kotarac, Pavle <Pavle.Kotarac@amd.com<mailto:Pavle.Kotarac@amd.com>>
Subject: [PATCH 14/16] drm/amd/display: add else to avoid double destroy clk_mgr

From: Martin Leung <Martin.Leung@amd.com<mailto:Martin.Leung@amd.com>>

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

Reviewed-by: Aric Cyr <Aric.Cyr@amd.com<mailto:Aric.Cyr@amd.com>>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com<mailto:qingqing.zhuo@amd.com>>
Signed-off-by: Martin Leung <Martin.Leung@amd.com<mailto:Martin.Leung@amd.com>>
---
 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 26f96ee32472..9200c8ce02ba 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
@@ -308,8 +308,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.25.1