Commit 6c497828 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Zheng Zengkai
Browse files

drm/amd/display: Use hardware sequencer functions for PG control 



stable inclusion
from stable-5.10.14
commit 932ab13b8af3e46551869478a2dc03d11c8ba0a3
bugzilla: 48051

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

[ Upstream commit c74f865f ]

[Why & How]
These can differ per ASIC or not be present. Don't call the dcn20 ones
directly but rather the ones defined by the ASIC init table.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarEric Yang <eric.yang2@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 ab0a06d6

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+14 −4
Original line number Diff line number Diff line
@@ -646,8 +646,13 @@ static void power_on_plane( 
	if (REG(DC_IP_REQUEST_CNTL)) {

		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 1);



		if (hws->funcs.dpp_pg_control)

			hws->funcs.dpp_pg_control(hws, plane_id, true);



		if (hws->funcs.hubp_pg_control)

			hws->funcs.hubp_pg_control(hws, plane_id, true);



		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 0);

		DC_LOG_DEBUG(
@@ -1079,8 +1084,13 @@ void dcn10_plane_atomic_power_down(struct dc *dc, 
	if (REG(DC_IP_REQUEST_CNTL)) {

		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 1);



		if (hws->funcs.dpp_pg_control)

			hws->funcs.dpp_pg_control(hws, dpp->inst, false);



		if (hws->funcs.hubp_pg_control)

			hws->funcs.hubp_pg_control(hws, hubp->inst, false);



		dpp->funcs->dpp_reset(dpp);

		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 0);

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+7 −2
Original line number Diff line number Diff line
@@ -1069,8 +1069,13 @@ static void dcn20_power_on_plane( 
	if (REG(DC_IP_REQUEST_CNTL)) {

		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 1);

		dcn20_dpp_pg_control(hws, pipe_ctx->plane_res.dpp->inst, true);

		dcn20_hubp_pg_control(hws, pipe_ctx->plane_res.hubp->inst, true);



		if (hws->funcs.dpp_pg_control)

			hws->funcs.dpp_pg_control(hws, pipe_ctx->plane_res.dpp->inst, true);



		if (hws->funcs.hubp_pg_control)

			hws->funcs.hubp_pg_control(hws, pipe_ctx->plane_res.hubp->inst, true);



		REG_SET(DC_IP_REQUEST_CNTL, 0,

				IP_REQUEST_EN, 0);

		DC_LOG_DEBUG(