Skip to contentSkip to conversation

vga: Fix full updates in graphic mode

PATCH Applied Jan Kiszka 2 participants 2 messages Feb 7, 2012 – Feb 11, 2012

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 vga: Fix full updates in graphic mode

This fixes the regression introduced by cd7a45c95e: We lost the or'ing with the full_update flag.

Signed-off-by Jan Kiszka <[email protected]>

---

Applies on top of the other related fix:
http://thread.gmane.org/gmane.comp.emulators.qemu/134958

 hw/vga.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
hw/vga.c +3 -2
index d27700d..c1029db 100644
@@ -1777,10 +1777,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
         if (!(s->cr[VGA_CRTC_MODE] & 2)) {
             addr = (addr & ~0x8000) | ((y1 & 2) << 14);
         }
+        update = full_update;
         page0 = addr;
         page1 = addr + bwidth - 1;
-        update = memory_region_get_dirty(&s->vram, page0, page1 - page0,
-                                         DIRTY_MEMORY_VGA);
+        update |= memory_region_get_dirty(&s->vram, page0, page1 - page0,
+                                          DIRTY_MEMORY_VGA);
         /* explicit invalidation for the hardware cursor */
         update |= (s->invalidated_y_table[y >> 5] >> (y & 0x1f)) & 1;
         if (update) {
Signature · 1 line
1.7.3.4
Applied
#1 lore raw

Thanks, applied.

Quoted 32 lines · Jan Kiszka

This fixes the regression introduced by cd7a45c95e: We lost the or'ing with the full_update flag.

Signed-off-by Jan Kiszka <[email protected]>

---

Applies on top of the other related fix:
http://thread.gmane.org/gmane.comp.emulators.qemu/134958

 hw/vga.c |    5 +++--

 1 files changed, 3 insertions(+), 2 deletions(-)
hw/vga.c +3 -3
index d27700d..c1029db 100644
@@ -1777,10 +1777,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
         if (!(s->cr[VGA_CRTC_MODE] & 2)) {
             addr = (addr & ~0x8000) | ((y1 & 2) << 14);
         }
+        update = full_update;
         page0 = addr;
         page1 = addr + bwidth - 1;
-        update = memory_region_get_dirty(&s->vram, page0, page1 - page0,
-                                         DIRTY_MEMORY_VGA);
+        update |= memory_region_get_dirty(&s->vram, page0, page1 - page0,
+                                          DIRTY_MEMORY_VGA);
         /* explicit invalidation for the hardware cursor */
         update |= (s->invalidated_y_table[y >> 5] >> (y & 0x1f)) & 1;
         if (update) {
--

1.7.3.4