| From dcab0fa64e300afa18f39cd98d05e0950f652adf Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> |
| Date: Thu, 27 Oct 2016 13:03:23 +0900 |
| Subject: drm/radeon: Also call cursor_move_locked when the cursor size changes |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Michel Dänzer <michel.daenzer@amd.com> |
| |
| commit dcab0fa64e300afa18f39cd98d05e0950f652adf upstream. |
| |
| The cursor size also affects the register programming. |
| |
| Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_cursor.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| --- 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_c |
| 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_c |
| |
| 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; |
| } |