diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-23 14:06:06 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-04-23 14:06:06 -0400 |
| commit | 7ed27b926f28a1f088eace5034a7d9985f13752d (patch) | |
| tree | 442b87188f2ecec1ca7f7e695fc77e6009483f8e /src/legacy_output.c | |
| parent | 0da80f34b5aa5999d2030ffbc5187328fa4e4ae5 (diff) | |
r2xx/r3xx/r4xx: further i2c fixups
- hw i2c engine has pin selection on r2xx/r2xx/r3xx chips
- also switch hw i2c pin sel for external tmds
Diffstat (limited to 'src/legacy_output.c')
| -rw-r--r-- | src/legacy_output.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c index 423a3e27..7134ee15 100644 --- a/src/legacy_output.c +++ b/src/legacy_output.c @@ -150,7 +150,6 @@ void RADEONGetExtTMDSInfo(ScrnInfoPtr pScrn, radeon_dvo_ptr dvo) { RADEONInfoPtr info = RADEONPTR(pScrn); - I2CBusPtr pDVOBus; if (!info->IsAtomBios) { #if defined(__powerpc__) @@ -162,11 +161,11 @@ RADEONGetExtTMDSInfo(ScrnInfoPtr pScrn, radeon_dvo_ptr dvo) dvo->dvo_i2c_slave_addr = 0x70; } #endif - if (RADEONI2CInit(pScrn, &pDVOBus, "DVO", &dvo->dvo_i2c)) { + if (RADEONI2CInit(pScrn, &dvo->pI2CBus, "DVO", &dvo->dvo_i2c)) { dvo->DVOChip = - RADEONDVODeviceInit(pDVOBus, dvo->dvo_i2c_slave_addr); + RADEONDVODeviceInit(dvo->pI2CBus, dvo->dvo_i2c_slave_addr); if (!dvo->DVOChip) - xfree(pDVOBus); + xfree(dvo->pI2CBus); } } } @@ -481,7 +480,7 @@ RADEONRestoreDVOChip(ScrnInfoPtr pScrn, xf86OutputPtr output) if (!dvo->DVOChip) return; - RADEONI2CDoLock(output, TRUE); + RADEONI2CDoLock(output, dvo->pI2CBus, TRUE); if (!RADEONInitExtTMDSInfoFromBIOS(output)) { if (dvo->DVOChip) { switch(info->ext_tmds_chip) { @@ -511,7 +510,7 @@ RADEONRestoreDVOChip(ScrnInfoPtr pScrn, xf86OutputPtr output) } } } - RADEONI2CDoLock(output, FALSE); + RADEONI2CDoLock(output, dvo->pI2CBus, FALSE); } #if 0 |