[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-boun...@lists.freedesktop.org> on behalf of Qingqing
Zhuo <qingqing.z...@amd.com>
Sent: Friday, November 19, 2021 2:43 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Wang, Chao-kai (Stylon) <stylon.w...@amd.com>; Cyr, Aric
<aric....@amd.com>; Chiu, Solomon <solomon.c...@amd.com>; Li, Sun peng (Leo)
<sunpeng...@amd.com>; Wentland, Harry <harry.wentl...@amd.com>; Zhuo, Qingqing
(Lillian) <qingqing.z...@amd.com>; Leung, Martin <martin.le...@amd.com>;
Siqueira, Rodrigo <rodrigo.sique...@amd.com>; Li, Roman <roman...@amd.com>;
Jacob, Anson <anson.ja...@amd.com>; Pillai, Aurabindo
<aurabindo.pil...@amd.com>; Lin, Wayne <wayne....@amd.com>; Lipski, Mikita
<mikita.lip...@amd.com>; Lakha, Bhawanpreet <bhawanpreet.la...@amd.com>;
Gutierrez, Agustin <agustin.gutier...@amd.com>; Kotarac, Pavle
<pavle.kota...@amd.com>
Subject: [PATCH 14/16] drm/amd/display: add else to avoid double destroy clk_mgr
From: Martin Leung <martin.le...@amd.com>
[Why & How]
when changing some code we accidentally
changed else if-> if. reverting that.
Reviewed-by: Aric Cyr <aric....@amd.com>
Acked-by: Qingqing Zhuo <qingqing.z...@amd.com>
Signed-off-by: Martin Leung <martin.le...@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
