xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit cb2dc19387c7b6494c47c76d683cf38a48700768
Author: Alex Deucher <alex at cube.(none)>
Date:   Thu Mar 6 18:33:12 2008 -0500

    AVIVO: fix typo from a previous commit
    
    Leave tv dpms hook disabled or you may get bad interactions
    with the shared DAC

diff --git a/src/atombios_output.c b/src/atombios_output.c
index 06e5a77..7ae004c 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -720,8 +720,8 @@ 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 (radeon_output->MonType == MT_STV ||
-	      radeon_output->MonType == MT_CTV) {
+   } else if (0 /*radeon_output->MonType == MT_STV ||
+		  radeon_output->MonType == MT_CTV*/) {
        ErrorF("AGD: tv dpms\n");
        if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT)
 	   atombios_device_dpms(output, ATOM_DEVICE_TV1_SUPPORT, mode);