xf86-video-intel: 2 commits - src/i830_crt.c src/i830_driver.c src/i830.h src/i830_quirks.c
Zhenyu Wang
zhen at kemper.freedesktop.org
Wed Dec 10 17:04:48 PST 2008
src/i830.h | 1 +
src/i830_crt.c | 3 +++
src/i830_driver.c | 4 +++-
src/i830_quirks.c | 7 +++++++
4 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 1e974ff6b8446ecd64677b3c9aba60ca850923cc
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Dec 10 10:54:31 2008 +0800
Try to always probe SDVOC on 965G/965GM
Detect bit of SDVOC is reserved on 965G/965GM, instead of ignore SDVOC
this trys to always probe it on these chipsets.
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4f87efb..7590257 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -919,7 +919,9 @@ I830SetupOutputs(ScrnInfoPtr pScrn)
i830_hdmi_init(pScrn, SDVOB);
}
- if ((INREG(SDVOC) & SDVO_DETECTED) || pI830->force_sdvo_detect) {
+ if ((INREG(SDVOC) & SDVO_DETECTED) || pI830->force_sdvo_detect ||
+ /* SDVOC detect bit is reserved on 965G/965GM */
+ (IS_I965G(pI830) && !IS_G4X(pI830))) {
Bool found = i830_sdvo_init(pScrn, SDVOC);
if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
commit f5f67e1b54e67b4bfc3db3482b2693211be81d63
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Dec 10 10:36:07 2008 +0800
bug #17395: Quirk CRT for Sony VGC-LT71DB
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 },
More information about the xorg-commit
mailing list