From fdb6de663579d3b9f31bf9e8a93430b8505ca73f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 27 Sep 2006 13:59:41 -0700
Subject: [PATCH] Re-disable broken load-based CRT detection.

---
 src/i830_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i830_display.c b/src/i830_display.c
index 88280bb3..24ce50f7 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1081,7 +1081,7 @@ i830DetectCRT(ScrnInfoPtr pScrn, Bool allow_disturb)
      * pipe, as it seems having other outputs on that pipe will result in a
      * false positive.
      */
-    if (1 && (allow_disturb || !(INREG(ADPA) & !ADPA_DAC_ENABLE))) {
+    if (0 && (allow_disturb || !(INREG(ADPA) & !ADPA_DAC_ENABLE))) {
 	return i830LoadDetectCRT(pScrn);
     }