diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 16:13:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 16:13:17 +0100 |
| commit | e1391340c77e206644f6ecaeab5df0b7b1a1bf93 (patch) | |
| tree | 395bccc2ef4bbae59ebeb0d96f67e8e8109e84f6 /hw/display/ati_int.h | |
| parent | 4a71d0af7b9c4ab861c9db2111db73771999c81b (diff) | |
| parent | b7105d280cab053465de79ff1766d2f7e1ea7554 (diff) | |
| download | qemu-e1391340c77e206644f6ecaeab5df0b7b1a1bf93.zip qemu-e1391340c77e206644f6ecaeab5df0b7b1a1bf93.tar.gz qemu-e1391340c77e206644f6ecaeab5df0b7b1a1bf93.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190822-pull-request' into staging
vga: a collection of ati fixes/improvements.
# gpg: Signature made Thu 22 Aug 2019 09:04:52 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-20190822-pull-request:
ati-vga: Implement dummy VBlank IRQ
ati-vga: Add limited support for big endian frame buffer aperture
ati-vga: Attempt to handle CRTC offset not exact multiple of stride
ati-vga: Fix hardware cursor image offset
ati-vga: Fix cursor color with guest_hwcursor=true
ati-vga: Fix GPIO_MONID register write
ati-vga: Add some register definitions for debugging
ati-vga: Add registers for getting apertures
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/ati_int.h')
| -rw-r--r-- | hw/display/ati_int.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index 31a1927..2a16708 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -9,6 +9,7 @@ #ifndef ATI_INT_H #define ATI_INT_H +#include "qemu/timer.h" #include "hw/pci/pci.h" #include "hw/i2c/bitbang_i2c.h" #include "vga_int.h" @@ -33,12 +34,15 @@ typedef struct ATIVGARegs { uint32_t mm_index; uint32_t bios_scratch[8]; + uint32_t gen_int_cntl; + uint32_t gen_int_status; uint32_t crtc_gen_cntl; uint32_t crtc_ext_cntl; uint32_t dac_cntl; uint32_t gpio_vga_ddc; uint32_t gpio_dvi_ddc; uint32_t gpio_monid; + uint32_t config_cntl; uint32_t crtc_h_total_disp; uint32_t crtc_h_sync_strt_wid; uint32_t crtc_v_total_disp; @@ -88,6 +92,7 @@ typedef struct ATIVGAState { uint16_t cursor_size; uint32_t cursor_offset; QEMUCursor *cursor; + QEMUTimer vblank_timer; bitbang_i2c_interface bbi2c; MemoryRegion io; MemoryRegion mm; |