Commit c3ea03c2 authored by Austin Zheng's avatar Austin Zheng Committed by Alex Deucher
Browse files

drm/amd/display: Populate Power Profile In Case of Early Return 



Early return possible if context has no clk_mgr.
This will lead to an invalid power profile being returned
which looks identical to a profile with the lowest power level.
Add back logic that populated the power profile and overwrite
the value if needed.

Cc: stable@vger.kernel.org
Fixes: d016d0dd ("drm/amd/display: Update Interface to Check UCLK DPM")
Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarAustin Zheng <Austin.Zheng@amd.com>
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e0179588

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

+2 −2
Original line number Diff line number Diff line
@@ -6100,11 +6100,11 @@ struct dc_power_profile dc_get_power_profile_for_dc_state(const struct dc_state 
{

	struct dc_power_profile profile = { 0 };



	if (!context || !context->clk_mgr || !context->clk_mgr->ctx || !context->clk_mgr->ctx->dc)

	profile.power_level = !context->bw_ctx.bw.dcn.clk.p_state_change_support;

	if (!context->clk_mgr || !context->clk_mgr->ctx || !context->clk_mgr->ctx->dc)

		return profile;

	struct dc *dc = context->clk_mgr->ctx->dc;





	if (dc->res_pool->funcs->get_power_profile)

		profile.power_level = dc->res_pool->funcs->get_power_profile(context);

	return profile;