38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 15 Mar 2017 13:06:46 +0100
|
|
Subject: [PATCH] cirrus: fix cirrus_invalidate_region
|
|
|
|
off_cur_end is exclusive, so off_cur_end == cirrus_addr_mask is valid.
|
|
Fix calculation to make sure to allow that, otherwise the assert added
|
|
by commit f153b563f8cf121aebf5a2fff5f0110faf58ccb3 can trigger for valid
|
|
blits.
|
|
|
|
Test case: boot windows nt 4.0
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Message-id: 1489579606-26020-1-git-send-email-kraxel@redhat.com
|
|
(cherry picked from commit e048dac616748273c2153490e9fdf1da242f0cad)
|
|
---
|
|
hw/display/cirrus_vga.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
index 2ef2884823..444335f7c1 100644
|
|
--- a/hw/display/cirrus_vga.c
|
|
+++ b/hw/display/cirrus_vga.c
|
|
@@ -665,11 +665,11 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin,
|
|
}
|
|
|
|
for (y = 0; y < lines; y++) {
|
|
- off_cur = off_begin;
|
|
- off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask;
|
|
+ off_cur = off_begin;
|
|
+ off_cur_end = ((off_cur + bytesperline - 1) & s->cirrus_addr_mask) + 1;
|
|
assert(off_cur_end >= off_cur);
|
|
memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur);
|
|
- off_begin += off_pitch;
|
|
+ off_begin += off_pitch;
|
|
}
|
|
}
|
|
|