From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 18/25] virtio-gpu: move update_cursor_data
Date: Mon, 10 May 2021 15:20:44 +0200 [thread overview]
Message-ID: <20210510132051.2208563-19-kraxel@redhat.com> (raw)
In-Reply-To: <20210510132051.2208563-1-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-10-kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 6 ++++++
hw/display/virtio-gpu-gl.c | 30 +++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 38 ++++++----------------------------
3 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index c7bc925998d5..b897917168f0 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -171,6 +171,9 @@ struct VirtIOGPUClass {
void (*handle_ctrl)(VirtIODevice *vdev, VirtQueue *vq);
void (*process_cmd)(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);
+ void (*update_cursor_data)(VirtIOGPU *g,
+ struct virtio_gpu_scanout *s,
+ uint32_t resource_id);
};
struct VirtIOGPUGL {
@@ -231,6 +234,9 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g);
void virtio_gpu_device_realize(DeviceState *qdev, Error **errp);
void virtio_gpu_reset(VirtIODevice *vdev);
void virtio_gpu_simple_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);
+void virtio_gpu_update_cursor_data(VirtIOGPU *g,
+ struct virtio_gpu_scanout *s,
+ uint32_t resource_id);
/* virtio-gpu-3d.c */
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 792cc0b41256..b4303cc5bb41 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -23,6 +23,35 @@
#include "hw/virtio/virtio-gpu-pixman.h"
#include "hw/qdev-properties.h"
+#include <virglrenderer.h>
+
+static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
+ struct virtio_gpu_scanout *s,
+ uint32_t resource_id)
+{
+ uint32_t width, height;
+ uint32_t pixels, *data;
+
+ if (g->parent_obj.use_virgl_renderer) {
+ data = virgl_renderer_get_cursor_data(resource_id, &width, &height);
+ if (!data) {
+ return;
+ }
+
+ if (width != s->current_cursor->width ||
+ height != s->current_cursor->height) {
+ free(data);
+ return;
+ }
+
+ pixels = s->current_cursor->width * s->current_cursor->height;
+ memcpy(s->current_cursor->data, data, pixels * sizeof(uint32_t));
+ free(data);
+ return;
+ }
+ virtio_gpu_update_cursor_data(g, s, resource_id);
+}
+
static void virtio_gpu_gl_process_cmd(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd)
{
@@ -127,6 +156,7 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data)
vbc->gl_flushed = virtio_gpu_gl_flushed;
vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
vgc->process_cmd = virtio_gpu_gl_process_cmd;
+ vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data;
vdc->realize = virtio_gpu_gl_device_realize;
vdc->reset = virtio_gpu_gl_reset;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 7c65c3ffe8f2..921a8212a7aa 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -56,9 +56,9 @@ static void virtio_gpu_cleanup_mapping(VirtIOGPU *g,
} while (0)
#endif
-static void update_cursor_data_simple(VirtIOGPU *g,
- struct virtio_gpu_scanout *s,
- uint32_t resource_id)
+void virtio_gpu_update_cursor_data(VirtIOGPU *g,
+ struct virtio_gpu_scanout *s,
+ uint32_t resource_id)
{
struct virtio_gpu_simple_resource *res;
uint32_t pixels;
@@ -79,36 +79,10 @@ static void update_cursor_data_simple(VirtIOGPU *g,
pixels * sizeof(uint32_t));
}
-#ifdef CONFIG_VIRGL
-
-static void update_cursor_data_virgl(VirtIOGPU *g,
- struct virtio_gpu_scanout *s,
- uint32_t resource_id)
-{
- uint32_t width, height;
- uint32_t pixels, *data;
-
- data = virgl_renderer_get_cursor_data(resource_id, &width, &height);
- if (!data) {
- return;
- }
-
- if (width != s->current_cursor->width ||
- height != s->current_cursor->height) {
- free(data);
- return;
- }
-
- pixels = s->current_cursor->width * s->current_cursor->height;
- memcpy(s->current_cursor->data, data, pixels * sizeof(uint32_t));
- free(data);
-}
-
-#endif
-
static void update_cursor(VirtIOGPU *g, struct virtio_gpu_update_cursor *cursor)
{
struct virtio_gpu_scanout *s;
+ VirtIOGPUClass *vgc = VIRTIO_GPU_GET_CLASS(g);
bool move = cursor->hdr.type == VIRTIO_GPU_CMD_MOVE_CURSOR;
if (cursor->pos.scanout_id >= g->parent_obj.conf.max_outputs) {
@@ -131,8 +105,7 @@ static void update_cursor(VirtIOGPU *g, struct virtio_gpu_update_cursor *cursor)
s->current_cursor->hot_y = cursor->hot_y;
if (cursor->resource_id > 0) {
- VIRGL(g, update_cursor_data_virgl, update_cursor_data_simple,
- g, s, cursor->resource_id);
+ vgc->update_cursor_data(g, s, cursor->resource_id);
}
dpy_cursor_define(s->con, s->current_cursor);
@@ -1206,6 +1179,7 @@ static void virtio_gpu_class_init(ObjectClass *klass, void *data)
vgc->handle_ctrl = virtio_gpu_handle_ctrl;
vgc->process_cmd = virtio_gpu_simple_process_cmd;
+ vgc->update_cursor_data = virtio_gpu_update_cursor_data;
vdc->realize = virtio_gpu_device_realize;
vdc->reset = virtio_gpu_reset;
--
2.31.1
next prev parent reply other threads:[~2021-05-10 13:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 13:20 [PULL 00/25] Vga 20210510 patches Gerd Hoffmann
2021-05-10 13:20 ` [PULL 01/25] qemu-edid: use qemu_edid_size() Gerd Hoffmann
2021-05-10 13:20 ` [PULL 02/25] edid: edid_desc_next Gerd Hoffmann
2021-05-10 13:20 ` [PULL 03/25] edid: move xtra3 descriptor Gerd Hoffmann
2021-05-10 13:20 ` [PULL 04/25] edid: use dta extension block descriptors Gerd Hoffmann
2021-05-10 13:20 ` [PULL 05/25] edid: Make refresh rate configurable Gerd Hoffmann
2021-05-10 13:20 ` [PULL 06/25] edid: move timing generation into a separate function Gerd Hoffmann
2021-05-10 13:20 ` [PULL 07/25] edid: allow arbitrary-length checksums Gerd Hoffmann
2021-05-10 13:20 ` [PULL 08/25] edid: add support for DisplayID extension (5k resolution) Gerd Hoffmann
2021-05-10 13:20 ` [PULL 09/25] virtio-gpu: handle partial maps properly Gerd Hoffmann
2021-05-10 13:20 ` [PULL 10/25] virtio-gpu: rename virgl source file Gerd Hoffmann
2021-05-10 13:20 ` [PULL 11/25] virtio-gpu: add virtio-gpu-gl-device Gerd Hoffmann
2021-05-10 13:20 ` [PULL 12/25] virtio-gpu: move virgl realize + properties Gerd Hoffmann
2021-05-21 9:32 ` Michal Prívozník
2021-05-21 10:50 ` Marc-André Lureau
2021-05-21 13:45 ` Gerd Hoffmann
2021-05-21 13:57 ` Gerd Hoffmann
2021-05-10 13:20 ` [PULL 13/25] virtio-gpu: move virgl reset Gerd Hoffmann
2021-05-10 13:20 ` [PULL 14/25] virtio-gpu: use class function for ctrl queue handlers Gerd Hoffmann
2021-05-10 13:20 ` [PULL 15/25] virtio-gpu: move virgl handle_ctrl Gerd Hoffmann
2021-05-10 13:20 ` [PULL 16/25] virtio-gpu: move virgl gl_flushed Gerd Hoffmann
2021-05-10 13:20 ` [PULL 17/25] virtio-gpu: move virgl process_cmd Gerd Hoffmann
2021-05-10 13:20 ` Gerd Hoffmann [this message]
2021-05-10 13:20 ` [PULL 19/25] virtio-gpu: drop VIRGL() macro Gerd Hoffmann
2021-05-10 13:20 ` [PULL 20/25] virtio-gpu: move virtio-gpu-gl-device to separate module Gerd Hoffmann
2021-05-10 13:20 ` [PULL 21/25] virtio-gpu: drop use_virgl_renderer Gerd Hoffmann
2021-05-10 13:20 ` [PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL Gerd Hoffmann
2021-05-10 13:20 ` [PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci Gerd Hoffmann
2021-05-10 13:20 ` [PULL 24/25] modules: add have_vga Gerd Hoffmann
2021-05-10 13:20 ` [PULL 25/25] virtio-gpu: add virtio-vga-gl Gerd Hoffmann
2021-05-10 13:43 ` [PULL 00/25] Vga 20210510 patches no-reply
2021-05-12 15:05 ` Peter Maydell
2021-06-30 18:16 ` Marc-André Lureau
2021-07-01 6:29 ` Marc-André Lureau
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=20210510132051.2208563-19-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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).