xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_output.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

New commits:
diff-tree f8cd74435f0072dbf5f6e83d67d2d5e1f4e82c91 (from 6f398cd07ea734dd66a8eac71b629e59123d75b8)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Tue Aug 14 23:50:57 2007 -0400

    RADEON: minor cleanup

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 7f8f406..d8d411a 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -940,8 +940,9 @@ static void RADEONInitDAC2Registers(xf86
     if (IS_R300_VARIANT)
 	save->gpiopad_a = info->SavedReg.gpiopad_a | 1;
 
+    save->dac2_cntl = info->SavedReg.dac2_cntl | RADEON_DAC2_DAC2_CLK_SEL;
+
     if (IsPrimary) {
-        save->dac2_cntl = info->SavedReg.dac2_cntl | RADEON_DAC2_DAC2_CLK_SEL;
         if (IS_R300_VARIANT) {
             save->disp_output_cntl = info->SavedReg.disp_output_cntl &
 					~RADEON_DISP_TVDAC_SOURCE_MASK;
@@ -954,9 +955,7 @@ static void RADEONInitDAC2Registers(xf86
             save->disp_hw_debug = info->SavedReg.disp_hw_debug | RADEON_CRT2_DISP1_SEL;
         }
     } else {
-            save->dac2_cntl = info->SavedReg.dac2_cntl | RADEON_DAC2_DAC2_CLK_SEL;
         if (IS_R300_VARIANT) {
-            save->dac2_cntl = info->SavedReg.dac2_cntl | RADEON_DAC2_DAC2_CLK_SEL;
             save->disp_output_cntl = info->SavedReg.disp_output_cntl &
 					~RADEON_DISP_TVDAC_SOURCE_MASK;
             save->disp_output_cntl |= RADEON_DISP_TVDAC_SOURCE_CRTC2;
@@ -966,7 +965,6 @@ static void RADEONInitDAC2Registers(xf86
 				    RADEON_FP2_DVO_RATE_SEL_SDR);
             save->fp2_gen_cntl |= R200_FP2_SOURCE_SEL_CRTC2;
         } else {
-            save->dac2_cntl = info->SavedReg.dac2_cntl | RADEON_DAC2_DAC2_CLK_SEL;
             save->disp_hw_debug = info->SavedReg.disp_hw_debug &
 					~RADEON_CRT2_DISP1_SEL;
         }