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_display.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_display.c')
| -rw-r--r-- | src/i830_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 5a0fb9d8..e3c3062f 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -866,10 +866,10 @@ i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode) for (i = 0; i < pI830->num_outputs; i++) { I830OutputPtr output = &pI830->output[i]; - if (pI830->output[i].sdvo_drv != NULL) + if (pI830->output[i].type == I830_OUTPUT_SDVO) pI830->output[i].dpms(pScrn, &pI830->output[i], DPMSModeOff); - if (output->i2c_drv != NULL) + if (pI830->output[i].type == I830_OUTPUT_DVO) output->i2c_drv->vid_rec->Mode(output->i2c_drv->dev_priv, pMode); } @@ -885,7 +885,7 @@ i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode) goto done; } for (i = 0; i < pI830->num_outputs; i++) { - if (pI830->output[i].sdvo_drv) + if (pI830->output[i].type == I830_OUTPUT_SDVO) I830SDVOPostSetMode(pI830->output[i].sdvo_drv, pMode); } |