Changeset 28382 in vbox for trunk/src/VBox

Timestamp:

Apr 15, 2010 6:03:53 PM (15 years ago)

Author:

vboxsync

Message:

wddm: correctly report framebuffer offset to VGA device

Location:

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

Files:

• VBoxVideo.cpp (modified) (2 diffs)
• VBoxVideo.h (modified) (2 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (1 diff)

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

@@ -2928 +2928 @@
 
 BOOLEAN FASTCALL VBoxVideoSetCurrentModePerform(PDEVICE_EXTENSION DeviceExtension,
-        USHORT width, USHORT height, USHORT bpp)
+        USHORT width, USHORT height, USHORT bpp
+#ifdef VBOXWDDM
+        , ULONG offDisplay
+#endif
+        )
 {
     /* set the mode characteristics */
@@ -2940 +2944 @@
     VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE);
     VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
+#ifdef VBOXWDDM
+    /* encode linear offDisplay to xOffset & yOffset to ensure offset fits USHORT */
+    ULONG cbLine = VBOXWDDM_ROUNDBOUND(((width * bpp) + 7) / 8, 4);
+    ULONG xOffset = offDisplay % cbLine;
+    ULONG yOffset = offDisplay / cbLine;
+    Assert(xOffset <= 0xffff);
+    Assert(yOffset <= 0xffff);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_X_OFFSET);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)xOffset);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_Y_OFFSET);
+    VBoxVideoCmnPortWriteUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, (USHORT)yOffset);
+#endif
     /** @todo read from the port to see if the mode switch was successful */
 

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

@@ -86 +86 @@
 #define VBE_DISPI_INDEX_VIRT_WIDTH      0x6
 #define VBE_DISPI_INDEX_VIRT_HEIGHT     0x7
+#define VBE_DISPI_INDEX_X_OFFSET        0x8
+#define VBE_DISPI_INDEX_Y_OFFSET        0x9
 #define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
 
@@ -736 +738 @@
 
 BOOLEAN FASTCALL VBoxVideoSetCurrentModePerform(PDEVICE_EXTENSION DeviceExtension,
-        USHORT width, USHORT height, USHORT bpp);
+        USHORT width, USHORT height, USHORT bpp
+#ifdef VBOXWDDM
+        , ULONG offDisplay
+#endif
+        );
 
 BOOLEAN FASTCALL VBoxVideoSetCurrentMode(

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

@@ -155 +155 @@
 
     if (VBoxVideoSetCurrentModePerform(pDevExt, pAllocation->u.SurfInfo.width,
-            pAllocation->u.SurfInfo.height, pAllocation->u.SurfInfo.bpp))
+            pAllocation->u.SurfInfo.height, pAllocation->u.SurfInfo.bpp,
+            (ULONG)pAllocation->offVram))
         return STATUS_SUCCESS;