diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-24 16:15:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-24 16:15:26 +0100 |
| commit | d5a515738ee2dec0cdf11d8a14a09abae6c20571 (patch) | |
| tree | afe4cf0ecca0989ce975668252a0eca95c3bed8d /hw/display/exynos4210_fimd.c | |
| parent | efd1d5229fbf09f2ef535df024ccaa620a013f86 (diff) | |
| parent | 8da132a56f7ebaabc5b674b5a3a2e6fa8934be45 (diff) | |
| download | focaccia-qemu-d5a515738ee2dec0cdf11d8a14a09abae6c20571.tar.gz focaccia-qemu-d5a515738ee2dec0cdf11d8a14a09abae6c20571.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/exynos4210_fimd.c')
| -rw-r--r-- | hw/display/exynos4210_fimd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index f011ea5b00..083b3172da 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -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; |