diff --git a/src/i830_driver.c b/src/i830_driver.c index 209aa07..e852dd0 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -924,19 +924,17 @@ I830SetupOutputs(ScrnInfoPtr pScrn) i830_lvds_init(pScrn); if (IS_I9XX(pI830)) { - if (INREG(SDVOB) & SDVO_DETECTED) { - Bool found = i830_sdvo_init(pScrn, SDVOB); + Bool found; - if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) - i830_hdmi_init(pScrn, SDVOB); - } + found = i830_sdvo_init(pScrn, SDVOB); - if (INREG(SDVOC) & SDVO_DETECTED) { - Bool found = i830_sdvo_init(pScrn, SDVOC); + if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) + i830_hdmi_init(pScrn, SDVOB); - if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) - i830_hdmi_init(pScrn, SDVOC); - } + found = i830_sdvo_init(pScrn, SDVOC); + + if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)) + i830_hdmi_init(pScrn, SDVOC); } else { i830_dvo_init(pScrn); }