* [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap
@ 2010-01-29 14:12 Jan Kiszka
2010-01-29 20:45 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2010-01-29 14:12 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Glauber Costa, rene, qemu-devel, Alexander Graf
This fixes CONFIG_FB_CIRRUS for Linux guests and probably much more:
When switching away from linearly mapped vram, we also have to restore
the I/O handlers for the LFB.
This regression was once introduced by commit 2bec46dc97.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
hw/cirrus_vga.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 6fe433d..9f61a01 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2585,9 +2585,11 @@ static void map_linear_vram(CirrusVGAState *s)
static void unmap_linear_vram(CirrusVGAState *s)
{
- if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end)
+ if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end) {
s->vga.map_addr = s->vga.map_end = 0;
-
+ cpu_register_physical_memory(s->vga.lfb_addr, s->vga.vram_size,
+ s->cirrus_linear_io_addr);
+ }
cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
s->vga.vga_io_memory);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap
2010-01-29 14:12 [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap Jan Kiszka
@ 2010-01-29 20:45 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2010-01-29 20:45 UTC (permalink / raw)
To: Jan Kiszka
Cc: Alexander Graf, Anthony Liguori, rene, Glauber Costa, qemu-devel
On 01/29/2010 08:12 AM, Jan Kiszka wrote:
> This fixes CONFIG_FB_CIRRUS for Linux guests and probably much more:
>
> When switching away from linearly mapped vram, we also have to restore
> the I/O handlers for the LFB.
>
> This regression was once introduced by commit 2bec46dc97.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
> ---
> hw/cirrus_vga.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
> index 6fe433d..9f61a01 100644
> --- a/hw/cirrus_vga.c
> +++ b/hw/cirrus_vga.c
> @@ -2585,9 +2585,11 @@ static void map_linear_vram(CirrusVGAState *s)
>
> static void unmap_linear_vram(CirrusVGAState *s)
> {
> - if (s->vga.map_addr&& s->vga.lfb_addr&& s->vga.lfb_end)
> + if (s->vga.map_addr&& s->vga.lfb_addr&& s->vga.lfb_end) {
> s->vga.map_addr = s->vga.map_end = 0;
> -
> + cpu_register_physical_memory(s->vga.lfb_addr, s->vga.vram_size,
> + s->cirrus_linear_io_addr);
> + }
> cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
> s->vga.vga_io_memory);
> }
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-29 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-29 14:12 [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap Jan Kiszka
2010-01-29 20:45 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).