Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abca2400 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher
Browse files

drm/amd/display: early return if not in vga mode in disable_vga 



The work around for hw bug causes S3 resume failure. Don't execute
disable vga logic if not in vga mode.

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bd9bc355

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h

+6 −4
Original line number Diff line number Diff line
@@ -495,10 +495,11 @@ struct dce_hwseq_registers { 
	HWS_SF(, DOMAIN6_PG_STATUS, DOMAIN6_PGFSM_PWR_STATUS, mask_sh), \

	HWS_SF(, DOMAIN7_PG_STATUS, DOMAIN7_PGFSM_PWR_STATUS, mask_sh), \

	HWS_SF(, DC_IP_REQUEST_CNTL, IP_REQUEST_EN, mask_sh), \

	HWS_SF(, LVTMA_PWRSEQ_CNTL, LVTMA_BLON, mask_sh), \

	HWS_SF(, LVTMA_PWRSEQ_STATE, LVTMA_PWRSEQ_TARGET_STATE_R, mask_sh), \

	HWS_SF(, D1VGA_CONTROL, D1VGA_MODE_ENABLE, mask_sh),\

	HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_ENABLE, mask_sh),\

	HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_RENDER_START, mask_sh)

	HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_RENDER_START, mask_sh),\

	HWS_SF(, LVTMA_PWRSEQ_CNTL, LVTMA_BLON, mask_sh), \

	HWS_SF(, LVTMA_PWRSEQ_STATE, LVTMA_PWRSEQ_TARGET_STATE_R, mask_sh)



#define HWSEQ_REG_FIELD_LIST(type) \

	type DCFE_CLOCK_ENABLE; \
@@ -589,7 +590,8 @@ struct dce_hwseq_registers { 
	type DENTIST_DPPCLK_WDIVIDER; \

	type DENTIST_DISPCLK_WDIVIDER; \

	type VGA_TEST_ENABLE; \

	type VGA_TEST_RENDER_START;

	type VGA_TEST_RENDER_START; \

	type D1VGA_MODE_ENABLE;



struct dce_hwseq_shift {

	HWSEQ_REG_FIELD_LIST(uint8_t)

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

+7 −3
Original line number Diff line number Diff line
@@ -238,10 +238,14 @@ static void enable_power_gating_plane( 
static void disable_vga(

	struct dce_hwseq *hws)

{

	unsigned int in_vga_mode = 0;



	REG_GET(D1VGA_CONTROL, D1VGA_MODE_ENABLE, &in_vga_mode);



	if (in_vga_mode == 0)

		return;



	REG_WRITE(D1VGA_CONTROL, 0);

	REG_WRITE(D2VGA_CONTROL, 0);

	REG_WRITE(D3VGA_CONTROL, 0);

	REG_WRITE(D4VGA_CONTROL, 0);



	/* HW Engineer's Notes:

	 *  During switch from vga->extended, if we set the VGA_TEST_ENABLE and