OSDN Git Service

drm/amd/display: clean up dcn31 revision check
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Thu, 7 Oct 2021 18:54:01 +0000 (14:54 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 28 Oct 2021 18:26:15 +0000 (14:26 -0400)
This is unnecessary in clk_mgr

Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Acked-by: Agustin Gutierrez <agustin.gutierrez@amd.com>
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

index acbda39..26f96ee 100644 (file)
@@ -285,13 +285,8 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
                        BREAK_TO_DEBUGGER();
                        return NULL;
                }
-               if (ASICREV_IS_YELLOW_CARP(asic_id.hw_internal_rev)) {
-                       /* TODO: to add DCN31 clk_mgr support, once CLK IP header files are available,
-                        * for now use DCN3.0 clk mgr.
-                        */
-                       dcn31_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
-                       return &clk_mgr->base.base;
-               }
+
+               dcn31_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
                return &clk_mgr->base.base;
        }
 #endif
@@ -328,7 +323,6 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
                break;
 
        case FAMILY_YELLOW_CARP:
-               if (ASICREV_IS_YELLOW_CARP(clk_mgr_base->ctx->asic_id.hw_internal_rev))
                        dcn31_clk_mgr_destroy(clk_mgr);
                break;