Skip to content

Commit 1792b4e

Browse files
committed
drm: Remove legacy cursor hotspot code
jira VULN-136708 cve-bf CVE-2025-38449 commit-author Zack Rusin <zackr@vmware.com> commit bce3dab Atomic modesetting supports mouse cursor offsets via the hotspot properties that are created on cursor planes. All drivers which support hotspots are atomic and the legacy code has been implemented in terms of the atomic properties as well. Due to the above the lagacy cursor hotspot code is no longer used or needed and can be removed. Signed-off-by: Zack Rusin <zackr@vmware.com> 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> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231023074613.41327-8-aesteve@redhat.com (cherry picked from commit bce3dab) Signed-off-by: Roxana Nicolescu <rnicolescu@ciq.com>
1 parent 4b88a29 commit 1792b4e

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

drivers/gpu/drm/drm_plane.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,9 +1110,6 @@ static int drm_mode_cursor_universal(struct drm_crtc *crtc,
11101110
return PTR_ERR(fb);
11111111
}
11121112

1113-
fb->hot_x = req->hot_x;
1114-
fb->hot_y = req->hot_y;
1115-
11161113
if (plane->hotspot_x_property && plane->state)
11171114
plane->state->hotspot_x = req->hot_x;
11181115
if (plane->hotspot_y_property && plane->state)

include/drm/drm_framebuffer.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,6 @@ struct drm_framebuffer {
188188
* DRM_MODE_FB_MODIFIERS.
189189
*/
190190
int flags;
191-
/**
192-
* @hot_x: X coordinate of the cursor hotspot. Used by the legacy cursor
193-
* IOCTL when the driver supports cursor through a DRM_PLANE_TYPE_CURSOR
194-
* universal plane.
195-
*/
196-
int hot_x;
197-
/**
198-
* @hot_y: Y coordinate of the cursor hotspot. Used by the legacy cursor
199-
* IOCTL when the driver supports cursor through a DRM_PLANE_TYPE_CURSOR
200-
* universal plane.
201-
*/
202-
int hot_y;
203191
/**
204192
* @filp_head: Placed on &drm_file.fbs, protected by &drm_file.fbs_lock.
205193
*/

0 commit comments

Comments
 (0)