Skip to contentSkip to conversation

Patch "drm/radeon: Also call cursor_move_locked when the cursor size changes" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 6, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/radeon: Also call cursor_move_locked when the cursor size changes

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-radeon-also-call-cursor_move_locked-when-the-cursor-size-changes.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From dcab0fa64e300afa18f39cd98d05e0950f652adf Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
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 <[email protected]>

commit dcab0fa64e300afa18f39cd98d05e0950f652adf upstream.

The cursor size also affects the register programming.

---
 drivers/gpu/drm/radeon/radeon_cursor.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/radeon_cursor.c +5 -4
@@ -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;
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-amdgpu-store-crtc-relative-amdgpu_crtc-cursor_x-y-values.patch queue-4.9/drm-amdgpu-also-call-cursor_move_locked-when-the-cursor-size-changes.patch queue-4.9/drm-radeon-also-call-cursor_move_locked-when-the-cursor-size-changes.patch queue-4.9/drm-radeon-hide-the-hw-cursor-while-it-s-out-of-bounds.patch