Commit 91f10a3d authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amd/display: fix USB-C flag update after enc10 feature init" 

This reverts commit b5abd7f9.

This change breaks DSC on 4k monitors at 144Hz over USB-C.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3254


Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Muhammad Ahmed <ahmed.ahmed@amd.com>
Cc: Tom Chung <chiahsuan.chung@amd.com>
Cc: Charlene Liu <charlene.liu@amd.com>
Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: stable@vger.kernel.org
parent 18921b20

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c

+3 −5
Original line number Diff line number Diff line
@@ -248,14 +248,12 @@ void dcn32_link_encoder_construct( 
	enc10->base.hpd_source = init_data->hpd_source;

	enc10->base.connector = init_data->connector;



	enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;



	enc10->base.features = *enc_features;

	if (enc10->base.connector.id == CONNECTOR_ID_USBC)

		enc10->base.features.flags.bits.DP_IS_USB_C = 1;



	if (enc10->base.connector.id == CONNECTOR_ID_USBC)

		enc10->base.features.flags.bits.DP_IS_USB_C = 1;

	enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;



	enc10->base.features = *enc_features;



	enc10->base.transmitter = init_data->transmitter;

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

+2 −2
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ void dcn35_link_encoder_construct( 
	enc10->base.hpd_source = init_data->hpd_source;

	enc10->base.connector = init_data->connector;



	if (enc10->base.connector.id == CONNECTOR_ID_USBC)

		enc10->base.features.flags.bits.DP_IS_USB_C = 1;



	enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
@@ -238,8 +240,6 @@ void dcn35_link_encoder_construct( 
	}



	enc10->base.features.flags.bits.HDMI_6GB_EN = 1;

	if (enc10->base.connector.id == CONNECTOR_ID_USBC)

		enc10->base.features.flags.bits.DP_IS_USB_C = 1;



	if (bp_funcs->get_connector_speed_cap_info)

		result = bp_funcs->get_connector_speed_cap_info(enc10->base.ctx->dc_bios,