xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_driver.c |   18 ++++++++----------
 src/radeon_reg.h    |    2 --
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
diff-tree 23a6f97e08fd49e1cae03cd97cae67a5f06b7634 (from 829be884702043fe4c9e349488d2585bf0561ae9)
Author: Alex Deucher <alex at samba.(none)>
Date:   Tue Oct 3 13:48:09 2006 -0400

    FP timing regs required for both internal and external TMDS

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f828df0..07a9349 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6580,6 +6580,11 @@ static Bool RADEONInitCrtcRegisters(Scrn
     } else if ((pRADEONEnt->Controller[0].pPort->MonType == MT_DFP) || 
 	       (pRADEONEnt->Controller[0].pPort->MonType == MT_LCD)) {
 
+	save->fp_h_sync_strt_wid = save->crtc_h_sync_strt_wid;
+	save->fp_v_sync_strt_wid = save->crtc_v_sync_strt_wid;
+        save->fp_crtc_h_total_disp = save->crtc_h_total_disp;
+        save->fp_crtc_v_total_disp = save->crtc_v_total_disp;
+
 	RADEONInitFPRegisters(pScrn, save, mode, TRUE);
 
         if ((pRADEONEnt->Controller[0].pPort->TMDSType == TMDS_INT) ||
@@ -6588,12 +6593,6 @@ static Bool RADEONInitCrtcRegisters(Scrn
 	    if (pRADEONEnt->Controller[0].pPort->MonType == MT_LCD) {
 	        save->lvds_gen_cntl &= ~RADEON_LVDS_SEL_CRTC2;
     	    } else {
-
-		save->fp_h_sync_strt_wid = save->crtc_h_sync_strt_wid;
-		save->fp_v_sync_strt_wid = save->crtc_v_sync_strt_wid;
-        	save->fp_crtc_h_total_disp = save->crtc_h_total_disp;
-        	save->fp_crtc_v_total_disp = save->crtc_v_total_disp;
-
 	        if ((IS_R300_VARIANT) ||
 		    (info->ChipFamily == CHIP_FAMILY_R200)) {
 		    save->fp_gen_cntl &= ~R200_FP_SOURCE_SEL_MASK;
@@ -6786,6 +6785,9 @@ static Bool RADEONInitCrtc2Registers(Scr
     } else if ((pRADEONEnt->Controller[1].pPort->MonType == MT_DFP) || 
                (pRADEONEnt->Controller[1].pPort->MonType == MT_LCD)) {
 
+	save->fp_h2_sync_strt_wid = save->crtc2_h_sync_strt_wid;
+	save->fp_v2_sync_strt_wid = save->crtc2_v_sync_strt_wid;
+
         if ((pRADEONEnt->Controller[1].pPort->TMDSType == TMDS_INT) || 
 	    (pRADEONEnt->Controller[1].pPort->MonType == MT_LCD)) {
 
@@ -6794,10 +6796,6 @@ static Bool RADEONInitCrtc2Registers(Scr
 	    if (pRADEONEnt->Controller[1].pPort->MonType == MT_LCD) {
 	        save->lvds_gen_cntl |= RADEON_LVDS_SEL_CRTC2;
     	    } else {
-
-		save->fp_h2_sync_strt_wid = save->crtc2_h_sync_strt_wid;
-		save->fp_v2_sync_strt_wid = save->crtc2_v_sync_strt_wid;
-
 	        if ((IS_R300_VARIANT) ||
 		    (info->ChipFamily == CHIP_FAMILY_R200)) {
 		    save->fp_gen_cntl &= ~R200_FP_SOURCE_SEL_MASK;
diff-tree 829be884702043fe4c9e349488d2585bf0561ae9 (from cd900580dbc8928ebc28514162b4c1dbfe9fd5ae)
Author: Alex Deucher <alex at samba.(none)>
Date:   Tue Oct 3 13:41:21 2006 -0400

    remove bogus registers

diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 2e449bd..9503dde 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -698,8 +698,6 @@
 #define RADEON_FOG_TABLE_DATA               0x1a18
 #define RADEON_FP_CRTC_H_TOTAL_DISP         0x0250
 #define RADEON_FP_CRTC_V_TOTAL_DISP         0x0254
-#define RADEON_FP_CRTC2_H_TOTAL_DISP        0x0350
-#define RADEON_FP_CRTC2_V_TOTAL_DISP        0x0354
 #       define RADEON_FP_CRTC_H_TOTAL_MASK      0x000003ff
 #       define RADEON_FP_CRTC_H_DISP_MASK       0x01ff0000
 #       define RADEON_FP_CRTC_V_TOTAL_MASK      0x00000fff