diff options
| author | Eric Anholt <eric@anholt.net> | 2006-10-05 16:02:02 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-10-05 16:16:45 -0700 |
| commit | 9bb7736ab36f172db58703c4664bb1b0cd7f80c3 (patch) | |
| tree | ff913af4d4370a70c45702d1f6e1eb22b9ce6abd /src/i830_driver.c | |
| parent | ada8f62da263d1e93e22df4e0b1149bf1dbe24d4 (diff) | |
Remove checks for output privates in various bits of code.
Now, the output is only set up if it fully initializes, so it will never exist
if the private it requires doesn't.
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 5da31a6f..4b558559 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -985,14 +985,12 @@ I830DetectMonitors(ScrnInfoPtr pScrn) xf86PrintEDID(pI830->output[i].MonInfo); break; case I830_OUTPUT_SDVO: - if (pI830->output[i].sdvo_drv != NULL) { - pI830->output[i].MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, - pI830->output[i].pDDCBus); + pI830->output[i].MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, + pI830->output[i].pDDCBus); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "DDC SDVO %d, %08lX\n", i, - pI830->output[i].pDDCBus->DriverPrivate.uval); - xf86PrintEDID(pI830->output[i].MonInfo); - } + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "DDC SDVO %d, %08lX\n", i, + pI830->output[i].pDDCBus->DriverPrivate.uval); + xf86PrintEDID(pI830->output[i].MonInfo); break; case I830_OUTPUT_UNUSED: break; @@ -1675,8 +1673,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) * treat different SDVO outputs differently. */ for (i = 0; i < MAX_OUTPUTS; i++) { - if (pI830->output[i].type == I830_OUTPUT_SDVO && - pI830->output[i].sdvo_drv != NULL) { + if (pI830->output[i].type == I830_OUTPUT_SDVO) { if (!I830DetectSDVODisplays(pScrn, i)) continue; @@ -4339,11 +4336,8 @@ i830MonitorDetectDebugger(ScrnInfoPtr pScrn) for (i = 0; i < MAX_OUTPUTS; i++) { Bool found_sdvo = TRUE; - if (pI830->output[i].type != I830_OUTPUT_SDVO || - pI830->output[i].sdvo_drv == NULL) - { + if (pI830->output[i].type != I830_OUTPUT_SDVO) continue; - } start = GetTimeInMillis(); found_sdvo = I830DetectSDVODisplays(pScrn, i); finish = GetTimeInMillis(); |