diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-18 19:22:55 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-03-18 19:22:55 -0400 |
| commit | 537da7018b0fd2ad263fc5cdc55b3b85cf8e9205 (patch) | |
| tree | c52cc208f2bb4ea83d9db48366d2f7d5e9b0d6d4 /src/radeon_atombios.c | |
| parent | c0e2513ab128ddd5be0ed626d9e31777a98983ef (diff) | |
ATOM: fix up tv-out support
- fix purple hue when using ATOMTvOut option
- fix TV load detection on newer r6xx/r7xx chips
- disable CV for now
Diffstat (limited to 'src/radeon_atombios.c')
| -rw-r--r-- | src/radeon_atombios.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 406e4f9d..0b17cbd2 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1771,14 +1771,19 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn) con_obj_type = (path->usConnObjectId & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT; if ((path->usDeviceTag == ATOM_DEVICE_TV1_SUPPORT) || - (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT) || - (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT)) { + (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT)) { if (!enable_tv) { info->BiosConnector[i].valid = FALSE; continue; } } + /* don't support CV yet */ + if (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT) { + info->BiosConnector[i].valid = FALSE; + continue; + } + if ((info->ChipFamily == CHIP_FAMILY_RS780) && (con_obj_id == CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) { uint32_t slot_config, ct; @@ -2203,7 +2208,8 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) continue; } - if (!enable_tv && (i == ATOM_DEVICE_CV_INDEX)) { + /* don't support CV yet */ + if (i == ATOM_DEVICE_CV_INDEX) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping Component Video\n"); info->BiosConnector[i].valid = FALSE; continue; |