diff options
| author |   Michel Dänzer <michel.daenzer@amd.com> | 2016-10-27 13:03:23 +0900 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2016-12-06 18:08:29 -0500 |
| commit | dcab0fa64e300afa18f39cd98d05e0950f652adf (patch) | |
| tree | 74dd3628cd1a600e551357f839a4d9c7b547f785 | |
| parent | drm/amdgpu: Only update the CUR_SIZE register when necessary (diff) | |
| download | linux-dev-dcab0fa64e300afa18f39cd98d05e0950f652adf.tar.xz linux-dev-dcab0fa64e300afa18f39cd98d05e0950f652adf.zip | |
drm/radeon: Also call cursor_move_locked when the cursor size changes
The cursor size also affects the register programming.
Cc: stable@vger.kernel.org
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cursor.c | 9 |
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; } |