drm/amd/display: Don't overwrite dce60_clk_mgr

Timur Kristóf · gregkh · commit 0a42692cdb8f · 2025-08-28T16:31:02.000+02:00
commit 4db9cd5 upstream. dc_clk_mgr_create accidentally overwrites the dce60_clk_mgr with the dce_clk_mgr, causing incorrect behaviour on DCE6. Fix it by removing the extra dce_clk_mgr_construct. Fixes: 62eab49 ("drm/amd/display: hide VGH asic specific structs") Reviewed-by: Rodrigo Siqueira <siqueira@igalia.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit bbddcbe) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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
@@ -158,7 +158,6 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
 			return NULL;
 		}
 		dce60_clk_mgr_construct(ctx, clk_mgr);
-		dce_clk_mgr_construct(ctx, clk_mgr);
 		return &clk_mgr->base;
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,6 @@ struct clk_mgr dc_clk_mgr_create(struct dc_context ctx, struct pp_smu_funcs *p`
`158`	`158`	`return NULL;`
`159`	`159`	`}`
`160`	`160`	`dce60_clk_mgr_construct(ctx, clk_mgr);`
`161`		`- dce_clk_mgr_construct(ctx, clk_mgr);`
`162`	`161`	`return &clk_mgr->base;`
`163`	`162`	`}`
`164`	`163`	`#endif`