Changeset 40489 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 15, 2012 5:14:31 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76866

Message:

Made XPDM driver get LFB base from PCI.

Location:

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

Files:

• common/VBoxMPCommon.cpp (modified) (1 diff)
• common/VBoxMPDevExt.h (modified) (1 diff)
• xpdm/VBoxMPDriver.cpp (modified) (2 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 = VBE_DISPI_LFB_PHYSICAL_ADDRESS + ulOffset;
+    FrameBuffer.QuadPart = pPEXT->u.primary.physLFBBase.QuadPart + ulOffset;
 
     PVOID VideoRamBase = NULL;

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

@@ -128 +128 @@
            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/xpdm/VBoxMPDriver.cpp

@@ -92 +92 @@
     VBOXMP_WARN_VPS(rc);
 
-    /* Call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */
+    /* Call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up
+     * and to get LFB aperture data.
+     */
     {
         VIDEO_ACCESS_RANGE tmpRanges[4];
@@ -114 +116 @@
         }
         VBOXMP_WARN_VPS(rc);
+        if (rc != NO_ERROR) {
+            return rc;
+        }
+
+        /* The first range is the framebuffer. We require that information. */
+        pExt->u.primary.physLFBBase    = tmpRanges[0].RangeStart;
+        pExt->u.primary.ulApertureSize = tmpRanges[0].RangeLength;
     }
 

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

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