xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cee7d61b144162974238b282d76a70aa2f14cc0d
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Dec 18 15:49:47 2012 -0500

    exa/Xv: fix coordinate limits on AVIVO IGPs
    
    RS6xx asics are r4xx derived, but seem to have r3xx
    limitations as far as clipping is concerned. Spotted
    by Michel on IRC.
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=58469
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon.h b/src/radeon.h
index 13f224f..0ad1411 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -217,11 +217,11 @@ typedef enum {
 	(info->ChipFamily == CHIP_FAMILY_RV560)  ||  \
 	(info->ChipFamily == CHIP_FAMILY_RV570))
 
+/* RS6xx, RS740 are technically R4xx as well, but the
+ * clipping hardware seems to follow the r3xx restrictions
+ */
 #define IS_R400_3D ((info->ChipFamily == CHIP_FAMILY_R420)  ||  \
-	(info->ChipFamily == CHIP_FAMILY_RV410) ||  \
-	(info->ChipFamily == CHIP_FAMILY_RS690) ||  \
-	(info->ChipFamily == CHIP_FAMILY_RS600) ||  \
-	(info->ChipFamily == CHIP_FAMILY_RS740))
+	(info->ChipFamily == CHIP_FAMILY_RV410))
 
 #define IS_R300_3D ((info->ChipFamily == CHIP_FAMILY_R300)  ||  \
 	(info->ChipFamily == CHIP_FAMILY_RV350) ||  \