[Intel-gfx] [PATCH] restore sdvo detect

[Zhenyu Wang]

Bug #16631, it looks some dual-output ADD2 card can't be fully detected
by video bios, and this patch trys to restore current sdvo detect behavior
back to driver 2.3. It seems our driver does better job to probe the output
in that case, instead of depending on 'detect' bit set by others.

---
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 9bf0a64..5de8e7d 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -915,19 +915,18 @@ 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;
+       found = i830_sdvo_init(pScrn, SDVOB);
 
-	 if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
-	    i830_hdmi_init(pScrn, SDVOB);
-      }
+       if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)
+	       && (INREG(SDVOB) & SDVO_DETECTED))
+	   i830_hdmi_init(pScrn, SDVOB);
 
-      if (INREG(SDVOC) & SDVO_DETECTED) {
-	 Bool found = i830_sdvo_init(pScrn, SDVOC);
+       found = i830_sdvo_init(pScrn, SDVOC);
 
-	 if (!found && SUPPORTS_INTEGRATED_HDMI(pI830))
-	    i830_hdmi_init(pScrn, SDVOC);
-      }
+       if (!found && SUPPORTS_INTEGRATED_HDMI(pI830)
+	       && (INREG(SDVOC) & SDVO_DETECTED))
+	   i830_hdmi_init(pScrn, SDVOC);
    } else {
       i830_dvo_init(pScrn);
    }

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20080918/a1c7ef2c/attachment.sig>