Skip to contentSkip to conversation

Patch "drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 9, 2017

Subsystems (4)
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/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora

to the 4.12-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-vmwgfx-fix-cursor-hotspot-issue-with-wayland-on-fedora.patch
and it can be found in the queue-4.12 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 14979adb0294f04cf6fbbb81555acff9ec1e7c9c Mon Sep 17 00:00:00 2001

From: Sinclair Yeh <[email protected]>
Date: Mon, 17 Jul 2017 23:26:21 -0700
Subject: drm/vmwgfx: Fix cursor hotspot issue with Wayland on Fedora
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Sinclair Yeh <[email protected]>

commit 14979adb0294f04cf6fbbb81555acff9ec1e7c9c upstream.

Parts of commit <8fbf9d92a7bc> (“drm/vmwgfx: Implement the cursor_set2 callback v2”) were not moved over when we started atomic mode set development because at that time the DRM did not support cursor hotspots in the fb struct.

This patch fixes what was not moved over.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c |    9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +9 -0
@@ -384,6 +384,12 @@ vmw_du_cursor_plane_atomic_update(struct
 
 	hotspot_x = du->hotspot_x;
 	hotspot_y = du->hotspot_y;
+
+	if (plane->fb) {
+		hotspot_x += plane->fb->hot_x;
+		hotspot_y += plane->fb->hot_y;
+	}
+
 	du->cursor_surface = vps->surf;
 	du->cursor_dmabuf = vps->dmabuf;
 
@@ -411,6 +417,9 @@ vmw_du_cursor_plane_atomic_update(struct
 		vmw_cursor_update_position(dev_priv, true,
 					   du->cursor_x + hotspot_x,
 					   du->cursor_y + hotspot_y);
+
+		du->core_hotspot_x = hotspot_x - du->hotspot_x;
+		du->core_hotspot_y = hotspot_y - du->hotspot_y;
 	} else {
 		DRM_ERROR("Failed to update cursor image\n");
 	}

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

queue-4.12/drm-vmwgfx-fix-cursor-hotspot-issue-with-wayland-on-fedora.patch