Changeset 33226 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Oct 19, 2010 10:37:24 AM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (3 diffs)
• VBoxVideoHGSMI.cpp (modified) (3 diffs)
• wddm/VBoxVideoVbva.cpp (modified) (1 diff)
• wddm/VBoxVideoVdma.cpp (modified) (1 diff)
• wddm/VBoxVideoWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1381 +1381 @@
 #endif
 
-int VBoxMapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension, void **ppv, ULONG ulOffset, ULONG ulSize)
-{
+int VBoxMapAdapterMemory (PVBOXVIDEO_COMMON pCommon, void **ppv, ULONG ulOffset, ULONG ulSize)
+{
+    PDEVICE_EXTENSION PrimaryExtension = commonToPrimaryExt(pCommon);
     dprintf(("VBoxVideo::VBoxMapAdapterMemory 0x%08X[0x%X]\n", ulOffset, ulSize));
 
@@ -1650 +1651 @@
 
       dprintf(("VBoxVideo::VBoxVideoFindAdapter: calling VideoPortGetAccessRanges\n"));
-
-      /* pPrimary is not yet set */
-      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.commonInfo.IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
-      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.commonInfo.IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
 
       VIDEO_ACCESS_RANGE tmpRanges[4];
@@ -1695 +1692 @@
       dprintf(("VBoxVideo::VBoxVideoFindAdapter: VbglInit returned 0x%x\n", rc));
 
+      /* Preinitialize the primary extension.
+       */
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->pNext                   = NULL;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary                = (PDEVICE_EXTENSION)HwDeviceExtension;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->iDevice                 = 0;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->ulFrameBufferOffset     = 0;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->ulFrameBufferSize       = 0;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.ulVbvaEnabled = 0;
+      ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.cDisplays     = 1;
+      VBoxVideoCmnMemZero(&((PDEVICE_EXTENSION)HwDeviceExtension)->areaDisplay, sizeof(HGSMIAREA));
       /* Guest supports only HGSMI, the old VBVA via VMMDev is not supported. Old
        * code will be ifdef'ed and later removed.
@@ -2202 +2209 @@
         {
             dprintf(("VBoxVideo::VBoxVideoStartIO: IOCTL_VIDEO_INTERPRET_DISPLAY_MEMORY\n"));
-
-            if (pDevExt->pPrimary->u.primary.bVBoxVideoSupported)
-            {
-                /* The display driver must have prepared the monitor information. */
-                VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
-                VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
-            }
-            else
-            {
-                RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
-            }
-            Result = pDevExt->pPrimary->u.primary.bVBoxVideoSupported;
+            /* Pre-HGSMI IOCTL */
+            RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
+            Result = false;
             break;
         }

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -268 +268 @@
            ULONG ulVbvaEnabled;                /* Indicates that VBVA mode is enabled. */
 
-           BOOLEAN bVBoxVideoSupported;        /* TRUE if VBoxVideo extensions, including DualView, are supported by the host. */
-
            int cDisplays;                      /* Number of displays. */
 
@@ -342 +340 @@
     return &pExt->u.primary.commonInfo;
 #endif
+}
+
+static inline PDEVICE_EXTENSION commonToPrimaryExt(PVBOXVIDEO_COMMON pCommon)
+{
+    return RT_FROM_MEMBER(pCommon, DEVICE_EXTENSION, u.primary.commonInfo);
 }
 
@@ -843 +846 @@
    PSTATUS_BLOCK StatusBlock);
 
-int VBoxMapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension,
+int VBoxMapAdapterMemory (PVBOXVIDEO_COMMON pCommon,
                           void **ppv,
                           ULONG ulOffset,

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideoHGSMI.cpp

@@ -728 +728 @@
              PrimaryExtension));
 
-    /* Preinitialize the primary extension.
-     * Note: bVBoxVideoSupported is set to FALSE, because HGSMI is active instead.
-     * Note 2: shouldn't be needed for WDDM.
-     */
-    PrimaryExtension->pNext                              = NULL;
-#ifndef VBOX_WITH_WDDM
-    PrimaryExtension->pPrimary                           = PrimaryExtension;
-    PrimaryExtension->iDevice                            = 0;
-    PrimaryExtension->ulFrameBufferOffset                = 0;
-    PrimaryExtension->ulFrameBufferSize                  = 0;
-#endif
-    PrimaryExtension->u.primary.ulVbvaEnabled            = 0;
-    PrimaryExtension->u.primary.bVBoxVideoSupported      = FALSE;
-#ifndef VBOX_WITH_WDDM
-    PrimaryExtension->u.primary.cDisplays                = 1;
-#endif
-    commonFromDeviceExt(PrimaryExtension)->cbVRAM                   = AdapterMemorySize;
-    commonFromDeviceExt(PrimaryExtension)->cbMiniportHeap           = 0;
-    commonFromDeviceExt(PrimaryExtension)->pvMiniportHeap           = NULL;
-    commonFromDeviceExt(PrimaryExtension)->pvAdapterInformation     = NULL;
-    commonFromDeviceExt(PrimaryExtension)->pHostFlags               = NULL;
-    PrimaryExtension->u.primary.ulMaxFrameBufferSize     = 0;
-    commonFromDeviceExt(PrimaryExtension)->fCaps         = fCaps;
-    commonFromDeviceExt(PrimaryExtension)->bHGSMI        = VBoxHGSMIIsSupported ();
-    VBoxVideoCmnMemZero(&commonFromDeviceExt(PrimaryExtension)->areaHostHeap, sizeof(HGSMIAREA));
-    VBoxVideoCmnMemZero(&PrimaryExtension->areaDisplay, sizeof(HGSMIAREA));
-
-    if (commonFromDeviceExt(PrimaryExtension)->IOPortGuest == 0)
-    {
-        commonFromDeviceExt(PrimaryExtension)->bHGSMI = false;
-    }
-
+    memset(commonFromDeviceExt(PrimaryExtension), 0,
+           sizeof(*commonFromDeviceExt(PrimaryExtension)));
+    commonFromDeviceExt(PrimaryExtension)->cbVRAM = AdapterMemorySize;
+    commonFromDeviceExt(PrimaryExtension)->fCaps  = fCaps;
+    commonFromDeviceExt(PrimaryExtension)->bHGSMI = VBoxHGSMIIsSupported ();
+    /* Why does this use VBoxVideoCmnMemZero?  The MSDN docs say that it should
+     * only be used on mapped display adapter memory.  Done with memset above. */
+    // VBoxVideoCmnMemZero(&commonFromDeviceExt(PrimaryExtension)->areaHostHeap, sizeof(HGSMIAREA));
     if (commonFromDeviceExt(PrimaryExtension)->bHGSMI)
     {
+        /** @note (michael) moved this here as it is done unconditionally in both
+         * driver branches.  Feel free to fix if that is ever changed. */
+        commonFromDeviceExt(PrimaryExtension)->IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
+        commonFromDeviceExt(PrimaryExtension)->IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
+
         /* Map the adapter information. It will be needed for HGSMI IO. */
-        rc = VBoxMapAdapterMemory (PrimaryExtension,
+        rc = VBoxMapAdapterMemory (commonFromDeviceExt(PrimaryExtension),
                                    &commonFromDeviceExt(PrimaryExtension)->pvAdapterInformation,
-                                   commonFromDeviceExt(PrimaryExtension)->cbVRAM - VBVA_ADAPTER_INFORMATION_SIZE,
+                                   AdapterMemorySize - VBVA_ADAPTER_INFORMATION_SIZE,
                                    VBVA_ADAPTER_INFORMATION_SIZE
                                   );
@@ -833 +814 @@
              *       display drivers.
              */
-            rc = VBoxMapAdapterMemory (PrimaryExtension,
+            rc = VBoxMapAdapterMemory (commonFromDeviceExt(PrimaryExtension),
                                        &commonFromDeviceExt(PrimaryExtension)->pvMiniportHeap,
                                        commonFromDeviceExt(PrimaryExtension)->cbVRAM
@@ -1040 +1021 @@
 #endif
 
-        rc = VBoxMapAdapterMemory(PrimaryExtension, (void**)&PrimaryExtension->pvVisibleVram,
+        rc = VBoxMapAdapterMemory(commonFromDeviceExt(PrimaryExtension), (void**)&PrimaryExtension->pvVisibleVram,
                                        0,
                                        vboxWddmVramCpuVisibleSize(PrimaryExtension));

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVbva.cpp

@@ -106 +106 @@
     KeInitializeSpinLock(&pVbva->Lock);
 
-    int rc = VBoxMapAdapterMemory (pDevExt,
+    int rc = VBoxMapAdapterMemory (commonFromDeviceExt(pDevExt),
                                        (void**)&pVbva->pVBVA,
                                        offBuffer,

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -1088 +1088 @@
     PVOID pvBuffer;
 
-    rc = VBoxMapAdapterMemory (pDevExt,
+    rc = VBoxMapAdapterMemory (commonFromDeviceExt(pDevExt),
                                    &pvBuffer,
                                    offBuffer,

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -434 +434 @@
        if (VBoxHGSMIIsSupported ())
        {
-           commonFromDeviceExt(pContext)->IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
-           commonFromDeviceExt(pContext)->IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
-
            PCM_RESOURCE_LIST pRcList = pDeviceInfo->TranslatedResourceList;
            /* @todo: verify resources */