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 22/25] virtio-gpu: move fields to struct VirtIOGPUGL
Date: Mon, 10 May 2021 15:20:48 +0200 [thread overview]
Message-ID: <20210510132051.2208563-23-kraxel@redhat.com> (raw)
In-Reply-To: <20210510132051.2208563-1-kraxel@redhat.com>
Move two virglrenderer state variables to struct VirtIOGPUGL.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20210430113547.1816178-1-kraxel@redhat.com
Message-Id: <20210430113547.1816178-14-kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 5 +++--
hw/display/virtio-gpu-gl.c | 15 +++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 0d402aef7c53..8ca2c55d9abb 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -151,8 +151,6 @@ struct VirtIOGPU {
uint64_t hostmem;
bool processing_cmdq;
- bool renderer_inited;
- bool renderer_reset;
QEMUTimer *fence_poll;
QEMUTimer *print_stats;
@@ -177,6 +175,9 @@ struct VirtIOGPUClass {
struct VirtIOGPUGL {
struct VirtIOGPU parent_obj;
+
+ bool renderer_inited;
+ bool renderer_reset;
};
struct VhostUserGPU {
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 1642a973549e..d971b480806a 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -51,9 +51,10 @@ static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
{
VirtIOGPU *g = VIRTIO_GPU(b);
+ VirtIOGPUGL *gl = VIRTIO_GPU_GL(b);
- if (g->renderer_reset) {
- g->renderer_reset = false;
+ if (gl->renderer_reset) {
+ gl->renderer_reset = false;
virtio_gpu_virgl_reset(g);
}
virtio_gpu_process_cmdq(g);
@@ -62,15 +63,16 @@ static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
{
VirtIOGPU *g = VIRTIO_GPU(vdev);
+ VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev);
struct virtio_gpu_ctrl_command *cmd;
if (!virtio_queue_ready(vq)) {
return;
}
- if (!g->renderer_inited) {
+ if (!gl->renderer_inited) {
virtio_gpu_virgl_init(g);
- g->renderer_inited = true;
+ gl->renderer_inited = true;
}
cmd = virtqueue_pop(vq, sizeof(struct virtio_gpu_ctrl_command));
@@ -89,12 +91,13 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
static void virtio_gpu_gl_reset(VirtIODevice *vdev)
{
VirtIOGPU *g = VIRTIO_GPU(vdev);
+ VirtIOGPUGL *gl = VIRTIO_GPU_GL(vdev);
virtio_gpu_reset(vdev);
- if (g->renderer_inited) {
+ if (gl->renderer_inited) {
if (g->parent_obj.renderer_blocked) {
- g->renderer_reset = true;
+ gl->renderer_reset = true;
} else {
virtio_gpu_virgl_reset(g);
}
--
2.31.1
next prev parent reply other threads:[~2021-05-10 13:34 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 ` [PULL 18/25] virtio-gpu: move update_cursor_data Gerd Hoffmann
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 ` Gerd Hoffmann [this message]
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-23-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.