Hi On Thu, May 30, 2024 at 3:05 PM Gerd Hoffmann <kra...@redhat.com> wrote:
> In case the display surface uses a shared buffer (i.e. uses vga vram > directly instead of a shadow) go unshare the buffer before clearing it. > > This avoids vga memory corruption, which in turn fixes unblanking not > working properly with X11. > > Cc: qemu-sta...@nongnu.org > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2067 > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> > --- > hw/display/vga.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/display/vga.c b/hw/display/vga.c > index 30facc6c8e33..34ab8eb9b745 100644 > --- a/hw/display/vga.c > +++ b/hw/display/vga.c > @@ -1762,6 +1762,12 @@ static void vga_draw_blank(VGACommonState *s, int > full_update) > if (s->last_scr_width <= 0 || s->last_scr_height <= 0) > return; > > + if (is_buffer_shared(surface)) { > It might be a good time to rename this function. surface_is_borrowed() ? > + /* unshare buffer, otherwise the blanking corrupts vga vram */ > + qemu_console_resize(s->con, s->last_scr_width, > s->last_scr_height); > If we want to guarantee that a new surface is created, we should leave a comment on qemu_console_resize(), or perhaps make it take a new/alloc argument? + surface = qemu_console_surface(s->con); > + } > + > w = s->last_scr_width * surface_bytes_per_pixel(surface); > d = surface_data(surface); > for(i = 0; i < s->last_scr_height; i++) { > -- > 2.45.1 > > > thanks -- Marc-André Lureau
