xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit a6d6c900e60a3685ee9e93c34eb7f6d237c45fd8
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jul 9 11:30:57 2009 -0400

    RS740: fixup display latency setting as per rs690
    
    Both chips program the same in this regard

diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index d3fb62b..6d24c2b 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -693,7 +693,8 @@ RADEONInitDispBandwidthAVIVO(ScrnInfoPtr pScrn,
 	uint32_t mc_init_misc_lat_timer = 0;
 	if (info->ChipFamily == CHIP_FAMILY_RV515)
 	    mc_init_misc_lat_timer = INMC(pScrn, RV515_MC_INIT_MISC_LAT_TIMER);
-	else if (info->ChipFamily == CHIP_FAMILY_RS690)
+	else if ((info->ChipFamily == CHIP_FAMILY_RS690) ||
+		 (info->ChipFamily == CHIP_FAMILY_RS740))
 	    mc_init_misc_lat_timer = INMC(pScrn, RS690_MC_INIT_MISC_LAT_TIMER);
 
 	mc_init_misc_lat_timer &= ~(R300_MC_DISP1R_INIT_LAT_MASK << R300_MC_DISP1R_INIT_LAT_SHIFT);
@@ -706,7 +707,8 @@ RADEONInitDispBandwidthAVIVO(ScrnInfoPtr pScrn,
 
 	if (info->ChipFamily == CHIP_FAMILY_RV515)
 	    OUTMC(pScrn, RV515_MC_INIT_MISC_LAT_TIMER, mc_init_misc_lat_timer);
-	else if (info->ChipFamily == CHIP_FAMILY_RS690)
+	else if ((info->ChipFamily == CHIP_FAMILY_RS690) ||
+		 (info->ChipFamily == CHIP_FAMILY_RS740))
 	    OUTMC(pScrn, RS690_MC_INIT_MISC_LAT_TIMER, mc_init_misc_lat_timer);
     }