summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-07-11 14:30:17 -0400
committerBrice Goglin <bgoglin@debian.org>2008-08-02 18:46:32 +0200
commit68f494379edf1fe4b21007f6a27e9f39d2ed10d6 (patch)
tree21d4d12db857838e7f0fa3d7b5ce7d4e99bb1c38
parent1b90deaa812e89e4fe51d4a142bae98450066e54 (diff)
downloadxf86-video-ati-frc-68f494379edf1fe4b21007f6a27e9f39d2ed10d6.tar.gz
xf86-video-ati-frc-68f494379edf1fe4b21007f6a27e9f39d2ed10d6.tar.bz2
Fix cursor with multi-head and rotation
(cherry picked from commit 7e67d0163579a44f104e8f354a929ac9b33e4c21)
-rw-r--r--src/radeon_cursor.c6
1 files changed, 4 insertions, 2 deletions
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));