Commit 111f6f41 authored by Aric Cyr's avatar Aric Cyr Committed by Zheng Zengkai
Browse files

drm/amd/display: Allow PSTATE chnage when no displays are enabled 



stable inclusion
from stable-5.10.14
commit a2245a995563ff684aa5cbeb25aea2fb157c3675
bugzilla: 48051

--------------------------------

[ Upstream commit 8bc3d461 ]

[Why]
When no displays are currently enabled, display driver should not
disallow PSTATE switching.

[How]
Allow PSTATE switching if either the active configuration supports it,
or there are no active displays.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarAnson Jacob <anson.jacob@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent cdd249fb

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

+4 −2
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base, 
	struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;

	bool force_reset = false;

	bool update_uclk = false;

	bool p_state_change_support;



	if (dc->work_arounds.skip_clock_update || !clk_mgr->smu_present)

		return;
@@ -279,8 +280,9 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base, 
		clk_mgr_base->clks.socclk_khz = new_clocks->socclk_khz;



	clk_mgr_base->clks.prev_p_state_change_support = clk_mgr_base->clks.p_state_change_support;

	if (should_update_pstate_support(safe_to_lower, new_clocks->p_state_change_support, clk_mgr_base->clks.p_state_change_support)) {

		clk_mgr_base->clks.p_state_change_support = new_clocks->p_state_change_support;

	p_state_change_support = new_clocks->p_state_change_support || (display_count == 0);

	if (should_update_pstate_support(safe_to_lower, p_state_change_support, clk_mgr_base->clks.p_state_change_support)) {

		clk_mgr_base->clks.p_state_change_support = p_state_change_support;



		/* to disable P-State switching, set UCLK min = max */

		if (!clk_mgr_base->clks.p_state_change_support)