Changeset 4053 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

Timestamp:

Aug 7, 2007 8:40:02 AM (17 years ago)

Author:

vboxsync

Message:

Use the generic VBoxVideo interface in Windows guest video driver.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp (modified) (11 diffs)

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

@@ -740 +740 @@
         
         dprintf(("VBoxVideo::vboxComputeFrameBufferSizes: [%d] ulFrameBufferOffset 0x%08X\n",
-                 ulFrameBufferOffset));
+                 Extension->iDevice, ulFrameBufferOffset));
         
         ulFrameBufferOffset += PrimaryExtension->u.primary.ulMaxFrameBufferSize
@@ -749 +749 @@
 }
 
-static int vboxMapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension)
-{
-    dprintf(("VBoxVideo::vboxMapAdapterMemory\n"));
+static int vboxMapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension, void **ppv, ULONG ulOffset, ULONG ulSize)
+{
+    dprintf(("VBoxVideo::vboxMapAdapterMemory 0x%08X[0x%X]\n", ulOffset, ulSize));
 
     PHYSICAL_ADDRESS FrameBuffer;
-    FrameBuffer.QuadPart = VBE_DISPI_LFB_PHYSICAL_ADDRESS
-                           + PrimaryExtension->u.primary.cbVRAM
-                           - PrimaryExtension->u.primary.cbMiniportHeap
-                           - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE;
+    FrameBuffer.QuadPart = VBE_DISPI_LFB_PHYSICAL_ADDRESS + ulOffset;
 
     PVOID VideoRamBase = NULL;
     ULONG inIoSpace = 0;
-    ULONG VideoRamLength = PrimaryExtension->u.primary.cbMiniportHeap
-                           + VBOX_VIDEO_ADAPTER_INFORMATION_SIZE;
+    ULONG VideoRamLength = ulSize;
 
     VP_STATUS Status = VideoPortMapMemory (PrimaryExtension, FrameBuffer,
@@ -770 +766 @@
     if (Status == NO_ERROR)
     {
-        PrimaryExtension->u.primary.pvMiniportHeap       = VideoRamBase;
-        PrimaryExtension->u.primary.pvAdapterInformation = (uint8_t *)VideoRamBase
-                                                           + PrimaryExtension->u.primary.cbMiniportHeap;
+        *ppv = VideoRamBase;
     }
     
@@ -780 +774 @@
 }
 
-static void vboxUnmapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension)
+static void vboxUnmapAdapterMemory (PDEVICE_EXTENSION PrimaryExtension, void **ppv)
 {
     dprintf(("VBoxVideo::vboxMapAdapterMemory\n"));
     
-    if (PrimaryExtension->u.primary.pvMiniportHeap)
-    {
-        VideoPortUnmapMemory(PrimaryExtension, PrimaryExtension->u.primary.pvMiniportHeap, NULL);
-    }
-    
-    PrimaryExtension->u.primary.pvMiniportHeap       = NULL;
-    PrimaryExtension->u.primary.pvAdapterInformation = NULL;
+    if (*ppv)
+    {
+        VideoPortUnmapMemory(PrimaryExtension, *ppv, NULL);
+    }
+    
+    *ppv = NULL;
+}
+
+static void vboxQueryConf (PDEVICE_EXTENSION PrimaryExtension, uint32_t u32Index, ULONG *pulValue)
+{
+    dprintf(("VBoxVideo::vboxQueryConf: u32Index = %d\n", u32Index));
+    
+    typedef struct _VBOXVIDEOQCONF32
+    {
+        VBOXVIDEOINFOHDR hdrQuery;
+        VBOXVIDEOINFOQUERYCONF32 query;
+        VBOXVIDEOINFOHDR hdrEnd;
+    } VBOXVIDEOQCONF32;
+
+    VBOXVIDEOQCONF32 *p = (VBOXVIDEOQCONF32 *)PrimaryExtension->u.primary.pvAdapterInformation;
+
+    p->hdrQuery.u8Type     = VBOX_VIDEO_INFO_TYPE_QUERY_CONF32;
+    p->hdrQuery.u8Reserved = 0;
+    p->hdrQuery.u16Length  = sizeof (VBOXVIDEOINFOQUERYCONF32);
+    
+    p->query.u32Index = u32Index;
+    p->query.u32Value = 0;
+    
+    p->hdrEnd.u8Type     = VBOX_VIDEO_INFO_TYPE_END;
+    p->hdrEnd.u8Reserved = 0;
+    p->hdrEnd.u16Length  = 0;
+    
+    /* Inform the host about the display configuration. */
+    VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
+    VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_ADAPTER_MEMORY);
+    
+    *pulValue = (ULONG)p->query.u32Value;
+    
+    dprintf(("VBoxVideo::vboxQueryConf: u32Value = %d\n", p->query.u32Value));
 }
 
@@ -883 +909 @@
     PrimaryExtension->u.primary.ulDisplayInformationSize = 0;
 
-    
     /* Verify whether the HW supports VirtualBox extensions. */
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID);
@@ -896 +921 @@
              PrimaryExtension->u.primary.bVBoxVideoSupported));
     
+    if (PrimaryExtension->u.primary.bVBoxVideoSupported)
+    {
+        /* Map the adapter information. It will be needed to query some configuration values. */
+        rc = vboxMapAdapterMemory (PrimaryExtension,
+                                   &PrimaryExtension->u.primary.pvAdapterInformation,
+                                   PrimaryExtension->u.primary.cbVRAM - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE,
+                                   VBOX_VIDEO_ADAPTER_INFORMATION_SIZE
+                                  );
+        if (rc != NO_ERROR)
+        {
+            dprintf(("VBoxVideo::VBoxSetupDisplays: vboxMapAdapterMemory pvAdapterInfoirrmation failed rc = %d\n",
+                     rc));
+    
+            PrimaryExtension->u.primary.bVBoxVideoSupported = FALSE;
+        }
+    }
+    
     /* Setup the non-volatile heap and the adapter memory. */
     if (PrimaryExtension->u.primary.bVBoxVideoSupported)
     {
         /* Query the size of the non-volatile heap. */
-        VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
-        VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_QUERY_OFFSCREEN_HEAP_SIZE);
-        
-        ULONG cbMiniportHeap = VideoPortReadPortUlong((PULONG)VBE_DISPI_IOPORT_DATA);
+        ULONG cbMiniportHeap = 0;
+        vboxQueryConf (PrimaryExtension, VBOX_VIDEO_QCI32_OFFSCREEN_HEAP_SIZE, &cbMiniportHeap);
         
         /* Do not allow too big heap. 50% of VRAM should be enough. */
@@ -927 +967 @@
          * 
          */
-        rc = vboxMapAdapterMemory (PrimaryExtension);
+        rc = vboxMapAdapterMemory (PrimaryExtension,
+                                   &PrimaryExtension->u.primary.pvMiniportHeap,
+                                   PrimaryExtension->u.primary.cbVRAM
+                                   - VBOX_VIDEO_ADAPTER_INFORMATION_SIZE
+                                   - PrimaryExtension->u.primary.cbMiniportHeap,
+                                   PrimaryExtension->u.primary.cbMiniportHeap
+                                  );
         
         if (rc != NO_ERROR)
@@ -954 +1000 @@
         {
             /* Query the configured number of displays. */
-            VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
-            int cDisplays = VideoPortReadPortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA);
-            
+            ULONG cDisplays = 0;
+            vboxQueryConf (PrimaryExtension, VBOX_VIDEO_QCI32_MONITOR_COUNT, &cDisplays);
+        
             dprintf(("VBoxVideo::VBoxSetupDisplays: cDisplays = %d\n",
                      cDisplays));
@@ -968 +1014 @@
             PDEVICE_EXTENSION pPrev = PrimaryExtension;
             
-            int iDisplay;
+            ULONG iDisplay;
             for (iDisplay = 1; iDisplay < cDisplays; iDisplay++)
             {
@@ -1011 +1057 @@
         /* Setup the information for the host. */
         vboxSetupAdapterInfo (PrimaryExtension);
+    }
+    else
+    {
+        /* Unmap the memory if VBoxVideo is not supported. */
+        vboxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvMiniportHeap);
+        vboxUnmapAdapterMemory (PrimaryExtension, &PrimaryExtension->u.primary.pvAdapterInformation);
     }
     
@@ -1667 +1719 @@
     VbglTerminate ();
     
-    vboxUnmapAdapterMemory (pDevExt);
+    vboxUnmapAdapterMemory (pDevExt, &pDevExt->u.primary.pvMiniportHeap);
+    vboxUnmapAdapterMemory (pDevExt, &pDevExt->u.primary.pvAdapterInformation);
 
     return TRUE;