Commit 0ee057e6 authored by Nicholas Susanto's avatar Nicholas Susanto Committed by Alex Deucher
Browse files

drm/amd/display: Fix encoder disable logic 



[WHY]
DENTIST hangs when OTG is off and encoder is on. We were not
disabling the encoder properly when switching from extended mode to
external monitor only.

[HOW]
Disable the encoder using an existing enable/disable fifo helper instead
of enc35_stream_encoder_enable.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarNicholas Susanto <nicholas.susanto@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5911d02c

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

+4 −6
Original line number Diff line number Diff line
@@ -261,12 +261,6 @@ static void enc35_stream_encoder_enable( 
			/* invalid mode ! */

			ASSERT_CRITICAL(false);

		}



		REG_UPDATE(DIG_FE_CLK_CNTL, DIG_FE_CLK_EN, 1);

		REG_UPDATE(DIG_FE_EN_CNTL, DIG_FE_ENABLE, 1);

	} else {

		REG_UPDATE(DIG_FE_EN_CNTL, DIG_FE_ENABLE, 0);

		REG_UPDATE(DIG_FE_CLK_CNTL, DIG_FE_CLK_EN, 0);

	}

}
@@ -436,6 +430,8 @@ static void enc35_disable_fifo(struct stream_encoder *enc) 
	struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);



	REG_UPDATE(DIG_FIFO_CTRL0, DIG_FIFO_ENABLE, 0);

	REG_UPDATE(DIG_FE_EN_CNTL, DIG_FE_ENABLE, 0);

	REG_UPDATE(DIG_FE_CLK_CNTL, DIG_FE_CLK_EN, 0);

}



static void enc35_enable_fifo(struct stream_encoder *enc)
@@ -443,6 +439,8 @@ static void enc35_enable_fifo(struct stream_encoder *enc) 
	struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);



	REG_UPDATE(DIG_FIFO_CTRL0, DIG_FIFO_READ_START_LEVEL, 0x7);

	REG_UPDATE(DIG_FE_CLK_CNTL, DIG_FE_CLK_EN, 1);

	REG_UPDATE(DIG_FE_EN_CNTL, DIG_FE_ENABLE, 1);



	enc35_reset_fifo(enc, true);

	enc35_reset_fifo(enc, false);