Changeset 21596 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 15, 2009 8:06:37 AM (15 years ago)

Author:

vboxsync

Message:

video hw accel: interrupt support in guest video adapter & driver, NetFlt/Adp/win: get rid of alloca

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/dd.c (modified) (2 diffs)
• Display/driver.h (modified) (1 diff)
• Display/vbox.c (modified) (2 diffs)
• Miniport/Makefile.kmk (modified) (1 diff)
• Miniport/VBoxVideo.cpp (modified) (3 diffs)
• Miniport/VBoxVideo.h (modified) (2 diffs)

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

@@ -1055 +1055 @@
         {
             VBOXVHWACMD_SURF_LOCK * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_LOCK);
+            RECT tmpRect, *pRect;
             memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_LOCK));
 
@@ -1075 +1076 @@
             {
                 pBody->u.in.flags |= VBOXVHWA_LOCK_DISCARDCONTENTS;
+//                if(lpLock->bHasRect)
+//                {
+//                    pRect = &lpLock->rArea;
+//                }
+//                else
+//                {
+//                    tmpRect.left=0;
+//                    tmpRect.top=0;
+//                    tmpRect.right=lpSurfaceGlobal->wWidth-1;
+//                    tmpRect.bottom=lpSurfaceGlobal->wHeight-1;
+//                    pRect = &tmpRect;
+//                }
+//
+//                if(vboxVHWARegionIncluded(&pDesc->DirtyRegion, pRect))
+//                {
+//                    vboxVHWARegionClear(&pDesc->DirtyRegion);
+//                }
+//            }
+//            else if(vboxVHWARegionInterse)
                 /* we're not interested in completion, just send the command */
                 vboxVHWACommandSubmitAsynch(pDev, pCmd, vboxVHWAFreeCmdCompletion, NULL);

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

@@ -97 +97 @@
 typedef struct _VBOXVHWAREGION
 {
-    RECT DirtyMem;
+    RECT Rect;
     bool bValid;
 }VBOXVHWAREGION, *PVBOXVHWAREGION;

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

@@ -943 +943 @@
     {
         DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
-        return NULL;
+        return rc;
     }
 
@@ -965 +965 @@
     {
         DISPDBG((0, "VBoxDISP::vboxVHWAQueryHostInfo1: vboxVHWACommandCreate failed\n"));
-        return NULL;
+        return rc;
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -62 +62 @@
 endif
 
+ifdef VBOX_WITH_VIDEOHWACCEL
+VBoxVideo_DEFS += VBOX_WITH_VIDEOHWACCEL
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk
 

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

@@ -74 +74 @@
     InitData.HwFindAdapter = VBoxVideoFindAdapter;
     InitData.HwInitialize = VBoxVideoInitialize;
+#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
+    InitData.HwInterrupt = VBoxVideoInterrupt;
+#else
     InitData.HwInterrupt = NULL;
+#endif
     InitData.HwStartIO = VBoxVideoStartIO;
     InitData.HwResetHw = VBoxVideoResetHW;
@@ -1198 +1202 @@
          VBoxBiosString,
          sizeof(VBoxBiosString));
-
+#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
+      VIDEO_ACCESS_RANGE tmpRanges[1];
+      ULONG slot;
+
+      /* need to call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */
+      VP_STATUS status = VideoPortGetAccessRanges(HwDeviceExtension,
+                                        0,
+                                        NULL,
+                                        1,
+                                        tmpRanges,
+                                        NULL,
+                                        NULL,
+                                        (PULONG) &slot);
+      Assert(status == NO_ERROR );
+//      Assert(AccessRanges[0].RangeStart.QuadPart == tmpRanges[0].RangeStart.QuadPart);
+//      Assert(AccessRanges[0].RangeLength == tmpRanges[0].RangeLength);
+//      Assert(AccessRanges[0].RangeInIoSpace == tmpRanges[0].RangeInIoSpace);
+//      Assert(AccessRanges[0].RangeVisible == tmpRanges[0].RangeVisible);
+//      Assert(AccessRanges[0].RangeShareable == tmpRanges[0].RangeShareable);
+//      Assert(AccessRanges[0].RangePassive == tmpRanges[0].RangePassive);
+
+      /* no matter what we get with VideoPortGetAccessRanges, we assert the default ranges */
+#endif
       rc = VideoPortVerifyAccessRanges(HwDeviceExtension, 1, AccessRanges);
       dprintf(("VBoxVideo::VBoxVideoFindAdapter: VideoPortVerifyAccessRanges returned 0x%x\n", rc));
@@ -1289 +1315 @@
 }
 
+#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
+
+BOOLEAN VBoxVideoInterrupt(PVOID  HwDeviceExtension)
+{
+    PDEVICE_EXTENSION devExt = (PDEVICE_EXTENSION)HwDeviceExtension;
+    PDEVICE_EXTENSION PrimaryExtension = devExt->pPrimary;
+    uint32_t flags = PrimaryExtension->u.primary.pHostFlags->u32HostFlags;
+    if((flags & HGSMIHOSTFLAGS_IRQ) != 0)
+    {
+        if((flags & HGSMIHOSTFLAGS_COMMANDS_PENDING) != 0)
+        {
+            /* schedule a DPC*/
+            BOOLEAN bResult = VideoPortQueueDpc(PrimaryExtension, VBoxVideoHGSMIDpc, NULL);
+            Assert(bResult);
+        }
+        /* clear the IRQ */
+        HGSMIClearIrq (PrimaryExtension);
+        return TRUE;
+    }
+    return FALSE;
+}
+#endif
+
 /**
  * VBoxVideoStartIO

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

@@ -175 +175 @@
    PVIDEO_REQUEST_PACKET RequestPacket);
 
+#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
+BOOLEAN VBoxVideoInterrupt(PVOID  HwDeviceExtension);
+#endif
+
+
 BOOLEAN VBoxVideoResetHW(
    PVOID HwDeviceExtension,
@@ -265 +270 @@
         int iDisplay, /* negative would mean this is a miniport handler */
         uint8_t u8Channel);
+
+VOID VBoxVideoHGSMIDpc(
+    IN PVOID  HwDeviceExtension,
+    IN PVOID  Context
+    );
+
+void HGSMIClearIrq (PDEVICE_EXTENSION PrimaryExtension);
+
 #endif /* VBOX_WITH_HGSMI */
 } /* extern "C" */