Changeset 40566 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Mar 21, 2012 2:12:23 PM (13 years ago)

Author:

vboxsync

Message:

wddm: remove VBE_DISPI_LFB_PHYSICAL_ADDRESS

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Files:

• common/VBoxMPCommon.cpp (modified) (1 diff)
• common/VBoxMPDevExt.h (modified) (2 diffs)
• common/VBoxMPHGSMI.cpp (modified) (2 diffs)
• common/VBoxMPHGSMI.h (modified) (1 diff)
• wddm/VBoxMPMisc.cpp (modified) (1 diff)
• wddm/VBoxMPWddm.cpp (modified) (12 diffs)
• xpdm/VBoxMPDriver.cpp (modified) (5 diffs)
• xpdm/VBoxMPIOCTL.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

@@ -33 +33 @@
 
     PHYSICAL_ADDRESS FrameBuffer;
-    FrameBuffer.QuadPart = pPEXT->u.primary.physLFBBase.QuadPart + ulOffset;
+    FrameBuffer.QuadPart = VBoxCommonFromDeviceExt(pPEXT)->phVRAM.QuadPart + ulOffset;
 
     PVOID VideoRamBase = NULL;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -40 +40 @@
     uint32_t cbVRAM;                    /* The VRAM size. */
 
+    PHYSICAL_ADDRESS phVRAM;            /* Physical VRAM base. */
+
+    ULONG ulApertureSize;               /* Size of the LFB aperture (>= VRAM size). */
+
     uint32_t cbMiniportHeap;            /* The size of reserved VRAM for miniport driver heap.
                                          * It is at offset:
@@ -128 +132 @@
            ULONG ulVbvaEnabled;                /* Indicates that VBVA mode is enabled. */
            ULONG ulMaxFrameBufferSize;         /* The size of the VRAM allocated for the a single framebuffer. */
-           PHYSICAL_ADDRESS physLFBBase;       /* Physical linear framebuffer base. */
-           ULONG ulApertureSize;               /* Size of the LFB aperture (>= VRAM size). */
            BOOLEAN fMouseHidden;               /* Has the mouse cursor been hidden by the guest? */
            VBOXMP_COMMON commonInfo;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp

@@ -29 +29 @@
  * to talk to the host.
  */
-void VBoxSetupDisplaysHGSMI(PVBOXMP_COMMON pCommon,
-                            uint32_t AdapterMemorySize, uint32_t fCaps)
+void VBoxSetupDisplaysHGSMI(PVBOXMP_COMMON pCommon, PHYSICAL_ADDRESS phVRAM, uint32_t ulApertureSize,
+                            uint32_t cbVRAM, uint32_t fCaps)
 {
     /** @todo I simply converted this from Windows error codes.  That is wrong,
@@ -42 +42 @@
 
     memset(pCommon, 0, sizeof(*pCommon));
-    pCommon->cbVRAM    = AdapterMemorySize;
+    pCommon->phVRAM = phVRAM;
+    pCommon->ulApertureSize = ulApertureSize;
+    pCommon->cbVRAM    = cbVRAM;
     pCommon->cDisplays = 1;
     pCommon->bHGSMI    = VBoxHGSMIIsSupported();

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.h

@@ -23 +23 @@
 
 RT_C_DECLS_BEGIN
-void VBoxSetupDisplaysHGSMI(PVBOXMP_COMMON pCommon, uint32_t AdapterMemorySize, uint32_t fCaps);
+void VBoxSetupDisplaysHGSMI(PVBOXMP_COMMON pCommon, PHYSICAL_ADDRESS phVRAM, uint32_t ulApertureSize, uint32_t cbVRAM, uint32_t fCaps);
 void VBoxFreeDisplaysHGSMI(PVBOXMP_COMMON pCommon);
 RT_C_DECLS_END

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

@@ -1386 +1386 @@
         {
             PHYSICAL_ADDRESS PhysicalAddress = {0};
-            PhysicalAddress.QuadPart = VBE_DISPI_LFB_PHYSICAL_ADDRESS + offData;
+            PhysicalAddress.QuadPart = VBoxCommonFromDeviceExt(pDevExt)->phVRAM.QuadPart + offData;
             pMgr->pvData = (uint8_t*)MmMapIoSpace(PhysicalAddress, cbData, MmNonCached);
             Assert(pMgr->pvData);

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -609 +609 @@
 }
 
-NTSTATUS vboxWddmPickResources(PVBOXMP_DEVEXT pContext, PDXGK_DEVICE_INFO pDeviceInfo, PULONG pAdapterMemorySize)
+typedef struct VBOXWDDM_HWRESOURCES
+{
+    PHYSICAL_ADDRESS phVRAM;
+    ULONG cbVRAM;
+    ULONG ulApertureSize;
+} VBOXWDDM_HWRESOURCES, *PVBOXWDDM_HWRESOURCES;
+
+NTSTATUS vboxWddmPickResources(PVBOXMP_DEVEXT pDevExt, PDXGK_DEVICE_INFO pDeviceInfo, PVBOXWDDM_HWRESOURCES pHwResources)
 {
     NTSTATUS Status = STATUS_SUCCESS;
     USHORT DispiId;
-    *pAdapterMemorySize = VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES;
+    memset(pHwResources, 0, sizeof (*pHwResources));
+    pHwResources->cbVRAM = VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES;
 
     VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ID);
@@ -630 +638 @@
         * an ULONG from the data port without setting an index before.
         */
-       *pAdapterMemorySize = VBoxVideoCmnPortReadUlong(VBE_DISPI_IOPORT_DATA);
+       pHwResources->cbVRAM = VBoxVideoCmnPortReadUlong(VBE_DISPI_IOPORT_DATA);
        if (VBoxHGSMIIsSupported ())
        {
@@ -648 +656 @@
                            break;
                        case CmResourceTypeMemory:
+                           /* we assume there is one memory segment */
+                           Assert(pHwResources->phVRAM.QuadPart == 0);
+                           pHwResources->phVRAM = pPRc->u.Memory.Start;
+                           Assert(pHwResources->phVRAM.QuadPart != 0);
+                           pHwResources->ulApertureSize = pPRc->u.Memory.Length;
+                           Assert(pHwResources->cbVRAM <= pHwResources->ulApertureSize);
                            break;
                        case CmResourceTypeDma:
@@ -907 +921 @@
         )
     {
-        PVBOXMP_DEVEXT pContext = (PVBOXMP_DEVEXT)MiniportDeviceContext;
-
-        vboxWddmVGuidGet(pContext);
+        PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)MiniportDeviceContext;
+
+        vboxWddmVGuidGet(pDevExt);
 
         /* Save DeviceHandle and function pointers supplied by the DXGKRNL_INTERFACE structure passed to DxgkInterface. */
-        memcpy(&pContext->u.primary.DxgkInterface, DxgkInterface, sizeof (DXGKRNL_INTERFACE));
+        memcpy(&pDevExt->u.primary.DxgkInterface, DxgkInterface, sizeof (DXGKRNL_INTERFACE));
 
         /* Allocate a DXGK_DEVICE_INFO structure, and call DxgkCbGetDeviceInformation to fill in the members of that structure, which include the registry path, the PDO, and a list of translated resources for the display adapter represented by MiniportDeviceContext. Save selected members (ones that the display miniport driver will need later)
          * of the DXGK_DEVICE_INFO structure in the context block represented by MiniportDeviceContext. */
         DXGK_DEVICE_INFO DeviceInfo;
-        Status = pContext->u.primary.DxgkInterface.DxgkCbGetDeviceInformation (pContext->u.primary.DxgkInterface.DeviceHandle, &DeviceInfo);
+        Status = pDevExt->u.primary.DxgkInterface.DxgkCbGetDeviceInformation (pDevExt->u.primary.DxgkInterface.DeviceHandle, &DeviceInfo);
         if (Status == STATUS_SUCCESS)
         {
-            ULONG AdapterMemorySize;
-            Status = vboxWddmPickResources(pContext, &DeviceInfo, &AdapterMemorySize);
+            VBOXWDDM_HWRESOURCES HwRc;
+            Status = vboxWddmPickResources(pDevExt, &DeviceInfo, &HwRc);
             if (Status == STATUS_SUCCESS)
             {
@@ -931 +945 @@
                  * with old guest additions.
                  */
-                VBoxSetupDisplaysHGSMI(VBoxCommonFromDeviceExt(pContext),
-                                       AdapterMemorySize,
+                VBoxSetupDisplaysHGSMI(VBoxCommonFromDeviceExt(pDevExt),
+                                       HwRc.phVRAM, HwRc.ulApertureSize, HwRc.cbVRAM,
                                        VBVACAPS_COMPLETEGCMD_BY_IOREAD | VBVACAPS_IRQ);
-                if (VBoxCommonFromDeviceExt(pContext)->bHGSMI)
+                if (VBoxCommonFromDeviceExt(pDevExt)->bHGSMI)
                 {
-                    vboxWddmSetupDisplays(pContext);
-                    if (!VBoxCommonFromDeviceExt(pContext)->bHGSMI)
-                        VBoxFreeDisplaysHGSMI(VBoxCommonFromDeviceExt(pContext));
+                    vboxWddmSetupDisplays(pDevExt);
+                    if (!VBoxCommonFromDeviceExt(pDevExt)->bHGSMI)
+                        VBoxFreeDisplaysHGSMI(VBoxCommonFromDeviceExt(pDevExt));
                 }
-                if (VBoxCommonFromDeviceExt(pContext)->bHGSMI)
+                if (VBoxCommonFromDeviceExt(pDevExt)->bHGSMI)
                 {
                     LOGREL(("using HGSMI"));
-                    *NumberOfVideoPresentSources = VBoxCommonFromDeviceExt(pContext)->cDisplays;
-                    *NumberOfChildren = VBoxCommonFromDeviceExt(pContext)->cDisplays;
+                    *NumberOfVideoPresentSources = VBoxCommonFromDeviceExt(pDevExt)->cDisplays;
+                    *NumberOfChildren = VBoxCommonFromDeviceExt(pDevExt)->cDisplays;
                     LOG(("sources(%d), children(%d)", *NumberOfVideoPresentSources, *NumberOfChildren));
 
-                    vboxVdmaDdiNodesInit(pContext);
-                    vboxVideoCmInit(&pContext->CmMgr);
-                    InitializeListHead(&pContext->SwapchainList3D);
-                    pContext->cContexts3D = 0;
-                    ExInitializeFastMutex(&pContext->ContextMutex);
-                    KeInitializeSpinLock(&pContext->SynchLock);
-
-                    VBoxMPCmnInitCustomVideoModes(pContext);
-                    VBoxWddmInvalidateVideoModesInfo(pContext);
+                    vboxVdmaDdiNodesInit(pDevExt);
+                    vboxVideoCmInit(&pDevExt->CmMgr);
+                    InitializeListHead(&pDevExt->SwapchainList3D);
+                    pDevExt->cContexts3D = 0;
+                    ExInitializeFastMutex(&pDevExt->ContextMutex);
+                    KeInitializeSpinLock(&pDevExt->SynchLock);
+
+                    VBoxMPCmnInitCustomVideoModes(pDevExt);
+                    VBoxWddmInvalidateVideoModesInfo(pDevExt);
 #if 0
-                    vboxShRcTreeInit(pContext);
+                    vboxShRcTreeInit(pDevExt);
 #endif
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                    vboxVhwaInit(pContext);
+                    vboxVhwaInit(pDevExt);
 #endif
                 }
@@ -1567 +1581 @@
     LOGF(("ENTER, context(0x%x), Query type (%d)", hAdapter, pQueryAdapterInfo->Type));
     NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXMP_DEVEXT pContext = (PVBOXMP_DEVEXT)hAdapter;
+    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
 
     vboxVDbgBreakFv();
@@ -1587 +1601 @@
             pCaps->MaxOverlays = 0;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-            for (int i = 0; i < VBoxCommonFromDeviceExt(pContext)->cDisplays; ++i)
-            {
-                if ( pContext->aSources[i].Vhwa.Settings.fFlags & VBOXVHWA_F_ENABLED)
-                    pCaps->MaxOverlays += pContext->aSources[i].Vhwa.Settings.cOverlaysSupported;
+            for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+            {
+                if ( pDevExt->aSources[i].Vhwa.Settings.fFlags & VBOXVHWA_F_ENABLED)
+                    pCaps->MaxOverlays += pDevExt->aSources[i].Vhwa.Settings.cOverlaysSupported;
             }
 #endif
@@ -1639 +1653 @@
                 DXGK_SEGMENTDESCRIPTOR* pDr = pQsOut->pSegmentDescriptor;
                 /* we are requested to provide segment information */
-                pDr->BaseAddress.QuadPart = 0; /* VBE_DISPI_LFB_PHYSICAL_ADDRESS; */
-                pDr->CpuTranslatedAddress.QuadPart = VBE_DISPI_LFB_PHYSICAL_ADDRESS;
+                pDr->BaseAddress.QuadPart = 0;
+                pDr->CpuTranslatedAddress = VBoxCommonFromDeviceExt(pDevExt)->phVRAM;
                 /* make sure the size is page aligned */
                 /* @todo: need to setup VBVA buffers and adjust the mem size here */
-                pDr->Size = vboxWddmVramCpuVisibleSegmentSize(pContext);
+                pDr->Size = vboxWddmVramCpuVisibleSegmentSize(pDevExt);
                 pDr->NbOfBanks = 0;
                 pDr->pBankRangeTable = 0;
@@ -1656 +1670 @@
                 /* make sure the size is page aligned */
                 /* @todo: need to setup VBVA buffers and adjust the mem size here */
-                pDr->Size = vboxWddmVramCpuInvisibleSegmentSize(pContext);
+                pDr->Size = vboxWddmVramCpuInvisibleSegmentSize(pDevExt);
                 pDr->NbOfBanks = 0;
                 pDr->pBankRangeTable = 0;
@@ -1676 +1690 @@
                 memset (pQi, 0, sizeof (VBOXWDDM_QI));
                 pQi->u32Version = VBOXVIDEOIF_VERSION;
-                pQi->cInfos = VBoxCommonFromDeviceExt(pContext)->cDisplays;
+                pQi->cInfos = VBoxCommonFromDeviceExt(pDevExt)->cDisplays;
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                for (int i = 0; i < VBoxCommonFromDeviceExt(pContext)->cDisplays; ++i)
+                for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
                 {
-                    pQi->aInfos[i] = pContext->aSources[i].Vhwa.Settings;
+                    pQi->aInfos[i] = pDevExt->aSources[i].Vhwa.Settings;
                 }
 #endif
@@ -1712 +1726 @@
     LOGF(("ENTER, context(0x%x)", hAdapter));
     NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXMP_DEVEXT pContext = (PVBOXMP_DEVEXT)hAdapter;
+    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
 
     vboxVDbgBreakFv();
@@ -1726 +1740 @@
 //    }
 
-    pDevice->pAdapter = pContext;
+    pDevice->pAdapter = pDevExt;
     pDevice->hDevice = pCreateDevice->hDevice;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -50 +50 @@
     VP_STATUS rc;
     USHORT DispiId;
-    ULONG AdapterMemorySize = VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES;
+    ULONG cbVRAM = VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES;
+    PHYSICAL_ADDRESS phVRAM = {0};
+    ULONG ulApertureSize = 0;
 
     PAGED_CODE();
@@ -73 +75 @@
      * an ULONG from the data port without setting an index before.
      */
-    AdapterMemorySize = VideoPortReadPortUlong((PULONG)VBE_DISPI_IOPORT_DATA);
+    cbVRAM = VideoPortReadPortUlong((PULONG)VBE_DISPI_IOPORT_DATA);
 
     /* Write hw information to registry, so that it's visible in windows property dialog */
@@ -83 +85 @@
     VBOXMP_WARN_VPS(rc);
     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.MemorySize",
-                                        &AdapterMemorySize, sizeof(ULONG));
+                                        &cbVRAM, sizeof(ULONG));
     VBOXMP_WARN_VPS(rc);
     rc = VideoPortSetRegistryParameters(pExt, L"HardwareInformation.AdapterString",
@@ -121 +123 @@
 
         /* The first range is the framebuffer. We require that information. */
-        pExt->u.primary.physLFBBase    = tmpRanges[0].RangeStart;
-        pExt->u.primary.ulApertureSize = tmpRanges[0].RangeLength;
+        phVRAM = tmpRanges[0].RangeStart;
+        ulApertureSize = tmpRanges[0].RangeLength;
     }
 
@@ -143 +145 @@
      * with old guest additions.
      */
-    VBoxSetupDisplaysHGSMI(&pExt->u.primary.commonInfo, AdapterMemorySize, 0);
+    VBoxSetupDisplaysHGSMI(&pExt->u.primary.commonInfo, phVRAM, ulApertureSize, cbVRAM, 0);
 
     if (pExt->u.primary.commonInfo.bHGSMI)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -75 +75 @@
     LOGF(("framebuffer offset %#x", pExt->ulFrameBufferOffset));
 
-    framebuffer.QuadPart = pExt->u.primary.physLFBBase.QuadPart + pExt->ulFrameBufferOffset;
+    framebuffer.QuadPart = VBoxCommonFromDeviceExt(pExt)->phVRAM.QuadPart + pExt->ulFrameBufferOffset;
 
     pMapInfo->VideoRamBase = pRequestedAddress->RequestedVirtualAddress;
@@ -145 +145 @@
     }
 
-    shareAddress.QuadPart = pExt->u.primary.physLFBBase.QuadPart + pExt->ulFrameBufferOffset;
+    shareAddress.QuadPart = VBoxCommonFromDeviceExt(pExt)->phVRAM.QuadPart + pExt->ulFrameBufferOffset;
 
     pStatus->Status = VideoPortMapMemory(pExt, shareAddress, &size, &inIoSpace, &virtualAddress);