Changeset 55493 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Apr 28, 2015 4:51:35 PM (10 years ago)

Author:

vboxsync

Message:

PGM,++: Separated physical access handler callback function pointers from the access handler registrations to reduce footprint and simplify adding a couple of more callbacks.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (5 diffs)
• DevVGA.cpp (modified) (3 diffs)
• DevVGA.h (modified) (2 diffs)
• DevVGA_VDMA.cpp (modified) (1 diff)

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

@@ -1936 +1936 @@
     for (uint32_t i = 0; i < pGMR->numDescriptors; i++)
     {
-        rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pThis->pDevInsR3),
-                                            PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                            pGMR->paDesc[i].GCPhys, pGMR->paDesc[i].GCPhys + pGMR->paDesc[i].numPages * PAGE_SIZE - 1,
-                                            vmsvgaR3GMRAccessHandler, pThis,
-                                            NULL, NULL, NULL,
-                                            NULL, NULL, NULL,
-                                            "VMSVGA GMR");
+        rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pThis->pDevInsR3),
+                                        pGMR->paDesc[i].GCPhys, pGMR->paDesc[i].GCPhys + pGMR->paDesc[i].numPages * PAGE_SIZE - 1,
+                                        pThis->svga.hGmrAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, "VMSVGA GMR");
         AssertRC(rc);
     }
@@ -1949 +1945 @@
 
 /* Callback handler for VMR3ReqCallWait */
-static DECLCALLBACK(int) vmsvgaUnregisterGMR(PPDMDEVINS pDevIns, uint32_t gmrId)
+static DECLCALLBACK(int) vmsvgaDeregisterGMR(PPDMDEVINS pDevIns, uint32_t gmrId)
 {
     PVGASTATE    pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
@@ -3245 +3241 @@
         PGMR pGMR = &pSVGAState->aGMR[idGMR];
 # ifdef DEBUG_GMR_ACCESS
-        VMR3ReqCallWait(PDMDevHlpGetVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaUnregisterGMR, 2, pThis->pDevInsR3, idGMR);
+        VMR3ReqCallWait(PDMDevHlpGetVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaDeregisterGMR, 2, pThis->pDevInsR3, idGMR);
 # endif
 
@@ -3523 +3519 @@
             if (RT_SUCCESS(rc))
             {
-                rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
-                                                  PGMPHYSHANDLERTYPE_PHYSICAL_ALL,
-                                                  GCPhysAddress, GCPhysAddress + (VMSVGA_FIFO_SIZE - 1),
-                                                  vmsvgaR3FIFOAccessHandler, pThis,
-                                                  NULL, NULL, NULL,
-                                                  NULL, NULL, NULL,
-                                                  "VMSVGA FIFO");
+                rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (VMSVGA_FIFO_SIZE - 1),
+                                                pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, 
+                                                "VMSVGA FIFO");
                 AssertRC(rc);
             }
@@ -3930 +3922 @@
     }
     Log(("VMSVGA: Maximum size (%d,%d)\n", pThis->svga.u32MaxWidth, pThis->svga.u32MaxHeight));
+
+# ifdef DEBUG_GMR_ACCESS
+    /* Register the GMR access handler type. */
+    rc = PGMR3HandlerPhysicalTypeRegister(PDMDevHlpGetVM(pThis->pDevInsR3), PGMPHYSHANDLERKIND_WRITE,
+                                          vmsvgaR3GMRAccessHandler, NULL, NULL, NULL, NULL, "VMSVGA GMR",
+                                          &pThis->svga.hGmrAccessHandlerType);
+    AssertRCReturn(rc, rc);
+# endif
+# ifdef DEBUG_FIFO_ACCESS
+    rc = PGMR3HandlerPhysicalTypeRegister(PDMDevHlpGetVM(pThis->pDevInsR3), PGMPHYSHANDLERKIND_ALL,
+                                          vmsvgaR3FIFOAccessHandler, NULL, NULL, NULL, NULL, "VMSVGA FIFO",
+                                          &pThis->svga.hFifoAccessHandlerType);
+    AssertRCReturn(rc, rc);
+#endif
 
     /* Create the async IO thread. */

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

@@ -5286 +5286 @@
 {
     PPDMDEVINS pDevIns = pVGAState->pDevInsR3;
-
     Assert(pVGAState->GCPhysVRAM);
 
-    int rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
-                                          PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                          pVGAState->GCPhysVRAM, pVGAState->GCPhysVRAM + (cbFrameBuffer - 1),
-                                          vgaR3LFBAccessHandler, pVGAState,
-                                          g_DeviceVga.szR0Mod, "vgaR0LFBAccessHandler", pDevIns->pvInstanceDataR0,
-                                          g_DeviceVga.szRCMod, "vgaGCLFBAccessHandler", pDevIns->pvInstanceDataRC,
-                                          "VGA LFB");
+    int rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
+                                        pVGAState->GCPhysVRAM, pVGAState->GCPhysVRAM + (cbFrameBuffer - 1),
+                                        pVGAState->hLfbAccessHandlerType, pVGAState, pDevIns->pvInstanceDataR0,
+                                        pDevIns->pvInstanceDataRC, "VGA LFB");
+
     AssertRC(rc);
     return rc;
@@ -5348 +5345 @@
         if (RT_SUCCESS(rc))
         {
-            rc = PGMR3HandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
-                                              PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                              GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
-                                              vgaR3LFBAccessHandler, pThis,
-                                              g_DeviceVga.szR0Mod, "vgaR0LFBAccessHandler", pDevIns->pvInstanceDataR0,
-                                              g_DeviceVga.szRCMod, "vgaRCLFBAccessHandler", pDevIns->pvInstanceDataRC,
-                                              "VGA LFB");
+            rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
+                                            pThis->hLfbAccessHandlerType, pThis, pDevIns->pvInstanceDataR0,
+                                            pDevIns->pvInstanceDataRC, "VGA LFB");
             AssertRC(rc);
             if (RT_SUCCESS(rc))
@@ -6152 +6145 @@
 
     /*
+     * Register access handler types.
+     */
+    rc = PGMR3HandlerPhysicalTypeRegister(pVM, PGMPHYSHANDLERKIND_WRITE,
+                                          vgaR3LFBAccessHandler,
+                                          g_DeviceVga.szR0Mod, "vgaR0LFBAccessHandler",
+                                          g_DeviceVga.szRCMod, "vgaRCLFBAccessHandler",
+                                          "VGA LFB", &pThis->hLfbAccessHandlerType);
+    AssertRCReturn(rc, rc);
+
+
+    /*
      * Register I/O ports.
      */

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

@@ -315 +315 @@
     uint8_t                     u8FIFOExtCommand;
     bool                        Padding6;
+# if defined(DEBUG_GMR_ACCESS) || defined(DEBUG_FIFO_ACCESS)
+    /** GMR debug access handler type handle. */
+    PGMPHYSHANDLERTYPE          hGmrAccessHandlerType;
+    /** FIFO debug access handler type handle. */
+    PGMPHYSHANDLERTYPE          hFifoAccessHandlerType;
+# endif
 } VMSVGAState;
 #endif /* VBOX_WITH_VMSVGA */
@@ -453 +459 @@
     /* Whether the SVGA emulation is enabled or not. */
     bool                        fVMSVGAEnabled;
-    bool                        Padding1[1];
+    bool                        Padding1[1+4];
 #else
-    bool                        Padding1[2];
+    bool                        Padding1[2+4];
 #endif
+
+    /** Physical access type for the linear frame buffer dirty page tracking. */
+    PGMPHYSHANDLERTYPE          hLfbAccessHandlerType;
 
     /** The physical address the VRAM was assigned. */

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

@@ -17 +17 @@
 #include <VBox/VMMDev.h>
 #include <VBox/vmm/pdmdev.h>
+#include <VBox/vmm/pgm.h>
 #include <VBox/VBoxVideo.h>
 #include <iprt/semaphore.h>