From: Roman Li Date: Thu, 8 Aug 2019 19:11:37 +0000 (-0400) Subject: drm/amd/display: Correct order of RV family clk managers for Renoir X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f82effc4e59260f6826b497e5158742a8f5b59df;p=linux.git drm/amd/display: Correct order of RV family clk managers for Renoir Need to check for renoir first. Acked-by: Harry Wentland Signed-off-by: Roman Li Signed-off-by: Alex Deucher --- 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 e211d4f655368..c43797bea4139 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 @@ -111,6 +111,12 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p #if defined(CONFIG_DRM_AMD_DC_DCN1_0) case FAMILY_RV: +#if defined(CONFIG_DRM_AMD_DC_DCN2_1) + if (ASICREV_IS_RENOIR(asic_id.hw_internal_rev)) { + rn_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); + break; + } +#endif /* DCN2_1 */ if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) { rv2_clk_mgr_construct(ctx, clk_mgr, pp_smu); break; @@ -120,12 +126,6 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p rv1_clk_mgr_construct(ctx, clk_mgr, pp_smu); break; } -#if defined(CONFIG_DRM_AMD_DC_DCN2_1) - if (ASICREV_IS_RENOIR(asic_id.hw_internal_rev)) { - rn_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); - break; - } -#endif /* DCN2_1 */ break; #endif /* Family RV */