From: Albert Esteve <aesteve@redhat.com>
To: qemu-devel@nongnu.org
Cc: linux-doc@vger.kernel.org, banackm@vmware.com,
virtualization@lists.linux-foundation.org,
Gerd Hoffmann <kraxel@redhat.com>,
mombasawalam@vmware.com, iforbes@vmware.com,
Jonathan Corbet <corbet@lwn.net>,
javierm@redhat.com,
VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>,
David Airlie <airlied@redhat.com>,
Maxime Ripard <mripard@kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
ppaalanen@gmail.com, dri-devel@lists.freedesktop.org,
spice-devel@lists.freedesktop.org,
Gurchetan Singh <gurchetansingh@chromium.org>,
Matt Roper <matthew.d.roper@intel.com>,
linux-kernel@vger.kernel.org, krastevm@vmware.com,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH v6 4/9] drm/qxl: Use the hotspot properties from cursor planes
Date: Mon, 23 Oct 2023 09:46:08 +0200 [thread overview]
Message-ID: <20231023074613.41327-5-aesteve@redhat.com> (raw)
In-Reply-To: <20231023074613.41327-1-aesteve@redhat.com>
From: Zack Rusin <zackr@vmware.com>
Atomic modesetting got support for mouse hotspots via the hotspot
properties. Port the legacy kms hotspot handling to the new properties
on cursor planes.
Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: virtualization@lists.linux-foundation.org
Cc: spice-devel@lists.freedesktop.org
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
---
drivers/gpu/drm/qxl/qxl_display.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 6492a70e3c396..5d689e0d3586c 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -485,7 +485,6 @@ static int qxl_primary_atomic_check(struct drm_plane *plane,
static int qxl_primary_apply_cursor(struct qxl_device *qdev,
struct drm_plane_state *plane_state)
{
- struct drm_framebuffer *fb = plane_state->fb;
struct qxl_crtc *qcrtc = to_qxl_crtc(plane_state->crtc);
struct qxl_cursor_cmd *cmd;
struct qxl_release *release;
@@ -510,8 +509,8 @@ static int qxl_primary_apply_cursor(struct qxl_device *qdev,
cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);
cmd->type = QXL_CURSOR_SET;
- cmd->u.set.position.x = plane_state->crtc_x + fb->hot_x;
- cmd->u.set.position.y = plane_state->crtc_y + fb->hot_y;
+ cmd->u.set.position.x = plane_state->crtc_x + plane_state->hotspot_x;
+ cmd->u.set.position.y = plane_state->crtc_y + plane_state->hotspot_y;
cmd->u.set.shape = qxl_bo_physical_address(qdev, qcrtc->cursor_bo, 0);
@@ -531,7 +530,6 @@ static int qxl_primary_apply_cursor(struct qxl_device *qdev,
static int qxl_primary_move_cursor(struct qxl_device *qdev,
struct drm_plane_state *plane_state)
{
- struct drm_framebuffer *fb = plane_state->fb;
struct qxl_crtc *qcrtc = to_qxl_crtc(plane_state->crtc);
struct qxl_cursor_cmd *cmd;
struct qxl_release *release;
@@ -554,8 +552,8 @@ static int qxl_primary_move_cursor(struct qxl_device *qdev,
cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);
cmd->type = QXL_CURSOR_MOVE;
- cmd->u.position.x = plane_state->crtc_x + fb->hot_x;
- cmd->u.position.y = plane_state->crtc_y + fb->hot_y;
+ cmd->u.position.x = plane_state->crtc_x + plane_state->hotspot_x;
+ cmd->u.position.y = plane_state->crtc_y + plane_state->hotspot_y;
qxl_release_unmap(qdev, release, &cmd->release_info);
qxl_release_fence_buffer_objects(release);
@@ -851,8 +849,8 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane,
struct qxl_bo *old_cursor_bo = qcrtc->cursor_bo;
qcrtc->cursor_bo = qxl_create_cursor(qdev, user_bo,
- new_state->fb->hot_x,
- new_state->fb->hot_y);
+ new_state->hotspot_x,
+ new_state->hotspot_y);
qxl_free_cursor(old_cursor_bo);
}
--
2.41.0
next prev parent reply other threads:[~2023-10-23 7:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 7:46 [PATCH v6 0/9] Fix cursor planes with virtualized drivers Albert Esteve
2023-10-23 7:46 ` [PATCH v6 1/9] drm: Disable the cursor plane on atomic contexts " Albert Esteve
2023-10-23 7:53 ` Simon Ser
2023-10-23 7:46 ` [PATCH v6 2/9] drm/atomic: Add support for mouse hotspots Albert Esteve
2023-10-23 7:46 ` [PATCH v6 3/9] drm/vmwgfx: Use the hotspot properties from cursor planes Albert Esteve
2023-10-23 7:46 ` Albert Esteve [this message]
2023-10-23 7:46 ` [PATCH v6 5/9] drm/vboxvideo: " Albert Esteve
2023-10-23 7:46 ` [PATCH v6 6/9] drm/virtio: " Albert Esteve
2023-10-23 7:46 ` [PATCH v6 7/9] drm: Remove legacy cursor hotspot code Albert Esteve
2023-10-23 7:46 ` [PATCH v6 8/9] drm: Introduce DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT Albert Esteve
2023-10-23 7:46 ` [PATCH v6 9/9] drm: Introduce documentation for hotspot properties Albert Esteve
2023-10-23 8:23 ` Pekka Paalanen
2023-10-23 21:29 ` Javier Martinez Canillas
2023-10-24 19:34 ` Michael Banack
2023-10-25 6:36 ` Javier Martinez Canillas
2023-10-23 7:55 ` [PATCH v6 0/9] Fix cursor planes with virtualized drivers Simon Ser
2023-10-23 8:14 ` Albert Esteve
2023-10-23 8:19 ` Simon Ser
2023-11-22 12:49 ` Javier Martinez Canillas
2023-11-23 22:11 ` Simon Ser
2023-11-24 10:56 ` Javier Martinez Canillas
2023-11-24 14:41 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023074613.41327-5-aesteve@redhat.com \
--to=aesteve@redhat.com \
--cc=airlied@redhat.com \
--cc=banackm@vmware.com \
--cc=corbet@lwn.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=gurchetansingh@chromium.org \
--cc=hdegoede@redhat.com \
--cc=iforbes@vmware.com \
--cc=javierm@redhat.com \
--cc=krastevm@vmware.com \
--cc=kraxel@redhat.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=mombasawalam@vmware.com \
--cc=mripard@kernel.org \
--cc=ppaalanen@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=spice-devel@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).