diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-01-28 13:13:13 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-01-28 13:13:13 -0500 |
| commit | 4f88dd83f290fb38e41256a7f1804008c0f28139 (patch) | |
| tree | 5dbc7f56e4ec4b14f6150480d6e015d87ea2292a /src/radeon_atombios.c | |
| parent | 1c5678fc452dbc93135e9ece50a4cff6583f6078 (diff) | |
| parent | 2ca970c7aa1f3f212f03bf3287d6b60eeafd68ae (diff) | |
Merge branch 'atom-tvout' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
Conflicts:
src/radeon_atombios.c
Diffstat (limited to 'src/radeon_atombios.c')
| -rw-r--r-- | src/radeon_atombios.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c index 1ca9f86f..1acb997d 100644 --- a/src/radeon_atombios.c +++ b/src/radeon_atombios.c @@ -1961,6 +1961,12 @@ RADEONATOMGetTVTimings(ScrnInfoPtr pScrn, int index, SET_CRTC_TIMING_PARAMETERS_ crtc_timing->ucOverscanBottom = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanBottom); crtc_timing->ucOverscanTop = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_OverscanTop); *pixel_clock = le16_to_cpu(tv_info->aModeTimings[index].usPixelClock) * 10; + + if (index == 1) { + /* PAL timings appear to have wrong values for totals */ + crtc_timing->usH_Total -= 1; + crtc_timing->usV_Total -= 1; + } break; case 2: tv_info_v1_2 = atomDataPtr->AnalogTV_Info.AnalogTV_Info_v1_2; @@ -2024,6 +2030,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) info->BiosConnector[i].valid = FALSE; continue; } + if (!enable_tv && (i == ATOM_DEVICE_TV1_INDEX)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping TV-Out\n"); info->BiosConnector[i].valid = FALSE; |