qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zachary Amsden <zamsden@redhat.com>
To: qemu-devel@nongnu.org
Cc: zamsden@redhat.com
Subject: [Qemu-devel] [PATCH 10/14] Stash VGA physical address and use it in KVM callbacks. Stash VGA physical pointer in cirrus vga as well.
Date: Thu, 30 Jul 2009 00:15:08 -1000	[thread overview]
Message-ID: <1248948912-7877-11-git-send-email-zamsden@redhat.com> (raw)
In-Reply-To: <1248948912-7877-10-git-send-email-zamsden@redhat.com>

Signed-off-by: Zachary Amsden <zamsden@redhat.com>
---
 hw/cirrus_vga.c |   18 ++++++++----------
 hw/vga.c        |    9 +++++----
 hw/vga_int.h    |    1 +
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 2287e94..60c67fe 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1219,7 +1219,7 @@ static void cirrus_update_bank_ptr(CirrusVGAState * s, unsigned bank_index)
         /* Thinking about changing bank base? First, drop the dirty bitmap information
          * on the current location, otherwise we lose this pointer forever */
         if (s->vga.lfb_vram_mapped) {
-            target_phys_addr_t base_addr = isa_mem_base + 0xa0000 + bank_index * 0x8000;
+            target_phys_addr_t base_addr = s->vga.vram_phys + bank_index * 0x8000;
             cpu_physical_sync_dirty_bitmap(base_addr, 0x8000);
         }
 	s->cirrus_bank_base[bank_index] = offset;
@@ -2603,16 +2603,15 @@ static void map_linear_vram(CirrusVGAState *s)
         && !((s->vga.gr[0x0B] & 0x14) == 0x14)
         && !(s->vga.gr[0x0B] & 0x02)) {
 
-        cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000,
+        cpu_register_physical_memory(s->vga.vram_phys, 0x8000,
                                     (s->vga.vram_offset + s->cirrus_bank_base[0]) | IO_MEM_RAM);
-        cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000,
+        cpu_register_physical_memory(s->vga.vram_phys + 0x8000, 0x8000,
                                     (s->vga.vram_offset + s->cirrus_bank_base[1]) | IO_MEM_RAM);
 
         s->vga.lfb_vram_mapped = 1;
     }
     else {
-        cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
-                                     s->vga.vga_io_memory);
+        cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory);
     }
 
     vga_dirty_log_start(&s->vga);
@@ -2623,8 +2622,7 @@ static void unmap_linear_vram(CirrusVGAState *s)
     if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end)
         s->vga.map_addr = s->vga.map_size = 0;
 
-    cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
-                                 s->vga.vga_io_memory);
+    cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory);
 }
 
 /* Compute the memory access functions */
@@ -3197,11 +3195,11 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
     register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s);
     register_ioport_read(0x3da, 1, 1, vga_ioport_read, s);
 
+    s->vga.vram_phys = isa_mem_base + 0xa0000;
     s->vga.vga_io_memory = cpu_register_io_memory(cirrus_vga_mem_read,
                                                   cirrus_vga_mem_write, s);
-    cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000,
-                                 s->vga.vga_io_memory);
-    qemu_register_coalesced_mmio(isa_mem_base + 0x000a0000, 0x20000);
+    cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory);
+    qemu_register_coalesced_mmio(s->vga.vram_phys, 0x20000);
 
     /* I/O handler for LFB */
     s->cirrus_linear_io_addr =
diff --git a/hw/vga.c b/hw/vga.c
index 907cdb7..0941962 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1574,8 +1574,8 @@ static void vga_sync_dirty_bitmap(VGAState *s)
         cpu_physical_sync_dirty_bitmap(s->map_addr, s->map_size);
 
     if (s->lfb_vram_mapped) {
-        cpu_physical_sync_dirty_bitmap(isa_mem_base + 0xa0000, 0x8000);
-        cpu_physical_sync_dirty_bitmap(isa_mem_base + 0xa8000, 0x8000);
+        cpu_physical_sync_dirty_bitmap(s->vram_phys, 0x8000);
+        cpu_physical_sync_dirty_bitmap(s->vram_phys + 0x8000, 0x8000);
     }
 }
 
@@ -2230,8 +2230,8 @@ void vga_dirty_log_start(VGAState *s)
         kvm_log_start(s->map_addr, s->map_size);
 
     if (kvm_enabled() && s->lfb_vram_mapped) {
-        kvm_log_start(isa_mem_base + 0xa0000, 0x8000);
-        kvm_log_start(isa_mem_base + 0xa8000, 0x8000);
+        kvm_log_start(s->vram_phys, 0x8000);
+        kvm_log_start(s->vram_phys + 0x8000, 0x8000);
     }
 }
 
@@ -2409,6 +2409,7 @@ void vga_init(VGAState *s, target_phys_addr_t vram_base,
 
     s->bank_offset = 0;
     s->it_shift = it_shift;
+    s->vram_phys = vram_base;
 
     /* Pass ctrl_base to setup memory mapped I/O control */
     if (ctrl_base) {
diff --git a/hw/vga_int.h b/hw/vga_int.h
index f072663..bab04c6 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -102,6 +102,7 @@ typedef struct VGACommonState {
     uint8_t *vram_ptr;
     ram_addr_t vram_offset;
     unsigned int vram_size;
+    target_phys_addr_t vram_phys;
     uint32_t lfb_addr;
     uint32_t lfb_end;
     uint32_t map_addr;
-- 
1.6.2.5

  reply	other threads:[~2009-07-30 10:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-30 10:14 [Qemu-devel] Various VGA / VNC fixes and cleanups to prep for multiheaded graphics Zachary Amsden
2009-07-30 10:14 ` [Qemu-devel] [PATCH 01/14] Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them Zachary Amsden
2009-07-30 10:15   ` [Qemu-devel] [PATCH 02/14] Don't segfault when changing VNC password on an SDL display Zachary Amsden
2009-07-30 10:15     ` [Qemu-devel] [PATCH 03/14] When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well Zachary Amsden
2009-07-30 10:15       ` [Qemu-devel] [PATCH 04/14] Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added Zachary Amsden
2009-07-30 10:15         ` [Qemu-devel] [PATCH 05/14] Change cpu_phys mem callback to use [offset, size) bounds instead of [start, end) Zachary Amsden
2009-07-30 10:15           ` [Qemu-devel] [PATCH 06/14] Split VGA ioport init into a helper function Zachary Amsden
2009-07-30 10:15             ` [Qemu-devel] [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init Zachary Amsden
2009-07-30 10:15               ` [Qemu-devel] [PATCH 08/14] Make VGA vram offset passed into vga_mm_init absolute. Since this is a function of the platform, it makes sense to have it be explicitly known in the platform layer rather than hardcoded inside the vga code Zachary Amsden
2009-07-30 10:15                 ` [Qemu-devel] [PATCH 09/14] Further transformation: use common vga_init() which allows either I/O port or memory mapped based control Zachary Amsden
2009-07-30 10:15                   ` Zachary Amsden [this message]
2009-07-30 10:15                     ` [Qemu-devel] [PATCH 11/14] Add some defined constants for VGA offsets Zachary Amsden
2009-07-30 10:15                       ` [Qemu-devel] [PATCH 12/14] Add a PCI BAR for the VGA ROM which is mapped into cirrus_vga. This makes the cirrus device complete under some X servers which require the V_BIOS mapping Zachary Amsden
2009-07-30 10:15                         ` [Qemu-devel] [PATCH 13/14] Allow cirrus VGA to be initialized multiple times; only the first init takes the ISA memory region and hardware I/O ports Zachary Amsden
2009-07-30 10:15                           ` [Qemu-devel] [PATCH 14/14] Atrocious and horrendous patch to demonstrate multiple SDL displays. The multiple SDL displays can be seen on one console, using ctrl-alt-1/2 to switch between them Zachary Amsden
2009-07-30 11:03               ` [Qemu-devel] Re: [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init Jan Kiszka
2009-07-30 11:03           ` [Qemu-devel] Re: [PATCH 05/14] Change cpu_phys mem callback to use [offset, size) bounds instead of [start, end) Jan Kiszka
2009-08-10 19:42           ` [Qemu-devel] " Anthony Liguori
2009-07-30 10:34 ` [Qemu-devel] Various VGA / VNC fixes and cleanups to prep for multiheaded graphics Daniel P. Berrange
2009-07-30 10:35   ` Zachary Amsden
2009-07-30 11:33     ` Paul Brook

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1248948912-7877-11-git-send-email-zamsden@redhat.com \
    --to=zamsden@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).