From 6bf01418f12a88167ec2a3244ca7b245a53c60ae Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>

Date: Wed, 16 Oct 2019 13:53:27 +0100

Subject: [PATCH 1/2] virtio-gpu: block both 2d and 3d rendering

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>

Message-id: <20191016135327.23601-1-marcandre.lureau@redhat.com>

Patchwork-id: 91814

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH] virtio-gpu: block both 2d and 3d rendering

Bugzilla: 1674324

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>

RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1674324

BRANCH: rhel-8.2.0

UPSTREAM: ad341aacbf4b119a88e0f9d5a1f753d6ed0fdd86

BREW: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=24095898

Now that 2d commands are translated to 3d rendering, qemu must stop

sending 3d updates (from 2d) to Spice as well.

Fixes:

https://bugzilla.redhat.com/show_bug.cgi?id=1674324

Cc: cfergeau@redhat.com

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Christophe Fergeau <cfergeau@redhat.com>

Tested-by: Christophe Fergeau <cfergeau@redhat.com>

Message-id: 20190221114330.17968-4-marcandre.lureau@redhat.com

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit ad341aacbf4b119a88e0f9d5a1f753d6ed0fdd86)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/display/virtio-gpu-3d.c     | 21 ---------------------

 hw/display/virtio-gpu.c        | 27 ++++++++++++++++++++++-----

 include/hw/virtio/virtio-gpu.h |  1 -

 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c

index 55d7640..9654c04 100644

--- a/hw/display/virtio-gpu-3d.c

+++ b/hw/display/virtio-gpu-3d.c

@@ -404,11 +404,6 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,

 {

     VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr);

-    cmd->waiting = g->renderer_blocked;

-    if (cmd->waiting) {

-        return;

-    }

-

     virgl_renderer_force_ctx_0();

     switch (cmd->cmd_hdr.type) {

     case VIRTIO_GPU_CMD_CTX_CREATE:

@@ -604,22 +599,6 @@ void virtio_gpu_virgl_reset(VirtIOGPU *g)

     }

 }

-void virtio_gpu_gl_block(void *opaque, bool block)

-{

-    VirtIOGPU *g = opaque;

-

-    if (block) {

-        g->renderer_blocked++;

-    } else {

-        g->renderer_blocked--;

-    }

-    assert(g->renderer_blocked >= 0);

-

-    if (g->renderer_blocked == 0) {

-        virtio_gpu_process_cmdq(g);

-    }

-}

-

 int virtio_gpu_virgl_init(VirtIOGPU *g)

 {

     int ret;

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c

index 07712d0..416ef80 100644

--- a/hw/display/virtio-gpu.c

+++ b/hw/display/virtio-gpu.c

@@ -888,12 +888,15 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g)

     while (!QTAILQ_EMPTY(&g->cmdq)) {

         cmd = QTAILQ_FIRST(&g->cmdq);

-        /* process command */

-        VIRGL(g, virtio_gpu_virgl_process_cmd, virtio_gpu_simple_process_cmd,

-              g, cmd);

+        cmd->waiting = g->renderer_blocked;

         if (cmd->waiting) {

             break;

         }

+

+        /* process command */

+        VIRGL(g, virtio_gpu_virgl_process_cmd, virtio_gpu_simple_process_cmd,

+              g, cmd);

+

         QTAILQ_REMOVE(&g->cmdq, cmd, next);

         if (virtio_gpu_stats_enabled(g->conf)) {

             g->stats.requests++;

@@ -1029,14 +1032,28 @@ static int virtio_gpu_ui_info(void *opaque, uint32_t idx, QemuUIInfo *info)

     return 0;

 }

+static void virtio_gpu_gl_block(void *opaque, bool block)

+{

+    VirtIOGPU *g = opaque;

+

+    if (block) {

+        g->renderer_blocked++;

+    } else {

+        g->renderer_blocked--;

+    }

+    assert(g->renderer_blocked >= 0);

+

+    if (g->renderer_blocked == 0) {

+        virtio_gpu_process_cmdq(g);

+    }

+}

+

 const GraphicHwOps virtio_gpu_ops = {

     .invalidate = virtio_gpu_invalidate_display,

     .gfx_update = virtio_gpu_update_display,

     .text_update = virtio_gpu_text_update,

     .ui_info = virtio_gpu_ui_info,

-#ifdef CONFIG_VIRGL

     .gl_block = virtio_gpu_gl_block,

-#endif

 };

 static const VMStateDescription vmstate_virtio_gpu_scanout = {

diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h

index f95f8ce..bbeddd7 100644

--- a/include/hw/virtio/virtio-gpu.h

+++ b/include/hw/virtio/virtio-gpu.h

@@ -171,7 +171,6 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,

                                   struct virtio_gpu_ctrl_command *cmd);

 void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);

 void virtio_gpu_virgl_reset(VirtIOGPU *g);

-void virtio_gpu_gl_block(void *opaque, bool block);

 int virtio_gpu_virgl_init(VirtIOGPU *g);

 int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g);

 #endif

-- 

1.8.3.1