diff options
| author | Dillon Varone <dillon.varone@amd.com> | 2022-03-02 00:15:03 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-06-03 23:43:38 +0300 |
| commit | e42ce1366ae806ba2c1f884997703be68df428f4 (patch) | |
| tree | c29bf9dfb81a21611a95266650ec7e777d55af82 /drivers/gpu/drm/amd/display/dc/bios | |
| parent | 543036a2de71f14f8ad566c858e5e9ff61736a86 (diff) | |
| download | linux-e42ce1366ae806ba2c1f884997703be68df428f4.tar.xz | |
drm/amd/display: Fix USBC link creation
[Description]
Add USBC connector ID to align with new VBIOS parsing.
Add seperate DCN321 link encoder due to different PHY version affecting
DP ALT related registers.
Signed-off-by: Dillon Varone <dillon.varone@amd.com>
Acked-by: Jerry Zuo <jerry.zuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/bios')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/command_table.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index bbc0a5769e88..3540b46765fb 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -3224,6 +3224,7 @@ static enum bp_result update_slot_layout_info_v2( break; case CONNECTOR_ID_DISPLAY_PORT: + case CONNECTOR_ID_USBC: if (record->mini_type == MINI_TYPE_NORMAL) { slot_layout_info->connectors[i].connector_type = CONNECTOR_LAYOUT_TYPE_DP; slot_layout_info->connectors[i].length = CONNECTOR_SIZE_DP; diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c index 32efa92422e8..818a529cacc3 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c @@ -522,8 +522,8 @@ static enum bp_result transmitter_control_v2( */ params.acConfig.ucEncoderSel = 1; - if (CONNECTOR_ID_DISPLAY_PORT == connector_id - || CONNECTOR_ID_USBC == connector_id) + if (CONNECTOR_ID_DISPLAY_PORT == connector_id || + CONNECTOR_ID_USBC == connector_id) /* Bit4: DP connector flag * =0 connector is none-DP connector * =1 connector is DP connector |