| From b8aee294d89502469f2d80ae6afb93398d8227e0 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> |
| Date: Fri, 30 Sep 2011 17:16:52 +0200 |
| Subject: drm/radeon: Update AVIVO cursor coordinate origin before |
| x/yorigin calculation. |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> |
| |
| commit b8aee294d89502469f2d80ae6afb93398d8227e0 upstream. |
| |
| Fixes cursor disappearing prematurely when moving off a top/left edge which |
| is not located at the desktop top/left edge. |
| |
| Signed-off-by: Michel Dรคnzer <michel.daenzer@amd.com> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_cursor.c | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_cursor.c |
| +++ b/drivers/gpu/drm/radeon/radeon_cursor.c |
| @@ -208,6 +208,13 @@ int radeon_crtc_cursor_move(struct drm_c |
| int xorigin = 0, yorigin = 0; |
| int w = radeon_crtc->cursor_width; |
| |
| + if (ASIC_IS_AVIVO(rdev)) { |
| + /* avivo cursor 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); |
| + |
| if (x < 0) |
| xorigin = -x + 1; |
| if (y < 0) |
| @@ -221,11 +228,6 @@ int radeon_crtc_cursor_move(struct drm_c |
| int i = 0; |
| struct drm_crtc *crtc_p; |
| |
| - /* avivo cursor 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); |
| - |
| /* avivo cursor image can't end on 128 pixel boundary or |
| * go past the end of the frame if both crtcs are enabled |
| */ |
