xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 7e67d0163579a44f104e8f354a929ac9b33e4c21
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Jul 11 14:30:17 2008 -0400

    Fix cursor with multi-head and rotation

diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index c4472db..d480416 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -216,8 +216,10 @@ radeon_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 
     if (IS_AVIVO_VARIANT) {
 	/* avivo cursor spans the full fb width */
-	x += crtc->x;
-	y += crtc->y;
+	if (crtc->rotatedData == NULL) {
+	    x += crtc->x;
+	    y += crtc->y;
+	}
 	avivo_lock_cursor(crtc, TRUE);
 	OUTREG(AVIVO_D1CUR_POSITION + radeon_crtc->crtc_offset, ((xorigin ? 0 : x) << 16)
 	       | (yorigin ? 0 : y));