Commit fb5fff15 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180312-pull-request' into staging 



7cdc61be 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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6ceb1b51 7cdc61be

hw/display/vga.c

+2 −0
Original line number Diff line number Diff line
@@ -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;