aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2016-10-27 04:03:23 +0000
committerAlex Deucher <[email protected]>2016-12-06 23:08:29 +0000
commitdcab0fa64e300afa18f39cd98d05e0950f652adf (patch)
tree74dd3628cd1a600e551357f839a4d9c7b547f785 /drivers/gpu
parentdrm/amdgpu: Only update the CUR_SIZE register when necessary (diff)
downloadkernel-dcab0fa64e300afa18f39cd98d05e0950f652adf.tar.gz
kernel-dcab0fa64e300afa18f39cd98d05e0950f652adf.zip
drm/radeon: Also call cursor_move_locked when the cursor size changes
The cursor size also affects the register programming. Cc: [email protected] Signed-off-by: Michel Dänzer <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_cursor.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index 2a10e24b34b1..99a1c8e4c7be 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -297,12 +297,11 @@ int radeon_crtc_cursor_set2(struct drm_crtc *crtc,
return ret;
}
- radeon_crtc->cursor_width = width;
- radeon_crtc->cursor_height = height;
-
radeon_lock_cursor(crtc, true);
- if (hot_x != radeon_crtc->cursor_hot_x ||
+ if (width != radeon_crtc->cursor_width ||
+ height != radeon_crtc->cursor_height ||
+ hot_x != radeon_crtc->cursor_hot_x ||
hot_y != radeon_crtc->cursor_hot_y) {
int x, y;
@@ -311,6 +310,8 @@ int radeon_crtc_cursor_set2(struct drm_crtc *crtc,
radeon_cursor_move_locked(crtc, x, y);
+ radeon_crtc->cursor_width = width;
+ radeon_crtc->cursor_height = height;
radeon_crtc->cursor_hot_x = hot_x;
radeon_crtc->cursor_hot_y = hot_y;
}