xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_atombios.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit f4292e110105910d0c19bf2db28e2682b27af2c7
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 20 15:31:43 2008 +1000

    Revert "Revert "ATOM: disable TV-out for now""
    
    Oops I really didn't mean to do this, I was testing something and it slipped
    past.
    
    This reverts commit dd18caa4b2efc430eaae0c4362b65641f9bef440.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 900e928..20aa722 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1787,6 +1787,13 @@ 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].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux;