Commit 7bdbfb4e authored by George Shen's avatar George Shen Committed by Alex Deucher
Browse files

drm/amd/display: Disconnect phantom pipe OPP from OPTC being disabled 



[Why]
If an OPP is used for a different OPTC without first being disconnected
from the previous OPTC, unexpected behaviour can occur. This also
applies to phantom pipes, which is what the current logic missed.

[How]
Disconnect OPPs from OPTC for phantom pipes before disabling OTG master.

Also move the disconnection to before the OTG master disable, since the
register is double buffered.

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Acked-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarGeorge Shen <george.shen@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 17e74e11

drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c

+13 −6
Original line number Diff line number Diff line
@@ -166,12 +166,6 @@ static bool optc32_disable_crtc(struct timing_generator *optc) 
{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	/* disable otg request until end of the first line

	 * in the vertical blank region

	 */

	REG_UPDATE(OTG_CONTROL,

			OTG_MASTER_EN, 0);



	REG_UPDATE_5(OPTC_DATA_SOURCE_SELECT,

			OPTC_SEG0_SRC_SEL, 0xf,

			OPTC_SEG1_SRC_SEL, 0xf,
@@ -179,6 +173,12 @@ static bool optc32_disable_crtc(struct timing_generator *optc) 
			OPTC_SEG3_SRC_SEL, 0xf,

			OPTC_NUM_OF_INPUT_SEGMENT, 0);



	/* disable otg request until end of the first line

	 * in the vertical blank region

	 */

	REG_UPDATE(OTG_CONTROL,

			OTG_MASTER_EN, 0);



	REG_UPDATE(CONTROL,

			VTG0_ENABLE, 0);
@@ -205,6 +205,13 @@ static void optc32_disable_phantom_otg(struct timing_generator *optc) 
{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	REG_UPDATE_5(OPTC_DATA_SOURCE_SELECT,

			OPTC_SEG0_SRC_SEL, 0xf,

			OPTC_SEG1_SRC_SEL, 0xf,

			OPTC_SEG2_SRC_SEL, 0xf,

			OPTC_SEG3_SRC_SEL, 0xf,

			OPTC_NUM_OF_INPUT_SEGMENT, 0);



	REG_UPDATE(OTG_CONTROL, OTG_MASTER_EN, 0);

}

drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c

+6 −6
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ static bool optc35_disable_crtc(struct timing_generator *optc) 
{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	/* disable otg request until end of the first line

	 * in the vertical blank region

	 */

	REG_UPDATE(OTG_CONTROL,

			OTG_MASTER_EN, 0);



	REG_UPDATE_5(OPTC_DATA_SOURCE_SELECT,

			OPTC_SEG0_SRC_SEL, 0xf,

			OPTC_SEG1_SRC_SEL, 0xf,
@@ -151,6 +145,12 @@ static bool optc35_disable_crtc(struct timing_generator *optc) 
			OPTC_SEG3_SRC_SEL, 0xf,

			OPTC_NUM_OF_INPUT_SEGMENT, 0);



	/* disable otg request until end of the first line

	 * in the vertical blank region

	 */

	REG_UPDATE(OTG_CONTROL,

			OTG_MASTER_EN, 0);



	REG_UPDATE(CONTROL,

			VTG0_ENABLE, 0);