diff options
author | Stefan Hajnoczi | 2017-05-15 15:07:01 +0200 |
---|---|---|
committer | Stefan Hajnoczi | 2017-05-15 15:07:07 +0200 |
commit | 43ad494c0439e0af9f77cd455ec1a217a05b8fc0 (patch) | |
tree | 63590d6b974e7c1425679fa178f5af5e4fe2398f /hw/display/vga.c | |
parent | Merge remote-tracking branch 'dgibson/tags/ppc-for-2.10-20170511' into staging (diff) | |
parent | vga: fix display update region calculation (diff) | |
download | qemu-43ad494c0439e0af9f77cd455ec1a217a05b8fc0.tar.gz qemu-43ad494c0439e0af9f77cd455ec1a217a05b8fc0.tar.xz qemu-43ad494c0439e0af9f77cd455ec1a217a05b8fc0.zip |
Merge remote-tracking branch 'kraxel/tags/pull-vga-20170511-1' into staging
make display updates thread safe, batch #2
# gpg: Signature made Thu 11 May 2017 03:41:51 PM BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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
* kraxel/tags/pull-vga-20170511-1:
vga: fix display update region calculation
sm501: make display updates thread safe
tcx: make display updates thread safe
cg3: make display updates thread safe
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/display/vga.c')
-rw-r--r-- | hw/display/vga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index b2516c8d21..dcc95f88e2 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1630,7 +1630,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) if (!full_update) { vga_sync_dirty_bitmap(s); snap = memory_region_snapshot_and_clear_dirty(&s->vram, addr1, - bwidth * height, + line_offset * height, DIRTY_MEMORY_VGA); } |