Changeset 28031 in vbox

Timestamp:

Apr 7, 2010 8:00:22 AM (15 years ago)

Author:

vboxsync

Message:

wddm: more correct visible VRAM size reporting + some cleaning

Location:

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

Files:

• VBoxVideo.cpp (modified) (1 diff)
• VBoxVideo.h (modified) (2 diffs)
• VBoxVideoHGSMI.cpp (modified) (1 diff)
• wddm/VBoxVideoShgsmi.h (modified) (1 diff)
• wddm/VBoxVideoVdma.h (modified) (1 diff)
• wddm/VBoxVideoVidPn.h (modified) (1 diff)
• wddm/VBoxVideoWddm.cpp (modified) (5 diffs)
• wddm/VBoxVideoWddm.h (modified) (2 diffs)

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

@@ -348 +348 @@
     ULONG vramSize = DeviceExtension->pPrimary->u.primary.ulMaxFrameBufferSize;
 #else
-    ULONG vramSize = vboxWddmVramReportedSegmentSize(DeviceExtension);
+    ULONG vramSize = vboxWddmVramCpuVisibleSegmentSize(DeviceExtension);
+#ifndef VBOXWDDM_WITH_FAKE_SEGMENT
+    /* at least two surfaces will be needed: primary & shadow */
+    vramSize /= 2;
+#endif
 
     gPreferredVideoMode = 0;

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

@@ -607 +607 @@
 UINT vboxWddmCalcBitsPerPixel(D3DDDIFORMAT format);
 
-DECLINLINE(ULONG) vboxWddmVramReportedSize(PDEVICE_EXTENSION pDevExt)
+DECLINLINE(ULONG) vboxWddmVramCpuVisibleSize(PDEVICE_EXTENSION pDevExt)
 {
     /* all memory layout info should be initialized */
@@ -613 +613 @@
     /* page aligned */
     Assert(!(pDevExt->u.primary.Vdma.CmdHeap.area.offBase & 0xfff));
-    return pDevExt->u.primary.Vdma.CmdHeap.area.offBase;
-}
-
-DECLINLINE(ULONG) vboxWddmVramReportedSegmentSize(PDEVICE_EXTENSION pDevExt)
-{
-    ULONG size = vboxWddmVramReportedSize(pDevExt);
-    size /= 2;
-    size &= ~0xfffUL;
-    return size;
-}
+    return pDevExt->u.primary.Vdma.CmdHeap.area.offBase & ~0xfffUL;
+}
+
+DECLINLINE(ULONG) vboxWddmVramCpuVisibleSegmentSize(PDEVICE_EXTENSION pDevExt)
+{
+    return vboxWddmVramCpuVisibleSize(pDevExt);
+}
+
+#ifdef VBOXWDDM_WITH_FAKE_SEGMENT
+DECLINLINE(ULONG) vboxWddmVramCpuInvisibleSegmentSize(PDEVICE_EXTENSION pDevExt)
+{
+    return vboxWddmVramCpuVisibleSegmentSize(pDevExt);
+}
+#endif
 
 DECLINLINE(VOID) vboxWddmAssignPrimary(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, PVBOXWDDM_ALLOCATION pAllocation, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId)

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

@@ -934 +934 @@
                             - VBVA_ADAPTER_INFORMATION_SIZE;
 
-        /* use 25% od VRAM for DMA command buffer
-         * @todo: ^^^? */
-        ULONG ulSize = ulAvailable / 4;
+        ULONG ulSize = ulAvailable / 2;
+
+        if (ulSize > VBOXWDDM_C_VDMA_BUFFER_SIZE)
+            ulSize = VBOXWDDM_C_VDMA_BUFFER_SIZE;
 
         /* Align down to 4096 bytes. */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoShgsmi.h

@@ -19 +19 @@
 #include <iprt/cdefs.h>
 #include <VBox/VBoxVideo.h>
+#include "../VBoxVideo.h"
 
 typedef DECLCALLBACK(void) FNVBOXSHGSMICMDCOMPLETION(struct _HGSMIHEAP * pHeap, void *pvCmd, void *pvContext);

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

@@ -19 +19 @@
 #include <iprt/cdefs.h>
 #include <VBox/VBoxVideo.h>
+#include "../VBoxVideo.h"
 
 /* DMA commands are currently submitted over HGSMI */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVidPn.h

@@ -16 +16 @@
 #ifndef ___VBoxVideoVidPn_h___
 #define ___VBoxVideoVidPn_h___
+
+#include "../VBoxVideo.h"
 
 #define VBOXVDPN_C_DISPLAY_HBLANK_SIZE 200

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

@@ -143 +143 @@
         pView->u32ViewIndex     = pPrimaryInfo->VidPnSourceId;
         pView->u32ViewOffset    = (uint32_t)offVram;
-        pView->u32ViewSize      = vboxWddmVramReportedSegmentSize(pDevExt)/pDevExt->cSources;
+        pView->u32ViewSize      = vboxWddmVramCpuVisibleSegmentSize(pDevExt)/pDevExt->cSources;
 
         pView->u32MaxScreenSize = pView->u32ViewSize;
@@ -1169 +1169 @@
              * DXGK_QUERYSEGMENTIN *pQsIn = (DXGK_QUERYSEGMENTIN*)pQueryAdapterInfo->pInputData; */
             DXGK_QUERYSEGMENTOUT *pQsOut = (DXGK_QUERYSEGMENTOUT*)pQueryAdapterInfo->pOutputData;
+#ifdef VBOXWDDM_WITH_FAKE_SEGMENT
+# define VBOXWDDM_SEGMENTS_COUNT 2
+#else
+# define VBOXWDDM_SEGMENTS_COUNT 1
+#endif
             if (!pQsOut->pSegmentDescriptor)
             {
                 /* we are requested to provide the number of segments we support */
-                pQsOut->NbSegment = 2;
-            }
-            else if (pQsOut->NbSegment != 2)
+                pQsOut->NbSegment = VBOXWDDM_SEGMENTS_COUNT;
+            }
+            else if (pQsOut->NbSegment != VBOXWDDM_SEGMENTS_COUNT)
             {
                 AssertBreakpoint();
@@ -1188 +1193 @@
                 /* make sure the size is page aligned */
                 /* @todo: need to setup VBVA buffers and adjust the mem size here */
-                pDr->Size = vboxWddmVramReportedSegmentSize(pContext);
+                pDr->Size = vboxWddmVramCpuVisibleSegmentSize(pContext);
                 pDr->NbOfBanks = 0;
                 pDr->pBankRangeTable = 0;
@@ -1194 +1199 @@
                 pDr->Flags.Value = 0;
                 pDr->Flags.CpuVisible = 1;
-
+#ifdef VBOXWDDM_WITH_FAKE_SEGMENT
                 ++pDr;
                 /* create cpu-invisible segment of the same size */
@@ -1201 +1206 @@
                 /* make sure the size is page aligned */
                 /* @todo: need to setup VBVA buffers and adjust the mem size here */
-                pDr->Size = vboxWddmVramReportedSegmentSize(pContext);
+                pDr->Size = vboxWddmVramCpuInvisibleSegmentSize(pContext);
                 pDr->NbOfBanks = 0;
                 pDr->pBankRangeTable = 0;
                 pDr->CommitLimit = pDr->Size;
                 pDr->Flags.Value = 0;
+#endif
 
                 pQsOut->PagingBufferSegmentId = 0;

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

@@ -17 +17 @@
 #define ___VBoxVideoWddm_h___
 
+#include "../VBoxVideo.h"
+
 /* one page size */
 #define VBOXWDDM_C_DMA_BUFFER_SIZE         0x1000
@@ -24 +26 @@
 #define VBOXWDDM_C_POINTER_MAX_WIDTH  64
 #define VBOXWDDM_C_POINTER_MAX_HEIGHT 64
+
+#define VBOXWDDM_C_VDMA_BUFFER_SIZE   (64*_1K)
+
+//#define VBOXWDDM_WITH_FAKE_SEGMENT
 
 #define VBOXWDDM_ROUNDBOUND(_v, _b) (((_v) + ((_b) - 1)) & ~((_b) - 1))