xf86-video-ati: Branch 'atom-tvout' - 2 commits

[Dave Airlie]

 src/radeon_atombios.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 01f7a50d76f706a456de7a4eb8323939d905c82b
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 17 13:43:21 2008 +1000

    r500: re-enable TV out

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 3d7d9f6..d38ab5d 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2011,13 +2011,6 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	    continue;
 	}
 #endif
-#if 1
-	if (i == ATOM_DEVICE_TV1_INDEX) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping TV-Out\n");
-	    info->BiosConnector[i].valid = FALSE;
-	    continue;
-	}
-#endif
 
 	info->BiosConnector[i].valid = TRUE;
 	info->BiosConnector[i].load_detection = TRUE;
commit 45b9ff5e250d69de0df41f68b33524f7e2ce13b7
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Dec 17 13:42:10 2008 +1000

    radeon: r500 PAL timings are slightly incorrect
    
    this stablises the PAL image at least

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index c9c7ae2..3d7d9f6 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1944,6 +1944,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;