Changeset 14827 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 30, 2008 7:56:35 AM (16 years ago)

Author:

vboxsync

Message:

DevVGA: Map into ring-0 on darwin and do the same thing as we do in RC.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (12 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1149 +1149 @@
     }
 
-#ifdef IN_RC
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
     if (addr >= VGA_MAPPING_SIZE)
         return VINF_IOM_HC_MMIO_WRITE;
@@ -1184 +1184 @@
 #ifndef VBOX
         s->latch = ((uint32_t *)s->vram_ptr)[addr];
-#else /* VBOX && IN_RC */
+#else /* VBOX */
         s->latch = ((uint32_t *)s->CTX_SUFF(vram_ptr))[addr];
-#endif /* VBOX && IN_RC */
+#endif /* VBOX */
 
         if (!(s->gr[5] & 0x08)) {
@@ -1286 +1286 @@
             s->vram_ptr[addr] = val;
 #else /* VBOX */
-# ifdef IN_RC
+# if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
             if (addr >= VGA_MAPPING_SIZE)
                 return VINF_IOM_HC_MMIO_WRITE;
@@ -1337 +1337 @@
             s->vram_ptr[addr] = val;
 #else /* VBOX */
-#ifdef IN_RC
+# if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
             if (addr >= VGA_MAPPING_SIZE)
                 return VINF_IOM_HC_MMIO_WRITE;
-#else
+# else
             if (addr >= s->vram_size)
             {
@@ -1347 +1347 @@
                 return VINF_SUCCESS;
             }
-#endif
+# endif
             s->CTX_SUFF(vram_ptr)[addr] = val;
 #endif /* VBOX */
@@ -1361 +1361 @@
         }
     } else {
-#ifdef IN_RC
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
         if (addr * 4 >= VGA_MAPPING_SIZE)
             return VINF_IOM_HC_MMIO_WRITE;
@@ -3320 +3320 @@
     if (pThis->sr[4] & 0x08) {
         /* chain 4 mode : simplest access */
-#ifdef IN_RC
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
         if (GCPhysAddr + cItems * cbItem >= VGA_MAPPING_SIZE)
             return VINF_IOM_HC_MMIO_WRITE;
@@ -3343 +3343 @@
     } else if (pThis->gr[5] & 0x10) {
         /* odd/even mode (aka text mode mapping) */
-#ifdef IN_RC
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
         if (GCPhysAddr * 2 + cItems * cbItem >= VGA_MAPPING_SIZE)
             return VINF_IOM_HC_MMIO_WRITE;
@@ -3365 +3365 @@
             }
     } else {
-#ifdef IN_RC
+#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
         if (GCPhysAddr + cItems * cbItem >= VGA_MAPPING_SIZE)
             return VINF_IOM_HC_MMIO_WRITE;
@@ -4300 +4300 @@
 
 /**
- * Info handler, device version. Dumps VGA memory formatted as 
+ * Info handler, device version. Dumps VGA memory formatted as
  * ASCII text, no attributes. Only looks at the first page.
  *
@@ -5365 +5365 @@
 
     /*
-     * Allocate the VRAM and map the first 256KB of it into GC so we can speed up VGA support.
+     * Allocate the VRAM and map the first 512KB of it into GC so we can speed up VGA support.
      */
     rc = PDMDevHlpMMIO2Register(pDevIns, 0 /* iRegion */, pThis->vram_size, 0, (void **)&pThis->vram_ptrR3, "VRam");
@@ -5371 +5371 @@
     pThis->vram_ptrR0 = (RTR0PTR)pThis->vram_ptrR3; /** @todo #1865 Map parts into R0 or just use PGM access (Mac only). */
 
-    RTRCPTR pRCMapping = 0;
-    rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 0 /* iRegion */, 0 /* off */,  VGA_MAPPING_SIZE, "VGA VRam", &pRCMapping);
-    AssertLogRelMsgRCReturn(rc, ("PDMDevHlpMMHyperMapMMIO2(%#x,) -> %Rrc\n", pThis->vram_size, rc), rc);
-    pThis->vram_ptrRC = pRCMapping;
+    if (pThis->fGCEnabled)
+    {
+        RTRCPTR pRCMapping = 0;
+        rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 0 /* iRegion */, 0 /* off */,  VGA_MAPPING_SIZE, "VGA VRam", &pRCMapping);
+        AssertLogRelMsgRCReturn(rc, ("PDMDevHlpMMHyperMapMMIO2(%#x,) -> %Rrc\n", VGA_MAPPING_SIZE, rc), rc);
+        pThis->vram_ptrRC = pRCMapping;
+    }
+
+#if defined(VBOX_WITH_2X_4GB_ADDR_SPACE)
+    if (pThis->fR0Enabled)
+    {
+        RTR0PTR pR0Mapping = 0;
+        rc = PDMDevHlpMMIO2MapKernel(pDevIns, 0 /* iRegion */, 0 /* off */,  VGA_MAPPING_SIZE, "VGA VRam", &pR0Mapping);
+        AssertLogRelMsgRCReturn(rc, ("PDMDevHlpMapMMIO2IntoR0(%#x,) -> %Rrc\n", VGA_MAPPING_SIZE, rc), rc);
+        pThis->vram_ptrR0 = pR0Mapping;
+    }
+#endif
 
     /*

trunk/src/VBox/Devices/Makefile.kmk

@@ -239 +239 @@
 DevicesR3_TEMPLATE      = VBOXR3
 DevicesR3_SDKS.win      = WINPSDK W2K3DDK
+DevicesR3_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
 DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
                           $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
@@ -367 +368 @@
 #
 VBoxDDGC_TEMPLATE       = VBOXGC
+VBoxDDGC_SYSSUFF        = .gc
+VBoxDDGC_DEFS.darwin    = VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxDDGC_DEFS           =
-VBoxDDGC_SYSSUFF        = .gc
 VBoxDDGC_INCS          := \
         $(PATH_SUB_CURRENT)
@@ -438 +440 @@
 VBoxDDR0_TEMPLATE       = VBOXR0
 VBoxDDR0_SYSSUFF        = .r0
+VBoxDDR0_DEFS.darwin    = VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_2X_4GB_ADDR_SPACE
 VBoxDDR0_DEFS           = IN_RT_R0
 VBoxDDR0_INCS          := \