diff options
| author | Peter Maydell | 2019-07-05 15:51:21 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-05 15:51:21 +0200 |
| commit | dba519a2980ab4ba2b3f89546f382de7199eabb6 (patch) | |
| tree | 0d8b3fb022b0eec0ce709d9f1e0c50cfa513d082 /hw/display/ati.c | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-050719-3... (diff) | |
| parent | ati-vga: Fix setting offset together with pitch for r128pro (diff) | |
| download | qemu-dba519a2980ab4ba2b3f89546f382de7199eabb6.tar.gz qemu-dba519a2980ab4ba2b3f89546f382de7199eabb6.tar.xz qemu-dba519a2980ab4ba2b3f89546f382de7199eabb6.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190705-pull-request' into staging
vga: more ati bugfixes.
# gpg: Signature made Fri 05 Jul 2019 14:42:30 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190705-pull-request:
ati-vga: Fix setting offset together with pitch for r128pro
ati-vga: Fix reverse bit blts
ati-vga: Fix frame buffer endianness for big endian target
ati-vga: Improve readability of ati_2d_blt function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/ati.c')
| -rw-r--r-- | hw/display/ati.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/display/ati.c b/hw/display/ati.c index c1d9d1518f..a747c4cc98 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -89,6 +89,7 @@ static void ati_vga_switch_mode(ATIVGAState *s) DPRINTF("Switching to %dx%d %d %d @ %x\n", h, v, stride, bpp, offs); vbe_ioport_write_index(&s->vga, 0, VBE_DISPI_INDEX_ENABLE); vbe_ioport_write_data(&s->vga, 0, VBE_DISPI_DISABLED); + s->vga.big_endian_fb = false; /* reset VBE regs then set up mode */ s->vga.vbe_regs[VBE_DISPI_INDEX_XRES] = h; s->vga.vbe_regs[VBE_DISPI_INDEX_YRES] = v; @@ -688,7 +689,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, break; case SRC_PITCH_OFFSET: if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) { - s->regs.src_offset = (data & 0x1fffff) << 4; + s->regs.src_offset = (data & 0x1fffff) << 5; s->regs.src_pitch = (data & 0x7fe00000) >> 21; s->regs.src_tile = data >> 31; } else { @@ -699,7 +700,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, break; case DST_PITCH_OFFSET: if (s->dev_id == PCI_DEVICE_ID_ATI_RAGE128_PF) { - s->regs.dst_offset = (data & 0x1fffff) << 4; + s->regs.dst_offset = (data & 0x1fffff) << 5; s->regs.dst_pitch = (data & 0x7fe00000) >> 21; s->regs.dst_tile = data >> 31; } else { |