[PATCH] ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture

[PATCH] ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture

[Dongwon Kim]

Fixing a regression (black screen) caused by a commit 92b58156e7
("ui/gtk: set scanout-mode right before scheduling draw").

The commit 92b58156e7 was made with an assumption that the scanout
mode needs to be set only if the guest scanout is a dmabuf but there
are cases (e.g. virtio-gpu-virgl) where the scanout is still processed
in a form of a texture but is not backed by dmabuf. So it is needed
to put back the line that sets scanout mode in gd_egl_scanout_texture
and gd_gl_area_scanout_texture.

Fixes: 92b58156e7 ("ui/gtk: set scanout-mode right before scheduling draw)
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
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-egl.c     | 1 +
 ui/gtk-gl-area.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 4c29ac10d0..a1060fd80f 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -246,6 +246,7 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl,
     eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
                    vc->gfx.esurface, vc->gfx.ectx);
 
+    gtk_egl_set_scanout_mode(vc, true);
     egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
                          backing_id, false);
 }
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
index 1ce34a249e..52dcac161e 100644
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -268,6 +268,7 @@ void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,
         return;
     }
 
+    gtk_gl_area_set_scanout_mode(vc, true);
     egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
                          backing_id, false);
 }
-- 
2.34.1

Re: [PATCH] ui/gtk: set scanout mode in gd_egl/gd_gl_area_scanout_texture

[Marc-André Lureau]

Hi

On Tue, Jul 25, 2023 at 4:35 AM Dongwon Kim <dongwon.kim@intel.com> wrote:
>
> Fixing a regression (black screen) caused by a commit 92b58156e7
> ("ui/gtk: set scanout-mode right before scheduling draw").
>
> The commit 92b58156e7 was made with an assumption that the scanout
> mode needs to be set only if the guest scanout is a dmabuf but there
> are cases (e.g. virtio-gpu-virgl) where the scanout is still processed
> in a form of a texture but is not backed by dmabuf. So it is needed
> to put back the line that sets scanout mode in gd_egl_scanout_texture
> and gd_gl_area_scanout_texture.
>
> Fixes: 92b58156e7 ("ui/gtk: set scanout-mode right before scheduling draw)
> Reported-by: Volker Rümelin <vr_qemu@t-online.de>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Marc-André Lureau <marcandre.lureau@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>

> ---
>  ui/gtk-egl.c     | 1 +
>  ui/gtk-gl-area.c | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
> index 4c29ac10d0..a1060fd80f 100644
> --- a/ui/gtk-egl.c
> +++ b/ui/gtk-egl.c
> @@ -246,6 +246,7 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl,
>      eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
>                     vc->gfx.esurface, vc->gfx.ectx);
>
> +    gtk_egl_set_scanout_mode(vc, true);
>      egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
>                           backing_id, false);
>  }
> diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
> index 1ce34a249e..52dcac161e 100644
> --- a/ui/gtk-gl-area.c
> +++ b/ui/gtk-gl-area.c
> @@ -268,6 +268,7 @@ void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,
>          return;
>      }
>
> +    gtk_gl_area_set_scanout_mode(vc, true);
>      egl_fb_setup_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
>                           backing_id, false);
>  }
> --
> 2.34.1
>
>


-- 
Marc-André Lureau