Skip to content
/ linux Public

Commit c51a531

Browse files
TheOfficialFloWgregkh
authored andcommitted
drm/amd: fix dcn 2.01 check
[ Upstream commit 39f44f5 ] The ASICREV_IS_BEIGE_GOBY_P check always took precedence, because it includes all chip revisions upto NV_UNKNOWN. Fixes: 54b822b ("drm/amd/display: Use dce_version instead of chip_id") Signed-off-by: Andy Nguyen <theofficialflow1996@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 9c7be0efa6f0daa949a5f3e3fdf9ea090b0713cb) Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 430334e commit c51a531

File tree

1 file changed

+4
-4
lines changed
  • drivers/gpu/drm/amd/display/dc/clk_mgr

1 file changed

+4
-4
lines changed

drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
255255
BREAK_TO_DEBUGGER();
256256
return NULL;
257257
}
258+
if (ctx->dce_version == DCN_VERSION_2_01) {
259+
dcn201_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
260+
return &clk_mgr->base;
261+
}
258262
if (ASICREV_IS_SIENNA_CICHLID_P(asic_id.hw_internal_rev)) {
259263
dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
260264
return &clk_mgr->base;
@@ -267,10 +271,6 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
267271
dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
268272
return &clk_mgr->base;
269273
}
270-
if (ctx->dce_version == DCN_VERSION_2_01) {
271-
dcn201_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
272-
return &clk_mgr->base;
273-
}
274274
dcn20_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg);
275275
return &clk_mgr->base;
276276
}

0 commit comments

Comments
 (0)