diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-07 20:55:29 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-07 20:55:29 +0000 |
| commit | 799e709b43a8a2ca19db3153d45f0eba934025c2 (patch) | |
| tree | 6de5da063ba287350896a185ac180044522b439c /hw/cirrus_vga.c | |
| parent | 3e00b3f53856d6a70fa0ba5dcd84f3bd7011de82 (diff) | |
| download | qemu-799e709b43a8a2ca19db3153d45f0eba934025c2.zip qemu-799e709b43a8a2ca19db3153d45f0eba934025c2.tar.gz qemu-799e709b43a8a2ca19db3153d45f0eba934025c2.tar.bz2 | |
Revert r6989
There is a much more elegant fix that will follow up after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7025 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 223008e..08fd4c2 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -1392,8 +1392,6 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value) break; } - vga_update_resolution((VGAState *)s); - return CIRRUS_HOOK_HANDLED; } @@ -1421,7 +1419,6 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value) #endif } s->cirrus_hidden_dac_lockindex = 0; - vga_update_resolution((VGAState *)s); } /*************************************** @@ -1708,8 +1705,6 @@ cirrus_hook_write_cr(CirrusVGAState * s, unsigned reg_index, int reg_value) break; } - vga_update_resolution((VGAState *)s); - return CIRRUS_HOOK_HANDLED; } @@ -2835,7 +2830,6 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) if (s->ar_flip_flop == 0) { val &= 0x3f; s->ar_index = val; - vga_update_resolution((VGAState *)s); } else { index = s->ar_index & 0x1f; switch (index) { @@ -2929,7 +2923,6 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) /* can always write bit 4 of CR7 */ if (s->cr_index == 7) s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10); - vga_update_resolution((VGAState *)s); return; } switch (s->cr_index) { @@ -2958,7 +2951,6 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) s->update_retrace_info((VGAState *) s); break; } - vga_update_resolution((VGAState *)s); break; case 0x3ba: case 0x3da: @@ -3165,8 +3157,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) cirrus_update_memory_access(s); /* force refresh */ - vga_update_resolution((VGAState *)s); - s->want_full_update = 1; + s->graphic_mode = -1; cirrus_update_bank_ptr(s, 0); cirrus_update_bank_ptr(s, 1); return 0; |