[Intel-gfx] [PATCH] bug #17395: Quirk CRT for Sony VGC-LT71DB

[Zhenyu Wang]

---
 src/i830.h        |    1 +
 src/i830_crt.c    |    3 +++
 src/i830_quirks.c |    7 +++++++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/i830.h b/src/i830.h
index db35c1d..8ad5c69 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -1034,6 +1034,7 @@ extern const int I830CopyROP[16];
 #define QUIRK_IVCH_NEED_DVOB		0x00000010
 #define QUIRK_RESET_MODES		0x00000020
 #define QUIRK_PFIT_SAFE			0x00000040
+#define QUIRK_IGNORE_CRT		0x00000080
 extern void i830_fixup_devices(ScrnInfoPtr);
 
 #endif /* _I830_H_ */
diff --git a/src/i830_crt.c b/src/i830_crt.c
index ad81fbb..605ecf9 100644
--- a/src/i830_crt.c
+++ b/src/i830_crt.c
@@ -517,6 +517,9 @@ i830_crt_init(ScrnInfoPtr pScrn)
     I830OutputPrivatePtr    i830_output;
     I830Ptr		    pI830 = I830PTR(pScrn);
 
+    if (pI830->quirk_flag & QUIRK_IGNORE_CRT)
+	return;
+
     output = xf86OutputCreate (pScrn, &i830_crt_output_funcs, "VGA");
     if (!output)
 	return;
diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 54e3af6..1604294 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -194,6 +194,11 @@ static void quirk_ignore_lvds (I830Ptr pI830)
     pI830->quirk_flag |= QUIRK_IGNORE_LVDS;
 }
 
+static void quirk_ignore_crt (I830Ptr pI830)
+{
+    pI830->quirk_flag |= QUIRK_IGNORE_CRT;
+}
+
 static void quirk_mac_mini (I830Ptr pI830)
 {
     pI830->quirk_flag |= QUIRK_IGNORE_MACMINI_LVDS;
@@ -318,6 +323,8 @@ static i830_quirk i830_quirk_list[] = {
     { PCI_CHIP_I830_M, 0x104d, 0x8100, quirk_ivch_dvob },
     /* Sony vaio VGN-SZ4MN (See LP: #212163) */
     { PCI_CHIP_I830_M, 0x104d, 0x81e6, quirk_pipea_force },
+    /* Sony VGC-LT71DB has no VGA output (bug #17395) */
+    { PCI_CHIP_I965_GM, 0x104d, 0x9018, quirk_ignore_crt },
 
     /* Ordi Enduro UW31 (See LP: #152416) */
     { PCI_CHIP_I945_GM, 0x1584, 0x9900, quirk_ignore_tv },
-- 
1.5.6.5