[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/15] virtio-gpu: drop use_virgl_renderer
From: |
Gerd Hoffmann |
Subject: |
[PATCH 14/15] virtio-gpu: drop use_virgl_renderer |
Date: |
Fri, 19 Mar 2021 12:21:46 +0100 |
Now that we have separated the gl and non-gl code flows to two different
devices there is little reason turn on and off virglrenderer usage at
runtime. The gl code can simply use virglrenderer unconditionally.
So drop use_virgl_renderer field and just do that.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 1 -
hw/display/virtio-gpu-base.c | 6 +----
hw/display/virtio-gpu-gl.c | 44 ++++++++++------------------------
3 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index cd55c2d07090..9629885c895f 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -111,7 +111,6 @@ struct VirtIOGPUBase {
struct virtio_gpu_config virtio_config;
const GraphicHwOps *hw_ops;
- bool use_virgl_renderer;
int renderer_blocked;
int enable;
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 25f8920fdb67..afb3ee7d9afc 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -25,7 +25,6 @@ virtio_gpu_base_reset(VirtIOGPUBase *g)
int i;
g->enable = 0;
- g->use_virgl_renderer = false;
for (i = 0; i < g->conf.max_outputs; i++) {
g->scanout[i].resource_id = 0;
@@ -162,7 +161,6 @@ virtio_gpu_base_device_realize(DeviceState *qdev,
return false;
}
- g->use_virgl_renderer = false;
if (virtio_gpu_virgl_enabled(g->conf)) {
error_setg(&g->migration_blocker, "virgl is not yet migratable");
if (migrate_add_blocker(g->migration_blocker, errp) < 0) {
@@ -218,10 +216,8 @@ static void
virtio_gpu_base_set_features(VirtIODevice *vdev, uint64_t features)
{
static const uint32_t virgl = (1 << VIRTIO_GPU_F_VIRGL);
- VirtIOGPUBase *g = VIRTIO_GPU_BASE(vdev);
- g->use_virgl_renderer = ((features & virgl) == virgl);
- trace_virtio_gpu_features(g->use_virgl_renderer);
+ trace_virtio_gpu_features(((features & virgl) == virgl));
}
static void
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index b4303cc5bb41..1642a973549e 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -32,34 +32,20 @@ static void virtio_gpu_gl_update_cursor_data(VirtIOGPU *g,
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;
- }
+ 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));
+ if (width != s->current_cursor->width ||
+ height != s->current_cursor->height) {
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)
-{
- if (g->parent_obj.use_virgl_renderer) {
- virtio_gpu_virgl_process_cmd(g, cmd);
- return;
- }
- virtio_gpu_simple_process_cmd(g, cmd);
+ pixels = s->current_cursor->width * s->current_cursor->height;
+ memcpy(s->current_cursor->data, data, pixels * sizeof(uint32_t));
+ free(data);
}
static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
@@ -82,7 +68,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
return;
}
- if (!g->renderer_inited && g->parent_obj.use_virgl_renderer) {
+ if (!g->renderer_inited) {
virtio_gpu_virgl_init(g);
g->renderer_inited = true;
}
@@ -97,10 +83,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
}
virtio_gpu_process_cmdq(g);
-
- if (g->parent_obj.use_virgl_renderer) {
- virtio_gpu_virgl_fence_poll(g);
- }
+ virtio_gpu_virgl_fence_poll(g);
}
static void virtio_gpu_gl_reset(VirtIODevice *vdev)
@@ -109,13 +92,12 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev)
virtio_gpu_reset(vdev);
- if (g->parent_obj.use_virgl_renderer) {
+ if (g->renderer_inited) {
if (g->parent_obj.renderer_blocked) {
g->renderer_reset = true;
} else {
virtio_gpu_virgl_reset(g);
}
- g->parent_obj.use_virgl_renderer = false;
}
}
@@ -155,7 +137,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->process_cmd = virtio_gpu_virgl_process_cmd;
vgc->update_cursor_data = virtio_gpu_gl_update_cursor_data;
vdc->realize = virtio_gpu_gl_device_realize;
--
2.30.2
- [PATCH 12/15] virtio-gpu: drop VIRGL() macro, (continued)
- [PATCH 12/15] virtio-gpu: drop VIRGL() macro, Gerd Hoffmann, 2021/03/19
- [PATCH 07/15] virtio-gpu: use class function for ctrl queue handlers, Gerd Hoffmann, 2021/03/19
- [PATCH 11/15] virtio-gpu: move update_cursor_data, Gerd Hoffmann, 2021/03/19
- [PATCH 09/15] virtio-gpu: move virgl gl_flushed, Gerd Hoffmann, 2021/03/19
- [PATCH 05/15] virtio-gpu: move virgl realize + properties, Gerd Hoffmann, 2021/03/19
- [PATCH 06/15] virtio-gpu: move virgl reset, Gerd Hoffmann, 2021/03/19
- [PATCH 08/15] virtio-gpu: move virgl handle_ctrl, Gerd Hoffmann, 2021/03/19
- [PATCH 13/15] virtio-gpu: move virtio-gpu-gl-device to separate module, Gerd Hoffmann, 2021/03/19
- [PATCH 15/15] virtio-gpu: move fields to struct VirtIOGPUGL, Gerd Hoffmann, 2021/03/19
- [PATCH 10/15] virtio-gpu: move virgl process_cmd, Gerd Hoffmann, 2021/03/19
- [PATCH 14/15] virtio-gpu: drop use_virgl_renderer,
Gerd Hoffmann <=
- Re: [PATCH 00/15] virtio-gpu: split into two devices., no-reply, 2021/03/19
- Re: [PATCH 00/15] virtio-gpu: split into two devices., Marc-André Lureau, 2021/03/19