diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-10 10:54:31 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-12-11 09:47:12 +0800 |
| commit | dd284392ce4792d20c2fcd09bbb6b8e168978d30 (patch) | |
| tree | 06211e216eae1ce3c4d8d80efa756d2cf402138f /src | |
| parent | 5c659cbcf33f56878d14d5e74747870ce29d76bf (diff) | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
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)) |