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

Timestamp:

Mar 30, 2010 8:31:42 PM (15 years ago)

Author:

vboxsync

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

59514

Message:

2d: working multi-monitor + some fixing for working with not-using-VRAM mode

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/dd.c (modified) (9 diffs)
• Display/driver.h (modified) (2 diffs)
• Display/screen.c (modified) (1 diff)
• Display/vbox.c (modified) (1 diff)
• Display/vhwa.c (modified) (1 diff)
• Miniport/VBoxVideo.cpp (modified) (1 diff)
• Miniport/vboxioctl.h (modified) (2 diffs)

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

@@ -108 +108 @@
     {
 #ifdef VBOX_WITH_VIDEOHWACCEL
-        vboxVHWAInit();
-
         memset(pHalInfo, 0, sizeof(DD_HALINFO));
         pHalInfo->dwSize    = sizeof(DD_HALINFO);
@@ -659 +657 @@
             if (lpSurfaceLocal->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)
             {
-                pBody->SurfInfo.offSurface = 0;
+                pBody->SurfInfo.offSurface = vboxVHWAVramOffsetFromPDEV(pDev, 0);
             }
             else
@@ -1082 +1080 @@
                 memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_LOCK));
 
-                pBody->u.in.offSurface = (uint64_t)lpSurfaceGlobal->fpVidMem;
+                pBody->u.in.offSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpSurfaceGlobal->fpVidMem);
 
 //            if (lpLock->bHasRect)
@@ -1465 +1463 @@
         memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_COLORKEY_SET));
 
-        pBody->u.in.offSurface = (uint64_t)lpSurfaceGlobal->fpVidMem;
+        pBody->u.in.offSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpSurfaceGlobal->fpVidMem);
         pBody->u.in.hSurf = pDesc->hHostHandle;
         pBody->u.in.flags = vboxVHWAFromDDCKEYs(lpSetColorKey->dwFlags);
@@ -1508 +1506 @@
             memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_BLT));
 
-            pBody->u.in.offSrcSurface = (uint64_t)lpSrcSurfaceGlobal->fpVidMem;
-            pBody->u.in.offDstSurface = (uint64_t)lpDestSurfaceGlobal->fpVidMem;
+            pBody->u.in.offSrcSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpSrcSurfaceGlobal->fpVidMem);
+            pBody->u.in.offDstSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpDestSurfaceGlobal->fpVidMem);
 
             pBody->u.in.hDstSurf = pDestDesc->hHostHandle;
@@ -1601 +1599 @@
         memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_FLIP));
 
-        pBody->u.in.offCurrSurface = (uint64_t)lpCurrSurfaceGlobal->fpVidMem;
-        pBody->u.in.offTargSurface = (uint64_t)lpTargSurfaceGlobal->fpVidMem;
+        pBody->u.in.offCurrSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpCurrSurfaceGlobal->fpVidMem);
+        pBody->u.in.offTargSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpTargSurfaceGlobal->fpVidMem);
 
         pBody->u.in.hTargSurf = pTargDesc->hHostHandle;
@@ -1770 +1768 @@
         memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_OVERLAY_SETPOSITION));
 
-        pBody->u.in.offSrcSurface = (uint64_t)lpSrcSurfaceGlobal->fpVidMem;
-        pBody->u.in.offDstSurface = (uint64_t)lpDestSurfaceGlobal->fpVidMem;
+        pBody->u.in.offSrcSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpSrcSurfaceGlobal->fpVidMem);
+        pBody->u.in.offDstSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpDestSurfaceGlobal->fpVidMem);
 
         pBody->u.in.hDstSurf = pDestDesc->hHostHandle;
@@ -1811 +1809 @@
         memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_OVERLAY_UPDATE));
 
-        pBody->u.in.offSrcSurface = (uint64_t)lpSrcSurfaceGlobal->fpVidMem;
+        pBody->u.in.offSrcSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpSrcSurfaceGlobal->fpVidMem);
 
         pBody->u.in.hSrcSurf = pSrcDesc->hHostHandle;
@@ -1841 +1839 @@
             PVBOXVHWASURFDESC pDestDesc = (PVBOXVHWASURFDESC)lpDestSurfaceGlobal->dwReserved1;
             pBody->u.in.hDstSurf = pDestDesc->hHostHandle;
-            pBody->u.in.offDstSurface = (uint64_t)lpDestSurfaceGlobal->fpVidMem;
+            pBody->u.in.offDstSurface = vboxVHWAVramOffsetFromPDEV(pDev, lpDestSurfaceGlobal->fpVidMem);
         }
 

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

@@ -131 +131 @@
     uint32_t numFourCC;
     HGSMIOFFSET FourCC;
+    ULONG_PTR offVramBase;
     BOOLEAN bVHWAEnabled;
+    BOOLEAN bVHWAInited;
 } VBOXVHWAINFO;
 #endif
@@ -297 +299 @@
 
  #ifdef VBOX_WITH_VIDEOHWACCEL
+
+DECLINLINE(uint64_t) vboxVHWAVramOffsetFromPDEV(PPDEV pDev, ULONG_PTR offPdev)
+{
+    return (uint64_t)(pDev->vhwaInfo.offVramBase + offPdev);
+}
 
 #define VBOXDD_CHECKFLAG(_v, _f) ((_v) & (_f)) == (_f)

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

@@ -154 +154 @@
                 Assert(!err);
 #endif
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                if (!err)
+                    vboxVHWAInit(ppdev);
+#endif
+
                 /* this is not fatal, just means Video 2D acceleration will not be supported */
                 err = 0;

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

@@ -1065 +1065 @@
 }
 
+void vboxVHWAInit(PPDEV ppdev)
+{
+    VHWAQUERYINFO info;
+    DWORD returnedDataLength;
+    DWORD err;
+
+    memset(&info, 0, sizeof (info));
+
+    err = EngDeviceIoControl(ppdev->hDriver,
+            IOCTL_VIDEO_VHWA_QUERY_INFO,
+            NULL,
+            0,
+            &info,
+            sizeof(info),
+            &returnedDataLength);
+    Assert(!err);
+    if(!err)
+    {
+        ppdev->vhwaInfo.offVramBase = info.offVramBase;
+        ppdev->vhwaInfo.bVHWAInited = TRUE;
+    }
+    else
+        ppdev->vhwaInfo.bVHWAInited = FALSE;
+}
+
 # endif
 

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

@@ -139 +139 @@
         )
 
-void vboxVHWAInit()
-{
-}
-
-void vboxVHWATerm()
-{
-}
-
 uint32_t vboxVHWAUnsupportedDDCAPS(uint32_t caps)
 {

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

@@ -2687 +2687 @@
             break;
         }
+# ifdef VBOX_WITH_VIDEOHWACCEL
+        case IOCTL_VIDEO_VHWA_QUERY_INFO:
+        {
+            if (RequestPacket->OutputBufferLength < sizeof (VHWAQUERYINFO))
+            {
+                dprintf(("VBoxVideo::VBoxVideoStartIO: Output buffer too small: %d needed: %d!!!\n",
+                         RequestPacket->OutputBufferLength, sizeof(VHWAQUERYINFO)));
+                RequestPacket->StatusBlock->Status = ERROR_INSUFFICIENT_BUFFER;
+                return FALSE;
+            }
+
+            if (!pDevExt->pPrimary->u.primary.bHGSMI)
+            {
+                RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
+                return FALSE;
+            }
+
+            VHWAQUERYINFO *pInfo = (VHWAQUERYINFO *)RequestPacket->OutputBuffer;
+            pInfo->offVramBase = (ULONG_PTR)pDevExt->ulFrameBufferOffset;
+            RequestPacket->StatusBlock->Information = sizeof (VHWAQUERYINFO);
+            Result = TRUE;
+            break;
+        }
+# endif
 #endif /* VBOX_WITH_HGSMI */
-
         default:
             dprintf(("VBoxVideo::VBoxVideoStartIO: Unsupported %p, fn %d(0x%x)\n",

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

@@ -63 +63 @@
 #define IOCTL_VIDEO_HGSMI_QUERY_PORTPROCS \
     CTL_CODE(FILE_DEVICE_VIDEO, 0x434, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+#define IOCTL_VIDEO_VHWA_QUERY_INFO \
+    CTL_CODE(FILE_DEVICE_VIDEO, 0x435, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 #endif /* VBOX_WITH_HGSMI */
@@ -167 +170 @@
 } HGSMIHANDLERDISABLE;
 
+# ifdef VBOX_WITH_VIDEOHWACCEL
+typedef struct _VHWAQUERYINFO
+{
+    ULONG_PTR offVramBase;
+} VHWAQUERYINFO;
+# endif
+
 #endif /* VBOX_WITH_HGSMI */
 #pragma pack()