diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-04-19 16:29:06 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-04-19 16:29:06 -0700 |
| commit | 2909802de63756972b38651a496b4ff1b36ac8a2 (patch) | |
| tree | 7c6227ebc5f2fa797f65502970a36cdebfa7bd15 /src/i830_driver.c | |
| parent | 132dc0599cf44389c4cc03919f1da8d3a0762b44 (diff) | |
Clean up SDVO initialization, include config.h, and make it check the right
slave address on the first device as well. This gets me to the point of
bringing up some modes on my device.
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 591605af..61cc231c 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1339,7 +1339,6 @@ I830SetupOutputBusses(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); int i = 0; - Bool ret; /* everyone has at least a single analog output */ pI830->output[i].type = I830_OUTPUT_ANALOG; @@ -1376,21 +1375,13 @@ I830SetupOutputBusses(ScrnInfoPtr pScrn) /* Set up SDVOB */ pI830->output[i].type = I830_OUTPUT_SDVO; I830I2CInit(pScrn, &pI830->output[i].pI2CBus, GPIOE, "SDVOCTRL_E"); - - pI830->output[i].sdvo_drv = I830SDVOInit(pI830->output[i].pI2CBus); - ret = I830I2CDetectSDVOController(pScrn, i); - if (ret == TRUE) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Found sDVOB\n"); + I830SDVOInit(pScrn, i, SDVOB); i++; /* Set up SDVOC */ pI830->output[i].type = I830_OUTPUT_SDVO; I830I2CInit(pScrn, &pI830->output[i].pI2CBus, GPIOE, "SDVOCTRL_E"); - - pI830->output[i].sdvo_drv = I830SDVOInit(pI830->output[i].pI2CBus); - ret = I830I2CDetectSDVOController(pScrn, i); - if (ret == TRUE) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Found sDVOC\n"); + I830SDVOInit(pScrn, i, SDVOC); i++; break; } @@ -1471,7 +1462,7 @@ void I830DetectMonitors(ScrnInfoPtr pScrn) #endif break; case I830_OUTPUT_SDVO: - if (pI830->output[i].sdvo_drv->found) { + if (pI830->output[i].sdvo_drv != NULL) { #if 0 I830SDVOSetupDDC(pI830->output[i].sdvo_drv); |