xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit effa245914823371e052cd9aa1143a02350891e7
Author: Alex Deucher <alex at botchco.com>
Date:   Sun Jun 1 20:47:50 2008 -0400

    ATOM: disable TV-out for now
    
    It only sort of works in NTSC mode and isn't handled correctly
    in all cases yet.  Until we sort out the remaining details leave it
    disabled.
    See bugs: 16186, 16178, 16185

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 5cc21d5..e71b02e 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1786,6 +1786,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;