Changeset 31873 in vbox for trunk

Timestamp:

Aug 23, 2010 4:26:42 PM (14 years ago)

Author:

vboxsync

Message:

VBoxVideo: When unmapping adapter memory, make sure interrupt handler will not blow up.

Location:

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

Files:

• VBoxVideo.cpp (modified) (3 diffs)
• VBoxVideo.h (modified) (1 diff)
• VBoxVideoHGSMI.cpp (modified) (3 diffs)

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

@@ -1450 +1450 @@
 }
 
+/* Unmapping adapter information must be done carefully WRT the interrupt handler. */
+BOOLEAN VBoxUnmapAdpInfoCallback(PVOID ext)
+{
+    PDEVICE_EXTENSION   PrimaryExtension = (PDEVICE_EXTENSION)ext;
+    void                *ppv;
+
+    ppv = PrimaryExtension->u.primary.pvAdapterInformation;
+    if (ppv)
+    {
+#ifndef VBOXWDDM
+        VideoPortUnmapMemory(PrimaryExtension, ppv, NULL);
+#else
+        NTSTATUS ntStatus = PrimaryExtension->u.primary.DxgkInterface.DxgkCbUnmapMemory(PrimaryExtension->u.primary.DxgkInterface.DeviceHandle,
+                ppv);
+        Assert(ntStatus == STATUS_SUCCESS);
+#endif
+        PrimaryExtension->u.primary.pvAdapterInformation = NULL;
+        PrimaryExtension->u.primary.pHostFlags           = NULL;    /* Mapped through pvAdapterInformation */
+    }
+    return TRUE;
+}
+
+void VBoxUnmapAdapterInformation(PDEVICE_EXTENSION PrimaryExtension)
+{
+    dprintf(("VBoxVideo::VBoxUnmapAdapterInformation\n"));
+
+    VideoPortSynchronizeExecution(PrimaryExtension, VpMediumPriority,
+                                  VBoxUnmapAdpInfoCallback, PrimaryExtension);
+}
+
 void VBoxUnmapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension, void **ppv, ULONG ulSize)
 {
-    dprintf(("VBoxVideo::VBoxMapAdapterMemory\n"));
+    dprintf(("VBoxVideo::VBoxUnmapAdapterMemory\n"));
 
     if (*ppv)
@@ -1751 +1781 @@
         /* Unmap the memory if VBoxVideo is not supported. */
         VBoxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvMiniportHeap, PrimaryExtension->u.primary.cbMiniportHeap);
-        VBoxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvAdapterInformation, VBOX_VIDEO_ADAPTER_INFORMATION_SIZE);
+        VBoxUnmapAdapterInformation (PrimaryExtension);
     }
 
@@ -2844 +2874 @@
 
     VBoxUnmapAdapterMemory (pDevExt, &pDevExt->u.primary.pvMiniportHeap, pDevExt->u.primary.cbMiniportHeap);
-    VBoxUnmapAdapterMemory (pDevExt, &pDevExt->u.primary.pvAdapterInformation, VBVA_ADAPTER_INFORMATION_SIZE);
+    VBoxUnmapAdapterInformation (pDevExt);
 
     return TRUE;

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

@@ -851 +851 @@
 void VBoxUnmapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension,
                              void **ppv, ULONG ulSize);
+void VBoxUnmapAdapterInformation (PDEVICE_EXTENSION PrimaryExtension);
 
 void VBoxComputeFrameBufferSizes (PDEVICE_EXTENSION PrimaryExtension);

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

@@ -741 +741 @@
     PrimaryExtension->u.primary.pvMiniportHeap           = NULL;
     PrimaryExtension->u.primary.pvAdapterInformation     = NULL;
+    PrimaryExtension->u.primary.pHostFlags               = NULL;
     PrimaryExtension->u.primary.ulMaxFrameBufferSize     = 0;
     PrimaryExtension->u.primary.bHGSMI                   = VBoxHGSMIIsSupported (PrimaryExtension);
@@ -1039 +1040 @@
         /* Unmap the memory if VBoxVideo is not supported. */
         VBoxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvMiniportHeap, PrimaryExtension->u.primary.cbMiniportHeap);
-        VBoxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvAdapterInformation, VBVA_ADAPTER_INFORMATION_SIZE);
+        VBoxUnmapAdapterInformation (PrimaryExtension);
 
         HGSMIHeapDestroy (&PrimaryExtension->u.primary.hgsmiAdapterHeap);
@@ -1093 +1094 @@
 
                 /* Map the adapter information. It will be needed for HGSMI IO. */
-                /*rc = */VBoxUnmapAdapterMemory(PrimaryExtension, &PrimaryExtension->u.primary.pvAdapterInformation, VBVA_ADAPTER_INFORMATION_SIZE);
+                /*rc = */VBoxUnmapAdapterInformation(PrimaryExtension);
 /*
                 AssertRC(rc);