diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-18 16:37:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-18 16:37:09 +0100 |
| commit | a28c9c8c9fc42484efe1bf5a77affe842e54e38b (patch) | |
| tree | f0975d07b7c1062416c7c8555c8c9cb1ad1d7ac2 /hw/display/ati.c | |
| parent | debe78ce14bf8f8940c2bdf3ef387505e9e035a9 (diff) | |
| parent | 3fcf15df0073a76d37e2816597771d4c9763e413 (diff) | |
| download | focaccia-qemu-a28c9c8c9fc42484efe1bf5a77affe842e54e38b.tar.gz focaccia-qemu-a28c9c8c9fc42484efe1bf5a77affe842e54e38b.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging
vga: ati-vga bugfix, ramfb cleanups and fixes. # gpg: Signature made Mon 18 May 2020 16:12:11 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-20200518-pull-request: ramfb: fix size calculation ramfb: add sanity checks to ramfb_create_display_surface ramfb: don't update RAMFBState on errors ramfb: drop leftover debug message Revert "hw/display/ramfb: lock guest resolution after it's set" Revert "hw/display/ramfb: initialize fw-config space with xres/ yres" hw/display: Include local 'framebuffer.h' ati-vga: Do not allow unaligned access via index register Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/ati.c')
| -rw-r--r-- | hw/display/ati.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/ati.c b/hw/display/ati.c index 58ec8291d4..065f197678 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -511,7 +511,7 @@ static void ati_mm_write(void *opaque, hwaddr addr, } switch (addr) { case MM_INDEX: - s->regs.mm_index = data; + s->regs.mm_index = data & ~3; break; case MM_DATA ... MM_DATA + 3: /* indexed access to regs or memory */ |