diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-10-24 16:53:46 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-24 16:53:46 -0700 |
| commit | cd9c6e29146e1debaba4b0b9ad0d241f07bdbc14 (patch) | |
| tree | db76e867c3190af4cd6b3051f94d30b50377fb3e /src/i830_modes.c | |
| parent | c5cca4c20ae6b519e3b021a9d90809c1b3d1facb (diff) | |
| parent | eec5580cefffc293bf547372ab63b2fedaef4a83 (diff) | |
Merge branch 'modesetting-origin' into modesetting
Diffstat (limited to 'src/i830_modes.c')
| -rw-r--r-- | src/i830_modes.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/i830_modes.c b/src/i830_modes.c index 9301dda4..bc4536d5 100644 --- a/src/i830_modes.c +++ b/src/i830_modes.c @@ -766,7 +766,7 @@ I830ReprobePipeModeList(ScrnInfoPtr pScrn, int pipe) else outputs = (pI830->operatingDevices >> 8) & 0xff; - for (i = 0; i < MAX_OUTPUTS; i++) { + for (i = 0; i < pI830->num_outputs; i++) { switch (pI830->output[i].type) { case I830_OUTPUT_ANALOG: if (outputs & PIPE_CRT) { @@ -779,14 +779,12 @@ I830ReprobePipeModeList(ScrnInfoPtr pScrn, int pipe) } break; case I830_OUTPUT_DVO: - if (outputs & PIPE_DFP && pI830->output[i].i2c_drv != NULL) { + if (outputs & PIPE_DFP) { output_index = i; } break; case I830_OUTPUT_SDVO: - if (outputs & PIPE_DFP && - pI830->output[i].sdvo_drv != NULL) - { + if (outputs & PIPE_DFP) { output_index = i; } break; |