Patchwork [STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap

login
register
mail settings
Submitter Jan Kiszka
Date Jan. 29, 2010, 2:12 p.m.
Message ID <4B62ECE0.9060306@siemens.com>
Download mbox | patch
Permalink /patch/43915/
State New
Headers show

Comments

Jan Kiszka - Jan. 29, 2010, 2:12 p.m.
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(-)
Anthony Liguori - Jan. 29, 2010, 8:45 p.m.
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);
>   }
>
>
>
>

Patch

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);
 }