From dd284392ce4792d20c2fcd09bbb6b8e168978d30 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Wed, 10 Dec 2008 10:54:31 +0800 Subject: 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. (cherry picked from commit 1e974ff6b8446ecd64677b3c9aba60ca850923cc) --- src/i830_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i830_driver.c b/src/i830_driver.c index 4f87efb8..75902571 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)) -- cgit v1.2.3