Commit d5a51573 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



vga: virtio reset fix, virtio iommu support.

# gpg: Signature made Mon 03 Sep 2018 07:57:32 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-20180903-pull-request:
  virtio-gpu: add iommu support
  virtio-gpu: pass down VirtIOGPU pointer to a bunch of functions
  use dpy_gfx_update_full
  Revert "virtio-gpu: fix crashes upon warm reboot with vga mode"
  virtio-vga: fix reset

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents efd1d522 8da132a5

hw/display/exynos4210_fimd.c

+1 −3
Original line number Diff line number Diff line
@@ -1272,8 +1272,6 @@ static void exynos4210_fimd_update(void *opaque) 
    uint8_t *host_fb_addr;

    bool is_dirty = false;

    const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1;

    const int global_height = ((s->vidtcon[2] >> FIMD_VIDTCON2_VER_SHIFT) &

            FIMD_VIDTCON2_SIZE_MASK) + 1;



    if (!s || !s->console || !s->enabled ||

        surface_bits_per_pixel(qemu_console_surface(s->console)) == 0) {
@@ -1329,7 +1327,7 @@ static void exynos4210_fimd_update(void *opaque) 
            fimd_copy_line_toqemu(global_width, s->ifb + global_width * line *

                    RGBA_SIZE, d + global_width * line * bpp);

        }

        dpy_gfx_update(s->console, 0, 0, global_width, global_height);

        dpy_gfx_update_full(s->console);

    }

    s->invalidate = false;

    s->vidintcon[1] |= FIMD_VIDINT_INTFRMPEND;

hw/display/g364fb.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void g364fb_draw_blank(G364State *s) 
        d += surface_stride(surface);

    }



    dpy_gfx_update(s->con, 0, 0, s->width, s->height);

    dpy_gfx_update_full(s->con);

    s->blanked = 1;

}

hw/display/jazz_led.c

+1 −2
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ static void jazz_led_update_display(void *opaque) 
    }



    s->state = REDRAW_NONE;

    dpy_gfx_update(s->con, 0, 0,

                   surface_width(surface), surface_height(surface));

    dpy_gfx_update_full(s->con);

}



static void jazz_led_invalidate_display(void *opaque)

hw/display/tc6393xb.c

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void tc6393xb_draw_graphic(TC6393xbState *s, int full_update) 
            return;

    }



    dpy_gfx_update(s->con, 0, 0, s->scr_width, s->scr_height);

    dpy_gfx_update_full(s->con);

}



static void tc6393xb_draw_blank(TC6393xbState *s, int full_update)
@@ -480,7 +480,7 @@ static void tc6393xb_draw_blank(TC6393xbState *s, int full_update) 
        d += surface_stride(surface);

    }



    dpy_gfx_update(s->con, 0, 0, s->scr_width, s->scr_height);

    dpy_gfx_update_full(s->con);

}



static void tc6393xb_update_display(void *opaque)

hw/display/vga.c

+1 −2
Original line number Diff line number Diff line
@@ -1745,8 +1745,7 @@ static void vga_draw_blank(VGACommonState *s, int full_update) 
        memset(d, 0, w);

        d += surface_stride(surface);

    }

    dpy_gfx_update(s->con, 0, 0,

                   s->last_scr_width, s->last_scr_height);

    dpy_gfx_update_full(s->con);

}



#define GMODE_TEXT     0