aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2011-09-30 17:16:51 +0200
committerDave Airlie <airlied@redhat.com>2011-10-03 18:37:35 +0100
commit7d309529b4c1a6281549bf86681cdfb4fbed49ed (patch)
tree7369f2788f0cd48e68c7c3566198d9e4c0abef41
parentb356fe0afe9aa2cfdc7be0bae22ea1c93afc2451 (diff)
downloadlinux-3.0-android-ux500-7d309529b4c1a6281549bf86681cdfb4fbed49ed.tar.gz
drm/radeon: Simplify cursor x/yorigin calculation.
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>
-rw-r--r--drivers/gpu/drm/radeon/radeon_cursor.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index c495575b2e1..bac8ee7990a 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/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;