xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_crtc.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit d586a2c6f821c821a4a7708a3382acb63187534f
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Mar 3 12:17:30 2009 -0500

    Rotation: don't rotate if acceleration is not active

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 60140d6..a87e99b 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -410,6 +410,14 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
     int align = 4096, size;
     int cpp = pScrn->bitsPerPixel / 8;
 
+    /* No rotation without accel */
+    if (((info->ChipFamily >= CHIP_FAMILY_R600) && !info->directRenderingEnabled) ||
+	xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		   "Acceleration required for rotation\n");
+	return NULL;
+    }
+
     rotate_pitch = pScrn->displayWidth * cpp;
     size = rotate_pitch * height;
 
@@ -424,7 +432,7 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
 
     return info->FB + rotate_offset;
 }
-    
+
 /**
  * Creates a pixmap for this CRTC's rotated shadow framebuffer.
  */