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

[Alex Deucher]

 src/radeon_crtc.c |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

New commits:
diff-tree c01000bc684f6a23a38a52f0808182cefaa686bb (from 5c3f49e651c36f3bd14fa29359e24825d8f7f77f)
Author: Alex Deucher <alex at botch2.com>
Date:   Wed Aug 8 00:07:16 2007 -0400

    RADEON: fix typo in comment

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index cf67400..8e71330 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -565,7 +565,7 @@ RADEONInitCrtc2Registers(xf86CrtcPtr crt
 			  ((pScrn->bitsPerPixel * 8) -1)) / (pScrn->bitsPerPixel * 8);
     save->crtc2_pitch |= save->crtc2_pitch << 16;
 
-    /* check to see if TV_DAC is enabled for another output and keep it enabled */
+    /* check to see if TV DAC is enabled for another crtc and keep it enabled */
     if (save->crtc2_gen_cntl & RADEON_CRTC2_CRT2_ON)
 	save->crtc2_gen_cntl = RADEON_CRTC2_CRT2_ON;
     else
diff-tree 5c3f49e651c36f3bd14fa29359e24825d8f7f77f (from 08fe7ad00fba523775e95b5e6295fe23a5119d60)
Author: Lisa Wu <liswu at ati.com>
Date:   Wed Aug 8 00:05:47 2007 -0400

    RADEON: make sure RADEON_CRTC2_CRT2_ON bit state is properly accounted for
    
    - when the TV DAC is used for crtc1 make sure to keep this bit set when
    initializing crtc2.
    - fixes bug 11894

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index cbb50d8..cf67400 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -565,20 +565,26 @@ RADEONInitCrtc2Registers(xf86CrtcPtr crt
 			  ((pScrn->bitsPerPixel * 8) -1)) / (pScrn->bitsPerPixel * 8);
     save->crtc2_pitch |= save->crtc2_pitch << 16;
 
-    save->crtc2_gen_cntl = (RADEON_CRTC2_EN
-			    | (format << 8)
-			    | RADEON_CRTC2_VSYNC_DIS
-			    | RADEON_CRTC2_HSYNC_DIS
-			    | RADEON_CRTC2_DISP_DIS
-			    | ((mode->Flags & V_DBLSCAN)
-			       ? RADEON_CRTC2_DBL_SCAN_EN
-			       : 0)
-			    | ((mode->Flags & V_CSYNC)
-			       ? RADEON_CRTC2_CSYNC_EN
-			       : 0)
-			    | ((mode->Flags & V_INTERLACE)
-			       ? RADEON_CRTC2_INTERLACE_EN
-			       : 0));
+    /* check to see if TV_DAC is enabled for another output and keep it enabled */
+    if (save->crtc2_gen_cntl & RADEON_CRTC2_CRT2_ON)
+	save->crtc2_gen_cntl = RADEON_CRTC2_CRT2_ON;
+    else
+	save->crtc2_gen_cntl = 0;
+
+    save->crtc2_gen_cntl |= (RADEON_CRTC2_EN
+			     | (format << 8)
+			     | RADEON_CRTC2_VSYNC_DIS
+			     | RADEON_CRTC2_HSYNC_DIS
+			     | RADEON_CRTC2_DISP_DIS
+			     | ((mode->Flags & V_DBLSCAN)
+				? RADEON_CRTC2_DBL_SCAN_EN
+				: 0)
+			     | ((mode->Flags & V_CSYNC)
+				? RADEON_CRTC2_CSYNC_EN
+				: 0)
+			     | ((mode->Flags & V_INTERLACE)
+				? RADEON_CRTC2_INTERLACE_EN
+				: 0));
 
     save->disp2_merge_cntl = info->SavedReg.disp2_merge_cntl;
     save->disp2_merge_cntl &= ~(RADEON_DISP2_RGB_OFFSET_EN);