xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/atombios_output.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 394c52273328e90518568b694ee79dc1a8dab651
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jan 3 18:56:16 2008 +1000

    r500: tvout avoid doing dpms here it makes my tv mode go all crappy
    
    need to investigate further

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 83b5d92..8098185 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -473,12 +473,11 @@ atombios_output_dpms(xf86OutputPtr output, int mode)
        ErrorF("AGD: cv dpms\n");
        if (radeon_output->devices & ATOM_DEVICE_CV_SUPPORT)
 	   atombios_device_dpms(output, ATOM_DEVICE_CV_SUPPORT, mode);
-   } else if (OUTPUT_IS_TV) {
+   } else if (0 /*OUTPUT_IS_TV*/) {
        ErrorF("AGD: tv dpms\n");
        if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT)
 	   atombios_device_dpms(output, ATOM_DEVICE_TV1_SUPPORT, mode);
    }
-
 #if 1
     /* release card lock */
     tmp = INREG(0x0028);