Commit 5d7ad3ce authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180604-pull-request' into staging 



Two little vga fixes.

# gpg: Signature made Mon 04 Jun 2018 09:48:53 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20180604-pull-request:
  vga: cleanup surface handling
  bochs-display: add missing break

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cfe67251 6bc2fd57

hw/display/bochs-display.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int bochs_display_get_mode(BochsDisplayState *s, 
        /* best effort: support native endianess only */

        mode->format = PIXMAN_r5g6b5;

        mode->bytepp = 2;

        break;

    case 32:

        mode->format = s->big_endian_fb

            ? PIXMAN_BE_x8r8g8b8

hw/display/vga.c

+19 −17
Original line number Diff line number Diff line
@@ -1548,21 +1548,14 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
    } else {

        share_surface = false;

    }



    if (s->line_offset != s->last_line_offset ||

        disp_width != s->last_width ||

        height != s->last_height ||

        s->last_depth != depth ||

        s->last_byteswap != byteswap ||

        share_surface != is_buffer_shared(surface)) {

        if (share_surface) {

            surface = qemu_create_displaysurface_from(disp_width,

                    height, format, s->line_offset,

                    s->vram_ptr + (s->start_addr * 4));

            dpy_gfx_replace_surface(s->con, surface);

        } else {

            qemu_console_resize(s->con, disp_width, height);

            surface = qemu_console_surface(s->con);

        }

        /* display parameters changed -> need new display surface */

        s->last_scr_width = disp_width;

        s->last_scr_height = height;

        s->last_width = disp_width;
@@ -1571,15 +1564,24 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
        s->last_depth = depth;

        s->last_byteswap = byteswap;

        full_update = 1;

    } else if (is_buffer_shared(surface) &&

               (full_update || surface_data(surface) != s->vram_ptr

                + (s->start_addr * 4))) {

        pixman_format_code_t format =

            qemu_default_pixman_format(depth, !byteswap);

    }

    if (surface_data(surface) != s->vram_ptr + (s->start_addr * 4)

        && is_buffer_shared(surface)) {

        /* base address changed (page flip) -> shared display surfaces

         * must be updated with the new base address */

        full_update = 1;

    }



    if (full_update) {

        if (share_surface) {

            surface = qemu_create_displaysurface_from(disp_width,

                    height, format, s->line_offset,

                    s->vram_ptr + (s->start_addr * 4));

            dpy_gfx_replace_surface(s->con, surface);

        } else {

            qemu_console_resize(s->con, disp_width, height);

            surface = qemu_console_surface(s->con);

        }

    }



    if (shift_control == 0) {