All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	vivek.kasireddy@intel.com, tina.zhang@intel.com
Subject: [PATCH 09/15] virtio-gpu: move virgl gl_flushed
Date: Fri, 19 Mar 2021 12:21:41 +0100	[thread overview]
Message-ID: <20210319112147.4138943-10-kraxel@redhat.com> (raw)
In-Reply-To: <20210319112147.4138943-1-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/virtio-gpu-gl.c | 13 +++++++++++++
 hw/display/virtio-gpu.c    | 15 ---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 6d0ce5bcd6f1..e976fb8d04c4 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -23,6 +23,17 @@
 #include "hw/virtio/virtio-gpu-pixman.h"
 #include "hw/qdev-properties.h"
 
+static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
+{
+    VirtIOGPU *g = VIRTIO_GPU(b);
+
+    if (g->renderer_reset) {
+        g->renderer_reset = false;
+        virtio_gpu_virgl_reset(g);
+    }
+    virtio_gpu_process_cmdq(g);
+}
+
 static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
 {
     VirtIOGPU *g = VIRTIO_GPU(vdev);
@@ -100,8 +111,10 @@ static void virtio_gpu_gl_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+    VirtIOGPUBaseClass *vbc = VIRTIO_GPU_BASE_CLASS(klass);
     VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass);
 
+    vbc->gl_flushed = virtio_gpu_gl_flushed;
     vgc->handle_ctrl = virtio_gpu_gl_handle_ctrl;
 
     vdc->realize = virtio_gpu_gl_device_realize;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 5901e09bcd81..ae80519c7356 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -843,19 +843,6 @@ void virtio_gpu_process_cmdq(VirtIOGPU *g)
     g->processing_cmdq = false;
 }
 
-static void virtio_gpu_gl_flushed(VirtIOGPUBase *b)
-{
-    VirtIOGPU *g = VIRTIO_GPU(b);
-
-#ifdef CONFIG_VIRGL
-    if (g->renderer_reset) {
-        g->renderer_reset = false;
-        virtio_gpu_virgl_reset(g);
-    }
-#endif
-    virtio_gpu_process_cmdq(g);
-}
-
 static void virtio_gpu_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
 {
     VirtIOGPU *g = VIRTIO_GPU(vdev);
@@ -1199,10 +1186,8 @@ static void virtio_gpu_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
-    VirtIOGPUBaseClass *vbc = VIRTIO_GPU_BASE_CLASS(klass);
     VirtIOGPUClass *vgc = VIRTIO_GPU_CLASS(klass);
 
-    vbc->gl_flushed = virtio_gpu_gl_flushed;
     vgc->handle_ctrl = virtio_gpu_handle_ctrl;
 
     vdc->realize = virtio_gpu_device_realize;
-- 
2.30.2



  parent reply	other threads:[~2021-03-19 11:33 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-19 11:21 [PATCH 00/15] virtio-gpu: split into two devices Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 01/15] virtio-gpu: rename virgl source file Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 02/15] virtio-gpu: add virtio-gpu-gl-device Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 03/15] virtio-gpu: add virtio-gpu-gl-pci Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 04/15] virtio-gpu: add virtio-vga-gl Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 05/15] virtio-gpu: move virgl realize + properties Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 06/15] virtio-gpu: move virgl reset Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 07/15] virtio-gpu: use class function for ctrl queue handlers Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 08/15] virtio-gpu: move virgl handle_ctrl Gerd Hoffmann
2021-03-19 11:21 ` Gerd Hoffmann [this message]
2021-03-19 11:21 ` [PATCH 10/15] virtio-gpu: move virgl process_cmd Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 11/15] virtio-gpu: move update_cursor_data Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 12/15] virtio-gpu: drop VIRGL() macro Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 13/15] virtio-gpu: move virtio-gpu-gl-device to separate module Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 14/15] virtio-gpu: drop use_virgl_renderer Gerd Hoffmann
2021-03-19 11:21 ` [PATCH 15/15] virtio-gpu: move fields to struct VirtIOGPUGL Gerd Hoffmann
2021-03-19 11:42 ` [PATCH 00/15] virtio-gpu: split into two devices no-reply
2021-03-19 11:48 ` Marc-André Lureau
2021-03-22  8:14   ` Gerd Hoffmann
2021-03-22 18:41     ` Kasireddy, Vivek
2021-03-23  8:18       ` Gerd Hoffmann

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=20210319112147.4138943-10-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=tina.zhang@intel.com \
    --cc=vivek.kasireddy@intel.com \
    /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.