[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] vmsvga: fix vmsvga_update_display
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 8/9] vmsvga: fix vmsvga_update_display |
Date: |
Fri, 21 Apr 2017 11:16:31 +0200 |
Fix standard vga mode check: Both s->config and s->enabled must be set
to enable vmware command fifo processing.
Drop dirty tracking code from the fifo rendering code path, it isn't
used anyway because vmsvga turns off dirty tracking when leaving
standard vga mode.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/vmware_vga.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 6599cf078d..ec5f27d67e 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -1118,9 +1118,9 @@ static void vmsvga_update_display(void *opaque)
{
struct vmsvga_state_s *s = opaque;
DisplaySurface *surface;
- bool dirty = false;
- if (!s->enable) {
+ if (!s->enable || !s->config) {
+ /* in standard vga mode */
s->vga.hw_ops->gfx_update(&s->vga);
return;
}
@@ -1131,26 +1131,11 @@ static void vmsvga_update_display(void *opaque)
vmsvga_fifo_run(s);
vmsvga_update_rect_flush(s);
- /*
- * Is it more efficient to look at vram VGA-dirty bits or wait
- * for the driver to issue SVGA_CMD_UPDATE?
- */
- if (memory_region_is_logging(&s->vga.vram, DIRTY_MEMORY_VGA)) {
- vga_sync_dirty_bitmap(&s->vga);
- dirty = memory_region_get_dirty(&s->vga.vram, 0,
- surface_stride(surface) * surface_height(surface),
- DIRTY_MEMORY_VGA);
- }
- if (s->invalidated || dirty) {
+ if (s->invalidated) {
s->invalidated = 0;
dpy_gfx_update(s->vga.con, 0, 0,
surface_width(surface), surface_height(surface));
}
- if (dirty) {
- memory_region_reset_dirty(&s->vga.vram, 0,
- surface_stride(surface) * surface_height(surface),
- DIRTY_MEMORY_VGA);
- }
}
static void vmsvga_reset(DeviceState *dev)
--
2.9.3
- [Qemu-devel] [PATCH 0/9] hw/display: make display updates thread safe, part 1, Gerd Hoffmann, 2017/04/21
- [Qemu-devel] [PATCH 2/9] memory: add support getting and using a dirty bitmap copy., Gerd Hoffmann, 2017/04/21
- [Qemu-devel] [PATCH 4/9] vga: make display updates thread safe., Gerd Hoffmann, 2017/04/21
- [Qemu-devel] [PATCH 1/9] bitmap: add bitmap_copy_and_clear_atomic, Gerd Hoffmann, 2017/04/21
- [Qemu-devel] [PATCH 3/9] vga: add vga_scanline_invalidated helper, Gerd Hoffmann, 2017/04/21