From 6a92a779646ec03a03a3b1f45170b2e705ce8934 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 14 Jul 2006 14:20:41 -0700 Subject: [PATCH] Don't try to probe on more pipes than we really have. --- src/i830_modes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i830_modes.c b/src/i830_modes.c index 1965c390..1c5e7eb4 100644 --- a/src/i830_modes.c +++ b/src/i830_modes.c @@ -895,7 +895,7 @@ I830ValidateXF86ModeList(ScrnInfoPtr pScrn, Bool first_time) Bool pipes_reconfigured = FALSE; int originalVirtualX, originalVirtualY; - for (pipe = 0; pipe < MAX_DISPLAY_PIPES; pipe++) { + for (pipe = 0; pipe < pI830->availablePipes; pipe++) { I830ReprobePipeModeList(pScrn, pipe); } @@ -944,7 +944,7 @@ I830ValidateXF86ModeList(ScrnInfoPtr pScrn, Bool first_time) /* Set up a virtual size that will cover any clone mode we'd want to set * for either of the two pipes. */ - for (pipe = 0; pipe < MAX_DISPLAY_PIPES; pipe++) { + for (pipe = 0; pipe < pI830->availablePipes; pipe++) { MonPtr mon = pI830->pipeMon[pipe]; DisplayModePtr mode; @@ -969,7 +969,7 @@ I830ValidateXF86ModeList(ScrnInfoPtr pScrn, Bool first_time) * initially. */ if (!first_time) { - for (pipe = 0; pipe < MAX_DISPLAY_PIPES; pipe++) { + for (pipe = 0; pipe < pI830->availablePipes; pipe++) { MonPtr mon = pI830->pipeMon[pipe]; DisplayModePtr mode;