[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 7/9] ui/gtk: unblock gl if draw submitted already or fence is
From: |
Dongwon Kim |
Subject: |
[RFC PATCH 7/9] ui/gtk: unblock gl if draw submitted already or fence is not yet signaled |
Date: |
Tue, 20 Jun 2023 17:43:53 -0700 |
Remove monitor while a guest frame is still being processed could block
the guest (virtio-gpu) scanout pipe line. It is needed to manually flush
the pipeline to prevent the permanent lockup.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
ui/gtk.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index f4c71454a3..e4ef1f7173 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -598,10 +598,21 @@ void gd_hw_gl_flushed(void *vcon)
VirtualConsole *vc = vcon;
QemuDmaBuf *dmabuf = vc->gfx.guest_fb.dmabuf;
- qemu_set_fd_handler(dmabuf->fence_fd, NULL, NULL, NULL);
- close(dmabuf->fence_fd);
- dmabuf->fence_fd = -1;
- graphic_hw_gl_block(vc->gfx.dcl.con, false);
+ if (!dmabuf) {
+ return;
+ }
+
+ if (dmabuf->fence_fd > 0) {
+ qemu_set_fd_handler(dmabuf->fence_fd, NULL, NULL, NULL);
+ close(dmabuf->fence_fd);
+ dmabuf->fence_fd = -1;
+ graphic_hw_gl_block(vc->gfx.dcl.con, false);
+ } else if (dmabuf->draw_submitted) {
+ /* if called after a frame is submitted but render event
+ * is not scheduled yet, cancel submitted draw. */
+ dmabuf->draw_submitted = false;
+ graphic_hw_gl_block(vc->gfx.dcl.con, false);
+ }
}
/** DisplayState Callbacks (opengl version) **/
@@ -742,6 +753,9 @@ static void gd_set_ui_size(VirtualConsole *vc, gint width,
gint height)
dpy_set_ui_info(vc->gfx.dcl.con, &info, true);
}
+static gboolean gd_window_state_event(GtkWidget *widget, GdkEvent *event,
+ void *opaque);
+
static void gd_ui_hide(VirtualConsole *vc)
{
QemuUIInfo info;
@@ -751,6 +765,8 @@ static void gd_ui_hide(VirtualConsole *vc)
info.width = 0;
info.height = 0;
dpy_set_ui_info(vc->gfx.dcl.con, &info, false);
+ /* forcefully cancel rendering sequence */
+ gd_hw_gl_flushed(vc);
}
static void gd_ui_show(VirtualConsole *vc)
@@ -1460,11 +1476,6 @@ static gboolean gd_window_state_event(GtkWidget *widget,
GdkEvent *event,
if (event->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
gd_ui_hide(vc);
- if (vc->gfx.guest_fb.dmabuf &&
- vc->gfx.guest_fb.dmabuf->draw_submitted) {
- vc->gfx.guest_fb.dmabuf->draw_submitted = false;
- graphic_hw_gl_block(vc->gfx.dcl.con, false);
- }
} else {
gd_ui_show(vc);
}
--
2.34.1
- [RFC PATCH 0/9] ui: guest displays multiple connectors suppport and hotplug in, Dongwon Kim, 2023/06/20
- [RFC PATCH 1/9] ui/gtk: skip drawing guest scanout when associated VC is invisible, Dongwon Kim, 2023/06/20
- [RFC PATCH 3/9] ui/gtk: reset visible flag when window is minimized, Dongwon Kim, 2023/06/20
- [RFC PATCH 2/9] ui/gtk: set the ui size to 0 when invisible, Dongwon Kim, 2023/06/20
- [RFC PATCH 4/9] ui/gtk: Disable the scanout when a detached tab is closed, Dongwon Kim, 2023/06/20
- [RFC PATCH 5/9] ui/gtk: Factor out tab window creation into a separate function, Dongwon Kim, 2023/06/20
- [RFC PATCH 7/9] ui/gtk: unblock gl if draw submitted already or fence is not yet signaled,
Dongwon Kim <=
- [RFC PATCH 6/9] ui/gtk: Add a new parameter to assign connectors/monitors to GFX VCs, Dongwon Kim, 2023/06/20
- [RFC PATCH 8/9] ui/gtk: skip drawing if any of ctx/surface/image don't exist, Dongwon Kim, 2023/06/20
- [RFC PATCH 9/9] ui/gtk: skip refresh/rendering if VC is invisible, Dongwon Kim, 2023/06/20