diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 18:35:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-12 18:35:37 +0000 |
| commit | fb5fff15881ba7a002924b967eb211c002897983 (patch) | |
| tree | 0134d95ecc1e796cacecaf126f9c046c4a6da0c2 /hw | |
| parent | 6ceb1b51f05f9e1892d082960ed602dca7b6696e (diff) | |
| parent | 7cdc61becd095b64a786b2625f321624e7111f3d (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180312-pull-request' into staging
7cdc61becd vga: fix region calculation
# gpg: Signature made Mon 12 Mar 2018 10:59:24 GMT
# 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-20180312-pull-request:
vga: fix region calculation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/vga.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 28f298b342..72181330b8 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1483,6 +1483,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) region_start = (s->start_addr * 4); region_end = region_start + (ram_addr_t)s->line_offset * height; + region_end += width * s->get_bpp(s) / 8; /* scanline length */ + region_end -= s->line_offset; if (region_end > s->vbe_size) { /* wraps around (can happen with cirrus vbe modes) */ region_start = 0; |