---

yaml --- r: 185601 b: refs/heads/master c: 22e6dd7 h: refs/heads/master i: 185599: 470f89e v: v3
git-mirror · Feb 25, 2010 · 7bfe10f · 7bfe10f
1 parent 1fb8722
commit 7bfe10f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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) |