1 files changed, 126 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ObjectID.h b/drivers/gpu/drm/radeon/ObjectID.h
index f1f18a48cf69..c714179d1bfa 100644
--- a/drivers/gpu/drm/radeon/ObjectID.h
+++ b/drivers/gpu/drm/radeon/ObjectID.h
@@ -106,6 +106,8 @@
 #define CONNECTOR_OBJECT_ID_CROSSFIRE             0x11
 #define CONNECTOR_OBJECT_ID_HARDCODE_DVI          0x12
 #define CONNECTOR_OBJECT_ID_DISPLAYPORT           0x13
+#define CONNECTOR_OBJECT_ID_eDP                   0x14
+#define CONNECTOR_OBJECT_ID_MXM                   0x15
 /* deleted */
@@ -116,7 +118,15 @@
 #define ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL                              0x01
 /****************************************************/
-// Graphics Object ENUM ID Definition               */
+/* Generic Object ID Definition                     */
+/****************************************************/
+#define GENERIC_OBJECT_ID_NONE                    0x00
+#define GENERIC_OBJECT_ID_GLSYNC                  0x01
+#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE        0x02
+#define GENERIC_OBJECT_ID_MXM_OPM                 0x03
+/****************************************************/
+/* Graphics Object ENUM ID Definition               */
 /****************************************************/
 #define GRAPH_OBJECT_ENUM_ID1                     0x01
 #define GRAPH_OBJECT_ENUM_ID2                     0x02
@@ -124,6 +134,7 @@
 #define GRAPH_OBJECT_ENUM_ID4                     0x04
 #define GRAPH_OBJECT_ENUM_ID5                     0x05
 #define GRAPH_OBJECT_ENUM_ID6                     0x06
+#define GRAPH_OBJECT_ENUM_ID7                     0x07
 /****************************************************/
 /* Graphics Object ID Bit definition                */
@@ -374,6 +385,18 @@
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
+#define CONNECTOR_LVDS_ENUM_ID2                ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
+#define CONNECTOR_eDP_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
+#define CONNECTOR_eDP_ENUM_ID2                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
 #define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1   ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
@@ -402,6 +425,14 @@
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID2     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
+#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID3     ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
 #define CONNECTOR_VGA_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
@@ -414,37 +445,76 @@
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
+#define CONNECTOR_COMPOSITE_ENUM_ID2           ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
 #define CONNECTOR_SVIDEO_ENUM_ID1              ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
+#define CONNECTOR_SVIDEO_ENUM_ID2              ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
 #define CONNECTOR_YPbPr_ENUM_ID1               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
+#define CONNECTOR_YPbPr_ENUM_ID2               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
 #define CONNECTOR_D_CONNECTOR_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
+#define CONNECTOR_D_CONNECTOR_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
 #define CONNECTOR_9PIN_DIN_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
+#define CONNECTOR_9PIN_DIN_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
 #define CONNECTOR_SCART_ENUM_ID1               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
+#define CONNECTOR_SCART_ENUM_ID2               ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
 #define CONNECTOR_HDMI_TYPE_A_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
+#define CONNECTOR_HDMI_TYPE_A_ENUM_ID3         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
 #define CONNECTOR_HDMI_TYPE_B_ENUM_ID1         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
+#define CONNECTOR_HDMI_TYPE_B_ENUM_ID2         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
 #define CONNECTOR_7PIN_DIN_ENUM_ID1            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
+#define CONNECTOR_7PIN_DIN_ENUM_ID2            ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
 #define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1      ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
@@ -487,6 +557,42 @@
                                                 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\
                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+#define CONNECTOR_DISPLAYPORT_ENUM_ID5         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+#define CONNECTOR_DISPLAYPORT_ENUM_ID6         ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
+#define CONNECTOR_MXM_ENUM_ID1                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_A
+#define CONNECTOR_MXM_ENUM_ID2                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_B
+#define CONNECTOR_MXM_ENUM_ID3                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_C
+#define CONNECTOR_MXM_ENUM_ID4                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DP_D
+#define CONNECTOR_MXM_ENUM_ID5                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_LVDS_TXxx
+#define CONNECTOR_MXM_ENUM_ID6                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_LVDS_UXxx
+#define CONNECTOR_MXM_ENUM_ID7                 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID7 << ENUM_ID_SHIFT |\
+                                                 CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT)          //Mapping to MXM_DAC
 /****************************************************/
 /* Router Object ID definition - Shared with BIOS   */
 /****************************************************/
@@ -497,6 +603,25 @@
 /* deleted */
 /****************************************************/
+/* Generic Object ID definition - Shared with BIOS  */
+/****************************************************/
+#define GENERICOBJECT_GLSYNC_ENUM_ID1           (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_GLSYNC << OBJECT_ID_SHIFT)
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID1       (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+#define GENERICOBJECT_PX2_NON_DRIVABLE_ID2       (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
+#define GENERICOBJECT_MXM_OPM_ENUM_ID1           (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT |\
+                                                 GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\
+                                                 GENERIC_OBJECT_ID_MXM_OPM << OBJECT_ID_SHIFT)
+/****************************************************/
 /* Object Cap definition - Shared with BIOS         */
 /****************************************************/
 #define GRAPHICS_OBJECT_CAP_I2C                 0x00000001L

diff --git a/drivers/gpu/drm/radeon/ObjectID.h b/drivers/gpu/drm/radeon/ObjectID.h index f1f18a48cf69..c714179d1bfa 100644 --- a/drivers/gpu/drm/radeon/ObjectID.h +++ b/drivers/gpu/drm/radeon/ObjectID.h
@@ -106,6 +106,8 @@
106	#define CONNECTOR_OBJECT_ID_CROSSFIRE 0x11	106	#define CONNECTOR_OBJECT_ID_CROSSFIRE 0x11
107	#define CONNECTOR_OBJECT_ID_HARDCODE_DVI 0x12	107	#define CONNECTOR_OBJECT_ID_HARDCODE_DVI 0x12
108	#define CONNECTOR_OBJECT_ID_DISPLAYPORT 0x13	108	#define CONNECTOR_OBJECT_ID_DISPLAYPORT 0x13
		109	#define CONNECTOR_OBJECT_ID_eDP 0x14
		110	#define CONNECTOR_OBJECT_ID_MXM 0x15
109		111
110	/* deleted */	112	/* deleted */
111		113
@@ -116,7 +118,15 @@
116	#define ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL 0x01	118	#define ROUTER_OBJECT_ID_I2C_EXTENDER_CNTL 0x01
117		119
118	/****************************************************/	120	/****************************************************/
119	// Graphics Object ENUM ID Definition */	121	/* Generic Object ID Definition */
		122	/****************************************************/
		123	#define GENERIC_OBJECT_ID_NONE 0x00
		124	#define GENERIC_OBJECT_ID_GLSYNC 0x01
		125	#define GENERIC_OBJECT_ID_PX2_NON_DRIVABLE 0x02
		126	#define GENERIC_OBJECT_ID_MXM_OPM 0x03
		127
		128	/****************************************************/
		129	/* Graphics Object ENUM ID Definition */
120	/****************************************************/	130	/****************************************************/
121	#define GRAPH_OBJECT_ENUM_ID1 0x01	131	#define GRAPH_OBJECT_ENUM_ID1 0x01
122	#define GRAPH_OBJECT_ENUM_ID2 0x02	132	#define GRAPH_OBJECT_ENUM_ID2 0x02
@@ -124,6 +134,7 @@
124	#define GRAPH_OBJECT_ENUM_ID4 0x04	134	#define GRAPH_OBJECT_ENUM_ID4 0x04
125	#define GRAPH_OBJECT_ENUM_ID5 0x05	135	#define GRAPH_OBJECT_ENUM_ID5 0x05
126	#define GRAPH_OBJECT_ENUM_ID6 0x06	136	#define GRAPH_OBJECT_ENUM_ID6 0x06
		137	#define GRAPH_OBJECT_ENUM_ID7 0x07
127		138
128	/****************************************************/	139	/****************************************************/
129	/* Graphics Object ID Bit definition */	140	/* Graphics Object ID Bit definition */
@@ -374,6 +385,18 @@
374	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	385	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
375	CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)	386	CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
376		387
		388	#define CONNECTOR_LVDS_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		389	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		390	CONNECTOR_OBJECT_ID_LVDS << OBJECT_ID_SHIFT)
		391
		392	#define CONNECTOR_eDP_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		393	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
		394	CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
		395
		396	#define CONNECTOR_eDP_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		397	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		398	CONNECTOR_OBJECT_ID_eDP << OBJECT_ID_SHIFT)
		399
377	#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	400	#define CONNECTOR_SINGLE_LINK_DVI_I_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
378	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	401	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
379	CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)	402	CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I << OBJECT_ID_SHIFT)
@@ -402,6 +425,14 @@
402	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	425	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
403	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)	426	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
404		427
		428	#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		429	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		430	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
		431
		432	#define CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		433	GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT \|\
		434	CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT)
		435
405	#define CONNECTOR_VGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	436	#define CONNECTOR_VGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
406	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	437	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
407	CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)	438	CONNECTOR_OBJECT_ID_VGA << OBJECT_ID_SHIFT)
@@ -414,37 +445,76 @@
414	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	445	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
415	CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)	446	CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
416		447
		448	#define CONNECTOR_COMPOSITE_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		449	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		450	CONNECTOR_OBJECT_ID_COMPOSITE << OBJECT_ID_SHIFT)
		451
417	#define CONNECTOR_SVIDEO_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	452	#define CONNECTOR_SVIDEO_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
418	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	453	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
419	CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)	454	CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
420		455
		456	#define CONNECTOR_SVIDEO_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		457	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		458	CONNECTOR_OBJECT_ID_SVIDEO << OBJECT_ID_SHIFT)
		459
421	#define CONNECTOR_YPbPr_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	460	#define CONNECTOR_YPbPr_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
422	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	461	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
423	CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)	462	CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
424		463
		464	#define CONNECTOR_YPbPr_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		465	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		466	CONNECTOR_OBJECT_ID_YPbPr << OBJECT_ID_SHIFT)
		467
425	#define CONNECTOR_D_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	468	#define CONNECTOR_D_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
426	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	469	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
427	CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)	470	CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
428		471
		472	#define CONNECTOR_D_CONNECTOR_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		473	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		474	CONNECTOR_OBJECT_ID_D_CONNECTOR << OBJECT_ID_SHIFT)
		475
429	#define CONNECTOR_9PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	476	#define CONNECTOR_9PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
430	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	477	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
431	CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)	478	CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
432		479
		480	#define CONNECTOR_9PIN_DIN_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		481	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		482	CONNECTOR_OBJECT_ID_9PIN_DIN << OBJECT_ID_SHIFT)
		483
433	#define CONNECTOR_SCART_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	484	#define CONNECTOR_SCART_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
434	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	485	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
435	CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)	486	CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
436		487
		488	#define CONNECTOR_SCART_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		489	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		490	CONNECTOR_OBJECT_ID_SCART << OBJECT_ID_SHIFT)
		491
437	#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	492	#define CONNECTOR_HDMI_TYPE_A_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
438	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	493	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
439	CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)	494	CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
440		495
		496	#define CONNECTOR_HDMI_TYPE_A_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		497	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		498	CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
		499
		500	#define CONNECTOR_HDMI_TYPE_A_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		501	GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT \|\
		502	CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT)
		503
441	#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	504	#define CONNECTOR_HDMI_TYPE_B_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
442	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	505	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
443	CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)	506	CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
444		507
		508	#define CONNECTOR_HDMI_TYPE_B_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		509	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		510	CONNECTOR_OBJECT_ID_HDMI_TYPE_B << OBJECT_ID_SHIFT)
		511
445	#define CONNECTOR_7PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	512	#define CONNECTOR_7PIN_DIN_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
446	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	513	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
447	CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)	514	CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
		515	#define CONNECTOR_7PIN_DIN_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		516	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		517	CONNECTOR_OBJECT_ID_7PIN_DIN << OBJECT_ID_SHIFT)
448		518
449	#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\	519	#define CONNECTOR_PCIE_CONNECTOR_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
450	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\	520	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
@@ -487,6 +557,42 @@
487	GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT \|\	557	GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT \|\
488	CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)	558	CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
489		559
		560	#define CONNECTOR_DISPLAYPORT_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		561	GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT \|\
		562	CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
		563
		564	#define CONNECTOR_DISPLAYPORT_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		565	GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT \|\
		566	CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT)
		567
		568	#define CONNECTOR_MXM_ENUM_ID1 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		569	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
		570	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_DP_A
		571
		572	#define CONNECTOR_MXM_ENUM_ID2 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		573	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		574	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_DP_B
		575
		576	#define CONNECTOR_MXM_ENUM_ID3 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		577	GRAPH_OBJECT_ENUM_ID3 << ENUM_ID_SHIFT \|\
		578	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_DP_C
		579
		580	#define CONNECTOR_MXM_ENUM_ID4 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		581	GRAPH_OBJECT_ENUM_ID4 << ENUM_ID_SHIFT \|\
		582	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_DP_D
		583
		584	#define CONNECTOR_MXM_ENUM_ID5 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		585	GRAPH_OBJECT_ENUM_ID5 << ENUM_ID_SHIFT \|\
		586	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_LVDS_TXxx
		587
		588	#define CONNECTOR_MXM_ENUM_ID6 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		589	GRAPH_OBJECT_ENUM_ID6 << ENUM_ID_SHIFT \|\
		590	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_LVDS_UXxx
		591
		592	#define CONNECTOR_MXM_ENUM_ID7 ( GRAPH_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT \|\
		593	GRAPH_OBJECT_ENUM_ID7 << ENUM_ID_SHIFT \|\
		594	CONNECTOR_OBJECT_ID_MXM << OBJECT_ID_SHIFT) //Mapping to MXM_DAC
		595
490	/****************************************************/	596	/****************************************************/
491	/* Router Object ID definition - Shared with BIOS */	597	/* Router Object ID definition - Shared with BIOS */
492	/****************************************************/	598	/****************************************************/
@@ -497,6 +603,25 @@
497	/* deleted */	603	/* deleted */
498		604
499	/****************************************************/	605	/****************************************************/
		606	/* Generic Object ID definition - Shared with BIOS */
		607	/****************************************************/
		608	#define GENERICOBJECT_GLSYNC_ENUM_ID1 (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT \|\
		609	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
		610	GENERIC_OBJECT_ID_GLSYNC << OBJECT_ID_SHIFT)
		611
		612	#define GENERICOBJECT_PX2_NON_DRIVABLE_ID1 (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT \|\
		613	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
		614	GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
		615
		616	#define GENERICOBJECT_PX2_NON_DRIVABLE_ID2 (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT \|\
		617	GRAPH_OBJECT_ENUM_ID2 << ENUM_ID_SHIFT \|\
		618	GENERIC_OBJECT_ID_PX2_NON_DRIVABLE<< OBJECT_ID_SHIFT)
		619
		620	#define GENERICOBJECT_MXM_OPM_ENUM_ID1 (GRAPH_OBJECT_TYPE_GENERIC << OBJECT_TYPE_SHIFT \|\
		621	GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT \|\
		622	GENERIC_OBJECT_ID_MXM_OPM << OBJECT_ID_SHIFT)
		623
		624	/****************************************************/
500	/* Object Cap definition - Shared with BIOS */	625	/* Object Cap definition - Shared with BIOS */
501	/****************************************************/	626	/****************************************************/
502	#define GRAPHICS_OBJECT_CAP_I2C 0x00000001L	627	#define GRAPHICS_OBJECT_CAP_I2C 0x00000001L