ID: Fix up Macbook pro.

This one has a rather awkward atombios connector table and requires an id based
workaround.

Thanks to Jerome Glisse.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/rhd_id.c b/src/rhd_id.c
index c7cc533..08f6e09 100644
--- a/src/rhd_id.c
+++ b/src/rhd_id.c
@@ -280,6 +280,15 @@ RHDIdentify(int flags)
      { {RHD_CONNECTOR_NONE, "NULL", RHD_DDC_NONE, RHD_HPD_NONE, \
        { RHD_OUTPUT_NONE, RHD_OUTPUT_NONE}}}
 
+/*
+ * MacBook Pro provides a weird atombios connector table.
+ */
+#define ID_CONNECTORINFO_MACBOOKPRO \
+ { {RHD_CONNECTOR_PANEL, "Panel", RHD_DDC_NONE, RHD_HPD_NONE, \
+       { RHD_OUTPUT_LVTMA, RHD_OUTPUT_NONE}}, \
+    {RHD_CONNECTOR_DVI, "DVI-I", RHD_DDC_0, RHD_HPD_0, \
+       { RHD_OUTPUT_DACB, RHD_OUTPUT_TMDSA}}}
+
 #if defined(USE_ID_CONNECTORS) || !defined(ATOM_BIOS)
 
 #define VGA_A0_DVI_BA10 \
@@ -360,12 +369,6 @@ RHDIdentify(int flags)
     {RHD_CONNECTOR_VGA, "VGA", RHD_DDC_0, RHD_HPD_NONE, \
        { RHD_OUTPUT_DACA, RHD_OUTPUT_NONE}}}
 
-#define PANEL_B2_DVI_AA00 \
-  { {RHD_CONNECTOR_PANEL, "Panel", RHD_DDC_2, RHD_HPD_NONE, \
-       { RHD_OUTPUT_LVTMA, RHD_OUTPUT_NONE}}, \
-    {RHD_CONNECTOR_DVI, "DVI-I", RHD_DDC_0, RHD_HPD_0, \
-       { RHD_OUTPUT_DACA, RHD_OUTPUT_TMDSA}}}
-
 #define PANEL_B2_VGA_A0_DVI_A10 \
   { {RHD_CONNECTOR_PANEL, "Panel", RHD_DDC_2, RHD_HPD_NONE, \
        { RHD_OUTPUT_LVTMA, RHD_OUTPUT_NONE}}, \
@@ -389,7 +392,6 @@ RHDIdentify(int flags)
 #define PANEL_B1_VGA_A0         ID_CONNECTORINFO_EMPTY
 #define PANEL_B1_VGA_A2         ID_CONNECTORINFO_EMPTY
 #define PANEL_B2_VGA_A0         ID_CONNECTORINFO_EMPTY
-#define PANEL_B2_DVI_AA00       ID_CONNECTORINFO_EMPTY
 #define PANEL_B2_VGA_A0_DVI_A10 ID_CONNECTORINFO_EMPTY
 
 #endif /* if defined(USE_ID_CONNECTORS) || !defined(ATOM_BIOS) */
@@ -479,7 +481,7 @@ rhdCards[] =
     { 0x71C5, 0x103C, 0x30A3, "HP/Compaq nc8430", RHD_CARD_FLAG_NONE, PANEL_B1_VGA_A0 },
     { 0x71C5, 0x103C, 0x30B4, "HP/Compaq nw8440", RHD_CARD_FLAG_NONE, PANEL_B1_VGA_A0 },
     { 0x71C5, 0x1043, 0x10B2, "Asus W3J/Z96", RHD_CARD_FLAG_NONE, PANEL_B_VGA_A0 },
-    { 0x71C5, 0x106B, 0x0080, "Macbook Pro", RHD_CARD_FLAG_NONE, PANEL_B2_DVI_AA00 },
+    { 0x71C5, 0x106B, 0x0080, "Macbook Pro", RHD_CARD_FLAG_NONE, ID_CONNECTORINFO_MACBOOKPRO },
     { 0x71C5, 0x1179, 0xFF10, "Toshiba Satellite A100-237", RHD_CARD_FLAG_NONE, PANEL_B1_VGA_A2 },
     /* 0x71C6 : RV530 : Radeon X1650 */
     { 0x71C6, 0x174B, 0x0850, "Sapphire X1650 Pro AGP", RHD_CARD_FLAG_NONE, VGA_A0_DVI_BA10 },
@@ -532,7 +534,7 @@ rhdCards[] =
     /* 0x7297 : RV560 : RV560 */
     /* 0x791E : RS690 : Radeon X1200 */
     /* 0x791F : RS690 : Radeon X1200 */
-    { 0x791F, 0x103C, 0x30C2, "Radeon X1250", RHD_CARD_FLAG_NONE, ID_CONNECTORINFO_EMPTY },
+    { 0x791F, 0x103C, 0x30C2, "HP/Compaq 6715b", RHD_CARD_FLAG_NONE, ID_CONNECTORINFO_EMPTY },
     /* 0x796C : RS740 : RS740 */
     /* 0x796D : RS740 : RS740M */
     /* 0x796E : RS740 : RS740 */