72 lines
2.7 KiB
Diff
72 lines
2.7 KiB
Diff
|
From 37625d78afdadb5e88aa4616d613f64184db41bf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Sat, 25 Nov 2023 01:42:26 -0800
|
||
|
|
Subject: [PATCH] ui/gtk: prevent ui lock up when dpy_gl_update called again
|
||
|
|
before current draw event occurs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry picked from commit 64f1359bd08060ffe7a5689fdcbaeec6d8a59980
|
||
|
|
|
||
|
|
A warning, "qemu: warning: console: no gl-unblock within" followed by
|
||
|
|
guest scanout lockup can happen if dpy_gl_update is called in a row
|
||
|
|
and the second call is made before gd_draw_event scheduled by the first
|
||
|
|
call is taking place. This is because draw call returns without decrementing
|
||
|
|
gl_block ref count if the dmabuf was already submitted as shown below.
|
||
|
|
|
||
|
|
(gd_gl_area_draw/gd_egl_draw)
|
||
|
|
|
||
|
|
if (dmabuf) {
|
||
|
|
if (!dmabuf->draw_submitted) {
|
||
|
|
return;
|
||
|
|
} else {
|
||
|
|
dmabuf->draw_submitted = false;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
So it should not schedule any redundant draw event in case draw_submitted is
|
||
|
|
already set in gd_egl_fluch/gd_gl_area_scanout_flush.
|
||
|
|
|
||
|
|
Cc: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
|
||
|
|
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
|
||
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Message-Id: <20221021192315.9110-1-dongwon.kim@intel.com>
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
ui/gtk-egl.c | 2 +-
|
||
|
|
ui/gtk-gl-area.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
|
||
|
|
index 45cb67712d..0e1e5bfaaa 100644
|
||
|
|
--- a/ui/gtk-egl.c
|
||
|
|
+++ b/ui/gtk-egl.c
|
||
|
|
@@ -340,7 +340,7 @@ void gd_egl_flush(DisplayChangeListener *dcl,
|
||
|
|
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
|
||
|
|
GtkWidget *area = vc->gfx.drawing_area;
|
||
|
|
|
||
|
|
- if (vc->gfx.guest_fb.dmabuf) {
|
||
|
|
+ if (vc->gfx.guest_fb.dmabuf && !vc->gfx.guest_fb.dmabuf->draw_submitted) {
|
||
|
|
graphic_hw_gl_block(vc->gfx.dcl.con, true);
|
||
|
|
vc->gfx.guest_fb.dmabuf->draw_submitted = true;
|
||
|
|
gtk_widget_queue_draw_area(area, x, y, w, h);
|
||
|
|
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
|
||
|
|
index 01e4e74ee3..11e0cb4af2 100644
|
||
|
|
--- a/ui/gtk-gl-area.c
|
||
|
|
+++ b/ui/gtk-gl-area.c
|
||
|
|
@@ -246,7 +246,7 @@ void gd_gl_area_scanout_flush(DisplayChangeListener *dcl,
|
||
|
|
{
|
||
|
|
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
|
||
|
|
|
||
|
|
- if (vc->gfx.guest_fb.dmabuf) {
|
||
|
|
+ if (vc->gfx.guest_fb.dmabuf && !vc->gfx.guest_fb.dmabuf->draw_submitted) {
|
||
|
|
graphic_hw_gl_block(vc->gfx.dcl.con, true);
|
||
|
|
vc->gfx.guest_fb.dmabuf->draw_submitted = true;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|