From 7bfe10f486db077f812be733a86830971216f279 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 23 Feb 2010 13:12:43 -0500 Subject: [PATCH] --- yaml --- r: 185601 b: refs/heads/master c: 22e6dd7e700111c1aa49581d27f2b349cbc798dd h: refs/heads/master i: 185599: 470f89e6649455058892a4cd50f0ad44c9bf39e1 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 65dadc9dd670..6987b30ebd3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa5120d2ef228042416d3023fb7eda9ee487dcf9 +refs/heads/master: 22e6dd7e700111c1aa49581d27f2b349cbc798dd diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cursor.c b/trunk/drivers/gpu/drm/radeon/radeon_cursor.c index 9514f3275357..7ecf5e1b39c1 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_cursor.c @@ -219,6 +219,11 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, radeon_lock_cursor(crtc, true); if (ASIC_IS_DCE4(rdev)) { + /* cursors are offset into the total surface */ + x += crtc->x; + y += crtc->y; + DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y); + /* XXX: check if evergreen has the same issues as avivo chips */ WREG32(EVERGREEN_CUR_POSITION + radeon_crtc->crtc_offset, ((xorigin ? 0 : x) << 16) |