Changeset 22548 in vbox

Timestamp:

Aug 28, 2009 11:10:39 AM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA use port IO for guest commands in display driver instead of miniport callback.

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

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

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

@@ -207 +207 @@
 
     HVBOXVIDEOHGSMI hMpHGSMI; /* context handler passed to miniport HGSMI callbacks */
-    PFNVBOXVIDEOHGSMIPOSTCOMMAND pfnHGSMIGHCommandPost; /* called to post the guest command (offset) to the host */
     PFNVBOXVIDEOHGSMICOMPLETION pfnHGSMICommandComplete; /* called to complete the command we receive from the miniport */
     PFNVBOXVIDEOHGSMICOMMANDS   pfnHGSMIRequestCommands; /* called to requests the commands posted to us from the host */
+
+    RTIOPORT IOPortGuestCommand;
 
     PVOID pVideoPortContext;

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

@@ -123 +123 @@
 
             ppdev->hMpHGSMI = Callbacks.hContext;
-            ppdev->pfnHGSMIGHCommandPost = Callbacks.pfnHGSMIGHCommandPost;
             ppdev->pfnHGSMICommandComplete = Callbacks.pfnCompletionHandler;
             ppdev->pfnHGSMIRequestCommands = Callbacks.pfnRequestCommandsHandler;
@@ -272 +271 @@
 
             ppdev->bHGSMISupported = FALSE;
+        }
+        else
+        {
+            ppdev->IOPortGuestCommand = info.IOPortGuestCommand;
         }
     }

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

@@ -347 +347 @@
     DISPDBG((0, "VBoxDISP::vboxHGSMIBufferSubmit: offset 0x%x\n", offBuffer));
 
-    ppdev->pfnHGSMIGHCommandPost(ppdev->hMpHGSMI, offBuffer);
+    ASMOutU32(ppdev->IOPortGuestCommand, offBuffer);
 }
 

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

@@ -1964 +1964 @@
             pInfo->u32MinVBVABufferSize = VBVA_MIN_BUFFER_SIZE;
 
+            pInfo->IOPortGuestCommand = pDevExt->pPrimary->u.primary.IOPortGuest;
+
             RequestPacket->StatusBlock->Information = sizeof(QUERYHGSMIRESULT);
             Result = TRUE;
@@ -1990 +1992 @@
 
             pInfo->hContext = pDevExt;
-            pInfo->pfnHGSMIGHCommandPost = hgsmiGHCommandPost;
             pInfo->pfnCompletionHandler = hgsmiHostCmdComplete;
             pInfo->pfnRequestCommandsHandler = hgsmiHostCmdRequest;

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

@@ -368 +368 @@
                                 PVIDEO_POINTER_ATTRIBUTES pointerAttr,
                                 uint32_t cbLength);
-DECLCALLBACK(void) hgsmiGHCommandPost(HVBOXVIDEOHGSMI hHGSMI, HGSMIOFFSET offCmd);
 DECLCALLBACK(void) hgsmiHostCmdComplete (HVBOXVIDEOHGSMI hHGSMI, struct _VBVAHOSTCMD * pCmd);
 DECLCALLBACK(int) hgsmiHostCmdRequest (HVBOXVIDEOHGSMI hHGSMI, uint8_t u8Channel, struct _VBVAHOSTCMD ** ppCmd);

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

@@ -122 +122 @@
     uint32_t u32DisplayInfoSize;
 
-    /* Minimum size of the VBAV buffer. */
+    /* Minimum size of the VBVA buffer. */
     uint32_t u32MinVBVABufferSize;
+
+    /* IO port to submit guest HGSMI commands. */
+    RTIOPORT IOPortGuestCommand;
 } QUERYHGSMIRESULT;
 
@@ -133 +136 @@
 {
     HVBOXVIDEOHGSMI hContext;
-    PFNVBOXVIDEOHGSMIPOSTCOMMAND pfnHGSMIGHCommandPost;
     PFNVBOXVIDEOHGSMICOMPLETION pfnCompletionHandler;
     PFNVBOXVIDEOHGSMICOMMANDS   pfnRequestCommandsHandler;