diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 00:52:21 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 00:52:21 -0800 |
| commit | 7fcb555735a58e19ccc10875b211402983170a87 (patch) | |
| tree | f1f7531380cf79321c12d90ce613e89467388154 /src/i830_display.c | |
| parent | 3ab7f9693217d8fe993bdc94c376b219b0082961 (diff) | |
Rename availablePipes to num_pipes
Diffstat (limited to 'src/i830_display.c')
| -rw-r--r-- | src/i830_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index c9b6b4dd..6c5645b9 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -673,7 +673,7 @@ i830DisableUnusedFunctions(ScrnInfoPtr pScrn) * internal TV) should have no outputs trying to pull data out of it, so * we're ready to turn those off. */ - for (i = 0; i < pI830->availablePipes; i++) { + for (i = 0; i < pI830->num_pipes; i++) { I830PipePtr pI830Pipe = &pI830->pipes[i]; int dspcntr_reg = pipe == 0 ? DSPACNTR : DSPBCNTR; int pipeconf_reg = pipe == 0 ? PIPEACONF : PIPEBCONF; @@ -749,13 +749,13 @@ i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode) didLock = I830DRILock(pScrn); #endif - for (i = 0; i < pI830->availablePipes; i++) + for (i = 0; i < pI830->num_pipes; i++) pI830->pipes[i].planeEnabled = i830PipeInUse (pScrn, i); for (i = 0; i < pI830->num_outputs; i++) pI830->output[i].pre_set_mode(pScrn, &pI830->output[i], pMode); - for (i = 0; i < pI830->availablePipes; i++) + for (i = 0; i < pI830->num_pipes; i++) { if (pI830->pipes[i].planeEnabled) ok = i830PipeSetMode(pScrn, i830PipeFindClosestMode(pScrn, i, pMode), @@ -815,7 +815,7 @@ i830DescribeOutputConfiguration(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Output configuration:\n"); - for (i = 0; i < pI830->availablePipes; i++) { + for (i = 0; i < pI830->num_pipes; i++) { CARD32 dspcntr = INREG(DSPACNTR + (DSPBCNTR - DSPACNTR) * i); xf86DrvMsg(pScrn->scrnIndex, X_INFO, |