Skip to content

Commit b5abd7f

Browse files
charliu-AMDENGalexdeucher
authored andcommitted
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>
1 parent 2ff33c7 commit b5abd7f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ void dcn32_link_encoder_construct(
203203
enc10->base.hpd_source = init_data->hpd_source;
204204
enc10->base.connector = init_data->connector;
205205

206-
if (enc10->base.connector.id == CONNECTOR_ID_USBC)
207-
enc10->base.features.flags.bits.DP_IS_USB_C = 1;
208206

209207
enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
210208

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ void dcn35_link_encoder_construct(
184184
enc10->base.hpd_source = init_data->hpd_source;
185185
enc10->base.connector = init_data->connector;
186186

187-
if (enc10->base.connector.id == CONNECTOR_ID_USBC)
188-
enc10->base.features.flags.bits.DP_IS_USB_C = 1;
189187

190188
enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
191189

@@ -240,6 +238,8 @@ void dcn35_link_encoder_construct(
240238
}
241239

242240
enc10->base.features.flags.bits.HDMI_6GB_EN = 1;
241+
if (enc10->base.connector.id == CONNECTOR_ID_USBC)
242+
enc10->base.features.flags.bits.DP_IS_USB_C = 1;
243243

244244
if (bp_funcs->get_connector_speed_cap_info)
245245
result = bp_funcs->get_connector_speed_cap_info(enc10->base.ctx->dc_bios,

0 commit comments

Comments
 (0)