xf86-video-intel: Branch 'modesetting' - src/i830_display.c

[Keith Packard]

 src/i830_display.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

New commits:
diff-tree 9aea79d1e954fe4fb5c101edcb7c2d0f706a5c4c (from 4889b9f33336c92f07aac86d75f50316db6ef81a)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Nov 16 11:40:26 2006 -0800

    Inverted boolean sense when selecting pipe for CRT detection.
    
    Pipes are available when they are not in use.

diff --git a/src/i830_display.c b/src/i830_display.c
index f661c4e..a0809eb 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -904,7 +904,6 @@ int
 i830GetLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output)
 {
     I830Ptr pI830 = I830PTR(pScrn);
-    Bool pipe_available[MAX_DISPLAY_PIPES];
     int i;
     /* VESA 640x480x72Hz mode to set on the pipe */
     DisplayModeRec mode = {
@@ -944,16 +943,12 @@ i830GetLoadDetectPipe(ScrnInfoPtr pScrn,
     }
 
     for (i = 0; i < pI830->num_pipes; i++)
-	pipe_available[i] = i830PipeInUse(pScrn, i);
-
-    for (i = 0; i < pI830->num_pipes; i++) {
-	if (pipe_available[i])
+	if (!i830PipeInUse(pScrn, i))
 	    break;
-    }
 
-    if (i == pI830->num_pipes) {
+    if (i == pI830->num_pipes)
 	return -1;
-    }
+
     output->load_detect_temp = TRUE;
     output->pipe = i;
     output->enabled = TRUE;