[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL
From: |
Gerd Hoffmann |
Subject: |
[PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL |
Date: |
Mon, 10 May 2021 15:20:48 +0200 |
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
- [PULL 09/25] virtio-gpu: handle partial maps properly, (continued)
- [PULL 09/25] virtio-gpu: handle partial maps properly, Gerd Hoffmann, 2021/05/10
- [PULL 14/25] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/05/10
- [PULL 13/25] virtio-gpu: move virgl reset, Gerd Hoffmann, 2021/05/10
- [PULL 15/25] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/05/10
- [PULL 16/25] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/05/10
- [PULL 17/25] virtio-gpu: move virgl process_cmd, Gerd Hoffmann, 2021/05/10
- [PULL 18/25] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/05/10
- [PULL 20/25] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/05/10
- [PULL 19/25] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/05/10
- [PULL 21/25] virtio-gpu: drop use_virgl_renderer, Gerd Hoffmann, 2021/05/10
- [PULL 22/25] virtio-gpu: move fields to struct VirtIOGPUGL,
Gerd Hoffmann <=
- [PULL 23/25] virtio-gpu: add virtio-gpu-gl-pci, Gerd Hoffmann, 2021/05/10
- [PULL 24/25] modules: add have_vga, Gerd Hoffmann, 2021/05/10
- [PULL 25/25] virtio-gpu: add virtio-vga-gl, Gerd Hoffmann, 2021/05/10
- Re: [PULL 00/25] Vga 20210510 patches, no-reply, 2021/05/10
- Re: [PULL 00/25] Vga 20210510 patches, Peter Maydell, 2021/05/12