From 1586d5c549610bcdc77eaa03dfa4e60d06dc50db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 30 Sep 2011 17:16:51 +0200 Subject: [PATCH] --- yaml --- r: 264241 b: refs/heads/master c: 7d309529b4c1a6281549bf86681cdfb4fbed49ed h: refs/heads/master i: 264239: 748ca02f788897c826eb713e57f93d6ff2186d53 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cursor.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 490cb026d256..7c472ca56d6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b356fe0afe9aa2cfdc7be0bae22ea1c93afc2451 +refs/heads/master: 7d309529b4c1a6281549bf86681cdfb4fbed49ed diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cursor.c b/trunk/drivers/gpu/drm/radeon/radeon_cursor.c index c495575b2e1c..bac8ee7990a7 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_cursor.c @@ -209,13 +209,9 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, int w = radeon_crtc->cursor_width; if (x < 0) - xorigin = -x; + xorigin = min(-x, CURSOR_WIDTH - 1); if (y < 0) - yorigin = -y; - if (xorigin >= CURSOR_WIDTH) - xorigin = CURSOR_WIDTH - 1; - if (yorigin >= CURSOR_HEIGHT) - yorigin = CURSOR_HEIGHT - 1; + yorigin = min(-y, CURSOR_HEIGHT - 1); if (ASIC_IS_AVIVO(rdev)) { int i = 0;