Unverified Commit 4e3b70da authored by Zack Rusin's avatar Zack Rusin Committed by Javier Martinez Canillas
Browse files

drm: Disable the cursor plane on atomic contexts with virtualized drivers 



Cursor planes on virtualized drivers have special meaning and require
that the clients handle them in specific ways, e.g. the cursor plane
should react to the mouse movement the way a mouse cursor would be
expected to and the client is required to set hotspot properties on it
in order for the mouse events to be routed correctly.

This breaks the contract as specified by the "universal planes". Fix it
by disabling the cursor planes on virtualized drivers while adding
a foundation on top of which it's possible to special case mouse cursor
planes for clients that want it.

Disabling the cursor planes makes some kms compositors which were broken,
e.g. Weston, fallback to software cursor which works fine or at least
better than currently while having no effect on others, e.g. gnome-shell
or kwin, which put virtualized drivers on a deny-list when running in
atomic context to make them fallback to legacy kms and avoid this issue.

Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Fixes: 681e7ec7 ("drm: Allow userspace to ask for universal plane list (v2)")
Cc: <stable@vger.kernel.org> # v5.4+
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Chia-I Wu <olvaffe@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: virtualization@lists.linux-foundation.org
Cc: spice-devel@lists.freedesktop.org
Acked-by: default avatarPekka Paalanen <pekka.paalanen@collabora.com>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarSimon Ser <contact@emersion.fr>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231023074613.41327-2-aesteve@redhat.com
parent e4d983ac

drivers/gpu/drm/drm_plane.c

+13 −0
Original line number Diff line number Diff line
@@ -678,6 +678,19 @@ int drm_mode_getplane_res(struct drm_device *dev, void *data, 
		    !file_priv->universal_planes)

			continue;



		/*

		 * If we're running on a virtualized driver then,

		 * unless userspace advertizes support for the

		 * virtualized cursor plane, disable cursor planes

		 * because they'll be broken due to missing cursor

		 * hotspot info.

		 */

		if (plane->type == DRM_PLANE_TYPE_CURSOR &&

		    drm_core_check_feature(dev, DRIVER_CURSOR_HOTSPOT) &&

		    file_priv->atomic &&

		    !file_priv->supports_virtualized_cursor_plane)

			continue;



		if (drm_lease_held(file_priv, plane->base.id)) {

			if (count < plane_resp->count_planes &&

			    put_user(plane->base.id, plane_ptr + count))

drivers/gpu/drm/qxl/qxl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static const struct drm_ioctl_desc qxl_ioctls[] = { 
};



static struct drm_driver qxl_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_CURSOR_HOTSPOT,



	.dumb_create = qxl_mode_dumb_create,

	.dumb_map_offset = drm_gem_ttm_dumb_map_offset,

drivers/gpu/drm/vboxvideo/vbox_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ DEFINE_DRM_GEM_FOPS(vbox_fops); 


static const struct drm_driver driver = {

	.driver_features =

	    DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,

	    DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_CURSOR_HOTSPOT,



	.fops = &vbox_fops,

	.name = DRIVER_NAME,

drivers/gpu/drm/virtio/virtgpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static const struct drm_driver driver = { 
	 * out via drm_device::driver_features:

	 */

	.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC |

			   DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE,

			   DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE | DRIVER_CURSOR_HOTSPOT,

	.open = virtio_gpu_driver_open,

	.postclose = virtio_gpu_driver_postclose,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ static const struct file_operations vmwgfx_driver_fops = { 


static const struct drm_driver driver = {

	.driver_features =

	DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_GEM,

	DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_GEM | DRIVER_CURSOR_HOTSPOT,

	.ioctls = vmw_ioctls,

	.num_ioctls = ARRAY_SIZE(vmw_ioctls),

	.master_set = vmw_master_set,