Commit b5abd7f9 authored Jan 16, 2024 by Charlene Liu Committed by Alex Deucher Jan 31, 2024

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



[why]
BIOS's integration info table not following the original order
which is phy instance is ext_displaypath's array index.

[how]
Move them to follow the original order.

Reviewed-by: Muhammad Ahmed <ahmed.ahmed@amd.com>
Acked-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 2ff33c75

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -203,12 +203,12 @@ void dcn32_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;

		enc10->base.features = *enc_features;
		if (enc10->base.connector.id == CONNECTOR_ID_USBC)
		enc10->base.features.flags.bits.DP_IS_USB_C = 1;

		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,8 +184,6 @@ 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;

		@@ -240,6 +238,8 @@ 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,