xf86-video-intel: Branch 'xf86-video-intel-2.5-branch' - 3 commits - src/i830_quirks.c

[Jesse Barnes]

 src/i830_quirks.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d18b86aa7fc9270e24ed9ea861ebbbbb54558fee
Merge: 9a7da65... 6a46022...
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Sep 22 18:03:39 2008 -0700

    Merge branch 'master' into xf86-video-intel-2.5-branch

commit 6a46022df57d09109fc119fedce99c156715a4d4
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Sep 22 13:26:58 2008 -0700

    Add no TV out quirk for HP Compaq nx6110
    
    Hopefully we can fix the VBT parsing code so we don't need this, but for the
    time being it seems necessary.  Fixes bz #17683.

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index a3b2386..528b564 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -281,6 +281,8 @@ static i830_quirk i830_quirk_list[] = {
     /* Samsung Q45 has no TV output */
     { PCI_CHIP_I965_GM, 0x144d, 0xc510, quirk_ignore_tv },
 
+    /* HP Compaq nx6110 has no TV output */
+    { PCI_CHIP_I915_GM, 0x103c, 0x099c, quirk_ignore_tv },
     /* HP Compaq 6730s has no TV output */
     { PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },
 
commit 10909d9b665864bda2b1654de009d556cd068726
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Sep 22 13:11:55 2008 -0700

    Add Cappuccino SlimPRO SP625F to no LVDS quirks list
    
    Looks like this platform might contain VBTs that indicate an LFP is present
    even though it isn't.  Intended to fix bz #11368.

diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 089e458..a3b2386 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -229,6 +229,9 @@ static i830_quirk i830_quirk_list[] = {
     { PCI_CHIP_I965_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
     { PCI_CHIP_I965_GM, 0x8086, 0x1999, quirk_ignore_lvds },
 
+    /* Cappuccino SlimPRO SP625F, bz #11368 */
+    { PCI_CHIP_I855_GM, 0x8086, 0x3582, quirk_ignore_lvds },
+
     /* Apple Mac mini has no lvds, but macbook pro does */
     { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },