xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_accel.c       |    2 +-
 src/radeon_commonfuncs.c |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6e4e6d2a8f29f92efc219dca24ea31d1f37d5a0f
Author: Alex Deucher <alex at botchco.com>
Date:   Tue Jun 3 20:32:20 2008 -0400

    RADEON: minor cleanups

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 778d43e..4ce0da6 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
 		   info->CurrentLayout.bitsPerPixel);
 
 #ifdef XF86DRI
-    if (IS_R300_3D | IS_R500_3D) {
+    if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) {
 	drmRadeonGetParam np;
 	int num_pipes;
 
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index b1dd6e8..58fe306 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -590,10 +590,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 	OUT_ACCEL_REG(R300_SC_SCISSOR1, ((8191 << R300_SCISSOR_X_SHIFT) |
 					 (8191 << R300_SCISSOR_Y_SHIFT)));
 
-	if (IS_R300_VARIANT ||
-	    (info->ChipFamily == CHIP_FAMILY_RS600) ||
-	    (info->ChipFamily == CHIP_FAMILY_RS690) ||
-	    (info->ChipFamily == CHIP_FAMILY_RS740)) {
+	if (IS_R300_3D) {
 	    /* clip has offset 1440 */
 	    OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) |
 					     (1088 << R300_CLIP_Y_SHIFT)));