tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amd/display: Add support for USBC connector

[Why]
Add support for CONNECTOR_ID_USBC

Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com>
Acked-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Samson Tam <Samson.Tam@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Samson Tam and committed by
Alex Deucher 8cb3c169 84d1ce06

+12 -3
+3
drivers/gpu/drm/amd/display/dc/bios/bios_parser_common.c
··· 213 213 case CONNECTOR_OBJECT_ID_MXM: 214 214 id = CONNECTOR_ID_MXM; 215 215 break; 216 + case CONNECTOR_OBJECT_ID_USBC: 217 + id = CONNECTOR_ID_USBC; 218 + break; 216 219 default: 217 220 id = CONNECTOR_ID_UNKNOWN; 218 221 break;
+2 -1
drivers/gpu/drm/amd/display/dc/bios/command_table.c
··· 522 522 */ 523 523 params.acConfig.ucEncoderSel = 1; 524 524 525 - if (CONNECTOR_ID_DISPLAY_PORT == connector_id) 525 + if (CONNECTOR_ID_DISPLAY_PORT == connector_id 526 + || CONNECTOR_ID_USBC == connector_id) 526 527 /* Bit4: DP connector flag 527 528 * =0 connector is none-DP connector 528 529 * =1 connector is DP connector
+6 -2
drivers/gpu/drm/amd/display/dc/core/dc_link.c
··· 345 345 case CONNECTOR_ID_LVDS: 346 346 return SIGNAL_TYPE_LVDS; 347 347 case CONNECTOR_ID_DISPLAY_PORT: 348 + case CONNECTOR_ID_USBC: 348 349 return SIGNAL_TYPE_DISPLAY_PORT; 349 350 case CONNECTOR_ID_EDP: 350 351 return SIGNAL_TYPE_EDP; ··· 381 380 382 381 bool present = 383 382 ((connector_id == CONNECTOR_ID_DISPLAY_PORT) || 384 - (connector_id == CONNECTOR_ID_EDP)); 383 + (connector_id == CONNECTOR_ID_EDP) || 384 + (connector_id == CONNECTOR_ID_USBC)); 385 385 386 386 ddc = dal_ddc_service_get_ddc_pin(link->ddc); 387 387 ··· 478 476 result = SIGNAL_TYPE_DVI_SINGLE_LINK; 479 477 } 480 478 break; 481 - case CONNECTOR_ID_DISPLAY_PORT: { 479 + case CONNECTOR_ID_DISPLAY_PORT: 480 + case CONNECTOR_ID_USBC: { 482 481 /* DP HPD short pulse. Passive DP dongle will not 483 482 * have short pulse 484 483 */ ··· 1594 1591 link->connector_signal = SIGNAL_TYPE_DVI_DUAL_LINK; 1595 1592 break; 1596 1593 case CONNECTOR_ID_DISPLAY_PORT: 1594 + case CONNECTOR_ID_USBC: 1597 1595 link->connector_signal = SIGNAL_TYPE_DISPLAY_PORT; 1598 1596 1599 1597 if (link->hpd_gpio)
+1
drivers/gpu/drm/amd/display/include/grph_object_id.h
··· 162 162 CONNECTOR_ID_MXM = 21, 163 163 CONNECTOR_ID_WIRELESS = 22, 164 164 CONNECTOR_ID_MIRACAST = 23, 165 + CONNECTOR_ID_USBC = 24, 165 166 166 167 CONNECTOR_ID_VIRTUAL = 100 167 168 };