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

drm/radeon: upstream ObjectID.h updates (v2)

v2: further updates

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+40
+40
drivers/gpu/drm/radeon/ObjectID.h
··· 69 69 #define ENCODER_OBJECT_ID_ALMOND 0x22 70 70 #define ENCODER_OBJECT_ID_TRAVIS 0x23 71 71 #define ENCODER_OBJECT_ID_NUTMEG 0x22 72 + #define ENCODER_OBJECT_ID_HDMI_ANX9805 0x26 73 + 72 74 /* Kaleidoscope (KLDSCP) Class Display Hardware (internal) */ 73 75 #define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1 0x13 74 76 #define ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 0x14 ··· 88 86 #define ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 0x20 89 87 #define ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 0x21 90 88 #define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24 89 + #define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 0x25 90 + #define ENCODER_OBJECT_ID_INTERNAL_AMCLK 0x27 91 91 92 92 #define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF 93 93 ··· 368 364 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\ 369 365 ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT) 370 366 367 + #define ENCODER_INTERNAL_UNIPHY3_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ 368 + GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 369 + ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 << OBJECT_ID_SHIFT) 370 + 371 + #define ENCODER_INTERNAL_UNIPHY3_ENUM_ID2 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ 372 + GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\ 373 + ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 << OBJECT_ID_SHIFT) 374 + 371 375 #define ENCODER_GENERAL_EXTERNAL_DVO_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ 372 376 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 373 377 ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO << OBJECT_ID_SHIFT) ··· 403 391 #define ENCODER_VCE_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ 404 392 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 405 393 ENCODER_OBJECT_ID_INTERNAL_VCE << OBJECT_ID_SHIFT) 394 + 395 + #define ENCODER_HDMI_ANX9805_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ 396 + GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 397 + ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT) 406 398 407 399 /****************************************************/ 408 400 /* Connector Object ID definition - Shared with BIOS */ ··· 477 461 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\ 478 462 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT) 479 463 464 + #define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 465 + GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\ 466 + CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT) 467 + 468 + #define CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 469 + GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\ 470 + CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT) 471 + 480 472 #define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 481 473 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ 482 474 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT) ··· 495 471 496 472 #define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 497 473 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\ 474 + CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT) 475 + 476 + #define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 477 + GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\ 498 478 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT) 499 479 500 480 #define CONNECTOR_VGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ ··· 567 539 568 540 #define CONNECTOR_HDMI_TYPE_A_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 569 541 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\ 542 + CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT) 543 + 544 + #define CONNECTOR_HDMI_TYPE_A_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 545 + GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\ 546 + CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT) 547 + 548 + #define CONNECTOR_HDMI_TYPE_A_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 549 + GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\ 550 + CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT) 551 + 552 + #define CONNECTOR_HDMI_TYPE_A_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\ 553 + GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\ 570 554 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT) 571 555 572 556 #define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\