Changeset 4061 in vbox for trunk

Timestamp:

Aug 7, 2007 12:59:44 PM (17 years ago)

Author:

vboxsync

Message:

Reserve VBVA memory buffer in the guest VRAM (Windows guest).

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/dd.c (modified) (3 diffs)
• Display/driver.h (modified) (3 diffs)
• Display/screen.c (modified) (3 diffs)
• Miniport/VBoxVideo.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -78 +78 @@
         memset(&pHalInfo->ddCaps, 0, sizeof(DDNTCORECAPS));
         pHalInfo->ddCaps.dwSize         = sizeof(DDNTCORECAPS);
-        pHalInfo->ddCaps.dwVidMemTotal  = pDev->cScreenSize - pDev->cFrameBufferSize;
+        pHalInfo->ddCaps.dwVidMemTotal  = pDev->layout.cbDDRAWHeap;
         pHalInfo->ddCaps.dwVidMemFree   = pHalInfo->ddCaps.dwVidMemTotal;
 
@@ -124 +124 @@
 
     /* Do we have sufficient videomemory to create an off-screen heap for DDraw? */
-    if (pDev->cScreenSize > pDev->cFrameBufferSize)
+    if (pDev->layout.cbDDRAWHeap > 0)
     {
         bDefineDDrawHeap = TRUE;
@@ -152 +152 @@
         {
             pVm->dwFlags        = VIDMEM_ISLINEAR ;
-            pVm->fpStart        = pDev->cFrameBufferSize;
-            pVm->fpEnd          = pDev->cScreenSize;
+            pVm->fpStart        = pDev->layout.offDDRAWHeap;
+            pVm->fpEnd          = pDev->layout.offDDRAWHeap + pDev->layout.cbDDRAWHeap;
 
             pVm->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -50 +50 @@
     BYTE *pBuffer; /* Buffer where screen bits are saved. */
 } SSB;
+
+/* VRAM
+ *  |           |           |          |           |
+ * 0+framebuffer+VBVA buffer+ddraw heap+displayinfo=cScreenSize
+ */
+typedef struct _VRAMLAYOUT
+{
+    ULONG cbVRAM;
+    
+    ULONG offFrameBuffer;
+    ULONG cbFrameBuffer;
+    
+    ULONG offVBVABuffer;
+    ULONG cbVBVABuffer;
+    
+    ULONG offDDRAWHeap;
+    ULONG cbDDRAWHeap;
+    
+    ULONG offDisplayInformation;
+    ULONG cbDisplayInformation;
+} VRAMLAYOUT;
 
 struct  _PDEV
@@ -68 +89 @@
     ULONG   ulMode;                     // Mode the mini-port driver is in.
     LONG    lDeltaScreen;               // Distance from one scan to the next.
-    ULONG   cScreenSize;                // size of video memory, including
-                                        // offscreen memory.
-    ULONG   cFrameBufferSize;           // size of screen video memory
+    
     PVOID   pOffscreenList;             // linked list of DCI offscreen surfaces.
     FLONG   flRed;                      // For bitfields device, Red Mask
@@ -98 +117 @@
 
     VBOXDISPLAYINFO *pInfo;
+    BOOLEAN bVBoxVideoSupported;
     ULONG iDevice;
-    ULONG cbDisplayInformation;
+    VRAMLAYOUT layout;
+
 #ifdef VBOX_WITH_DDRAW
     BOOL             bDdExclusiveMode;

trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c

@@ -38 +38 @@
 };
 
+static void vboxInitVBoxVideo (PPDEV ppdev, const VIDEO_MEMORY_INFORMATION *pMemoryInformation)
+{
+    ULONG cbAvailable = 0;
+
+    DWORD returnedDataLength;
+
+    QUERYDISPLAYINFORESULT DispInfo;
+    RtlZeroMemory(&DispInfo, sizeof (DispInfo));
+
+    ppdev->bVBoxVideoSupported = !EngDeviceIoControl(ppdev->hDriver,
+                                                     IOCTL_VIDEO_QUERY_DISPLAY_INFO,
+                                                     NULL,
+                                                     0,
+                                                     &DispInfo,
+                                                     sizeof(DispInfo),
+                                                     &returnedDataLength);
+
+    if (ppdev->bVBoxVideoSupported)
+    {
+        ppdev->iDevice = DispInfo.iDevice;
+    
+        ppdev->layout.cbVRAM = pMemoryInformation->VideoRamLength;
+    
+        ppdev->layout.offFrameBuffer = 0;
+        ppdev->layout.cbFrameBuffer  = RT_ALIGN_32(pMemoryInformation->FrameBufferLength, 0x1000);
+    
+        cbAvailable = ppdev->layout.cbVRAM - ppdev->layout.cbFrameBuffer;
+        
+        if (cbAvailable <= DispInfo.u32DisplayInfoSize)
+        {
+            ppdev->bVBoxVideoSupported = FALSE;
+        }
+        else
+        {
+            ppdev->layout.offDisplayInformation = ppdev->layout.cbVRAM - DispInfo.u32DisplayInfoSize;
+            ppdev->layout.cbDisplayInformation  = DispInfo.u32DisplayInfoSize;
+            
+            cbAvailable -= ppdev->layout.cbDisplayInformation;
+            
+            /* Use minimum 64K and maximum the cbFrameBuffer for the VBVA buffer. */
+            for (ppdev->layout.cbVBVABuffer = ppdev->layout.cbFrameBuffer;
+                 ppdev->layout.cbVBVABuffer >= 0x10000;
+                 ppdev->layout.cbVBVABuffer /= 2)
+            {
+                if (ppdev->layout.cbVBVABuffer < cbAvailable)
+                {
+                    break;
+                }
+            }
+            
+            if (ppdev->layout.cbVBVABuffer >= cbAvailable)
+            {
+                ppdev->bVBoxVideoSupported = FALSE;
+            }
+            else
+            {
+                ppdev->layout.offVBVABuffer = ppdev->layout.offFrameBuffer + ppdev->layout.cbFrameBuffer;
+                
+                cbAvailable -= ppdev->layout.cbVBVABuffer;
+                
+                ppdev->layout.offDDRAWHeap = ppdev->layout.offVBVABuffer + ppdev->layout.cbVBVABuffer;
+                ppdev->layout.cbDDRAWHeap  = cbAvailable;
+            }
+        }
+    }
+    
+    if (!ppdev->bVBoxVideoSupported)
+    {
+        ppdev->iDevice = 0;
+
+        /* Setup a layout without both the VBVA buffer and the display information. */
+        ppdev->layout.cbVRAM = pMemoryInformation->VideoRamLength;
+    
+        ppdev->layout.offFrameBuffer = 0;
+        ppdev->layout.cbFrameBuffer  = RT_ALIGN_32(pMemoryInformation->FrameBufferLength, 0x1000);
+    
+        ppdev->layout.offVBVABuffer = ppdev->layout.offFrameBuffer + ppdev->layout.cbFrameBuffer;
+        ppdev->layout.cbVBVABuffer  = 0;
+    
+        ppdev->layout.offDDRAWHeap = ppdev->layout.offVBVABuffer + ppdev->layout.cbVBVABuffer;
+        ppdev->layout.cbDDRAWHeap  = ppdev->layout.cbVRAM - ppdev->layout.offDDRAWHeap;
+    
+        ppdev->layout.offDisplayInformation = ppdev->layout.offDDRAWHeap + ppdev->layout.cbDDRAWHeap;
+        ppdev->layout.cbDisplayInformation  = 0;
+    }
+
+    DISPDBG((0, "vboxInitVBoxVideo:\n"
+                "    cbVRAM = 0x%X\n"
+                "    offFrameBuffer = 0x%X\n"
+                "    cbFrameBuffer = 0x%X\n"
+                "    offVBVABuffer = 0x%X\n"
+                "    cbVBVABuffer = 0x%X\n"
+                "    offDDRAWHeap = 0x%X\n"
+                "    cbDDRAWHeap = 0x%X\n"
+                "    offDisplayInformation = 0x%X\n"
+                "    cbDisplayInformation = 0x%X\n",
+                ppdev->layout.cbVRAM,
+                ppdev->layout.offFrameBuffer,
+                ppdev->layout.cbFrameBuffer,
+                ppdev->layout.offVBVABuffer,
+                ppdev->layout.cbVBVABuffer,
+                ppdev->layout.offDDRAWHeap,
+                ppdev->layout.cbDDRAWHeap,
+                ppdev->layout.offDisplayInformation,
+                ppdev->layout.cbDisplayInformation
+                ));
+}
+
 /* Setup display information after remapping. */
 static void vboxSetupDisplayInfo (PPDEV ppdev, VIDEO_MEMORY_INFORMATION *pMemoryInformation)
@@ -44 +152 @@
     uint8_t *pu8;
     
-    DWORD returnedDataLength;
-    QUERYDISPLAYINFORESULT DispInfo;
-    RtlZeroMemory(&DispInfo, sizeof (DispInfo));
-    if (EngDeviceIoControl(ppdev->hDriver,
-                           IOCTL_VIDEO_QUERY_DISPLAY_INFO,
-                           NULL,
-                           0,
-                           &DispInfo,
-                           sizeof(DispInfo),
-                           &returnedDataLength))
-    {
-        DISPDBG((1, "DISP bInitSURF failed IOCTL_VIDEO_QUERY_DISPLAY_INFO\n"));
-        ppdev->pInfo = NULL;
-        return;
-    }
-    
-    if (returnedDataLength != sizeof (QUERYDISPLAYINFORESULT)
-        || DispInfo.u32DisplayInfoSize >= pMemoryInformation->VideoRamLength)
-    {
-        DISPDBG((1, "DISP bInitSURF failed DispInfo.u32DisplayInfoSize 0x%x >= pMemoryInformation->VideoRamLength 0x%x\n",
-                 DispInfo.u32DisplayInfoSize, pMemoryInformation->VideoRamLength));
-        ppdev->pInfo = NULL;
-        ppdev->cbDisplayInformation = 0;
-        return;
-    }
-    
-    ppdev->iDevice = DispInfo.iDevice;
-    ppdev->cbDisplayInformation = DispInfo.u32DisplayInfoSize;
-
-    pu8 = (uint8_t *)pMemoryInformation->VideoRamBase;
-    pu8 += pMemoryInformation->VideoRamLength - DispInfo.u32DisplayInfoSize;
+    pu8 = (uint8_t *)ppdev->pjScreen + ppdev->layout.offDisplayInformation;
 
     pInfo = (VBOXDISPLAYINFO *)pu8;
@@ -243 +321 @@
         ppdev->pPointerAttributes->Row = 0;
         ppdev->pPointerAttributes->Enable = 0;
-
-        /* Setup the display information. */
-        vboxSetupDisplayInfo (ppdev, &videoMemoryInformation);
         
-        ppdev->cScreenSize = videoMemoryInformation.VideoRamLength - ppdev->cbDisplayInformation;
-        ppdev->cFrameBufferSize = videoMemoryInformation.FrameBufferLength;
+        vboxInitVBoxVideo (ppdev, &videoMemoryInformation);
+
+        if (ppdev->bVBoxVideoSupported)
+        {
+            /* Setup the display information. */
+            vboxSetupDisplayInfo (ppdev, &videoMemoryInformation);
+        }
     }
 

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

@@ -810 +810 @@
     p->hdrEnd.u16Length  = 0;
     
-    /* Inform the host about the display configuration. */
+    /* Let the host to process the commands. */
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBOX_VIDEO);
     VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_ADAPTER_MEMORY);