Commit 47831f48 authored by Sung Joon Kim's avatar Sung Joon Kim Committed by Alex Deucher
Browse files

drm/amd/display: Fix black screen on video playback with embedded panel 



[why]
We have dynamic power control in driver but
should be ignored when power is forced on.

[how]
Bypass any power control when it's forced on.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarSung Joon Kim <sungkim@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dcf6cd7f

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

+0 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,6 @@ void dcn35_clk_mgr_construct( 
			ctx->dc->debug.disable_dpp_power_gate = false;

			ctx->dc->debug.disable_hubp_power_gate = false;

			ctx->dc->debug.disable_dsc_power_gate = false;

			ctx->dc->debug.disable_hpo_power_gate = false;

		} else {

			/*let's reset the config control flag*/

			ctx->dc->config.disable_ips = DMUB_IPS_DISABLE_ALL; /*pmfw not support it, disable it all*/

drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c

+10 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ void pg_cntl35_hpo_pg_control(struct pg_cntl *pg_cntl, bool power_on) 
	uint32_t power_gate = power_on ? 0 : 1;

	uint32_t pwr_status = power_on ? 0 : 2;

	uint32_t org_ip_request_cntl;

	uint32_t power_forceon;

	bool block_enabled;



	if (pg_cntl->ctx->dc->debug.ignore_pg ||
@@ -277,6 +278,10 @@ void pg_cntl35_hpo_pg_control(struct pg_cntl *pg_cntl, bool power_on) 
			return;

	}



	REG_GET(DOMAIN25_PG_CONFIG, DOMAIN_POWER_FORCEON, &power_forceon);

	if (power_forceon)

		return;



	REG_GET(DC_IP_REQUEST_CNTL, IP_REQUEST_EN, &org_ip_request_cntl);

	if (org_ip_request_cntl == 0)

		REG_SET(DC_IP_REQUEST_CNTL, 0, IP_REQUEST_EN, 1);
@@ -304,6 +309,7 @@ void pg_cntl35_io_clk_pg_control(struct pg_cntl *pg_cntl, bool power_on) 
	uint32_t power_gate = power_on ? 0 : 1;

	uint32_t pwr_status = power_on ? 0 : 2;

	uint32_t org_ip_request_cntl;

	uint32_t power_forceon;

	bool block_enabled;



	if (pg_cntl->ctx->dc->debug.ignore_pg ||
@@ -319,6 +325,10 @@ void pg_cntl35_io_clk_pg_control(struct pg_cntl *pg_cntl, bool power_on) 
			return;

	}



	REG_GET(DOMAIN22_PG_CONFIG, DOMAIN_POWER_FORCEON, &power_forceon);

	if (power_forceon)

		return;



	REG_GET(DC_IP_REQUEST_CNTL, IP_REQUEST_EN, &org_ip_request_cntl);

	if (org_ip_request_cntl == 0)

		REG_SET(DC_IP_REQUEST_CNTL, 0, IP_REQUEST_EN, 1);