Changeset 51101 in vbox for trunk

Timestamp:

Apr 17, 2014 8:36:20 PM (11 years ago)

Author:

vboxsync

Message:

DevVGA/CrCmd: multimon support fix (some more to follow)

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VDMA.cpp (modified) (12 diffs)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

@@ -14 +14 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-//#include <VBox/VMMDev.h>
+#include <VBox/VMMDev.h>
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/VBoxVideo.h>
@@ -107 +107 @@
     VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE,
     VBVAEXHOSTCTL_TYPE_GHH_ENABLE,
+    VBVAEXHOSTCTL_TYPE_GHH_ENABLE_PAUSED,
     VBVAEXHOSTCTL_TYPE_GHH_DISABLE,
     VBVAEXHOSTCTL_TYPE_GH_MIN = VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE,
@@ -254 +255 @@
 }
 
+static int VBoxVBVAExHPPause(struct VBVAEXHOSTCONTEXT *pCmdVbva)
+{
+    if (pCmdVbva->i32EnableState < VBVAEXHOSTCONTEXT_ESTATE_PAUSED)
+    {
+        WARN(("Invalid state\n"));
+        return VERR_INVALID_STATE;
+    }
+
+    ASMAtomicWriteS32(&pCmdVbva->i32EnableState, VBVAEXHOSTCONTEXT_ESTATE_PAUSED);
+    return VINF_SUCCESS;
+}
+
+static int VBoxVBVAExHPResume(struct VBVAEXHOSTCONTEXT *pCmdVbva)
+{
+    if (pCmdVbva->i32EnableState != VBVAEXHOSTCONTEXT_ESTATE_PAUSED)
+    {
+        WARN(("Invalid state\n"));
+        return VERR_INVALID_STATE;
+    }
+
+    ASMAtomicWriteS32(&pCmdVbva->i32EnableState, VBVAEXHOSTCONTEXT_ESTATE_ENABLED);
+    return VINF_SUCCESS;
+}
+
+
 static bool vboxVBVAExHPCheckProcessCtlInternal(struct VBVAEXHOSTCONTEXT *pCmdVbva, VBVAEXHOSTCTL* pCtl)
 {
@@ -259 +285 @@
     {
         case VBVAEXHOSTCTL_TYPE_HH_INTERNAL_PAUSE:
-            if (pCmdVbva->i32EnableState > VBVAEXHOSTCONTEXT_ESTATE_PAUSED)
-                ASMAtomicWriteS32(&pCmdVbva->i32EnableState, VBVAEXHOSTCONTEXT_ESTATE_PAUSED);
+        {
+            int rc = VBoxVBVAExHPPause(pCmdVbva);
             VBoxVBVAExHPDataCompleteCtl(pCmdVbva, pCtl, VINF_SUCCESS);
             return true;
+        }
         case VBVAEXHOSTCTL_TYPE_HH_INTERNAL_RESUME:
-            if (pCmdVbva->i32EnableState == VBVAEXHOSTCONTEXT_ESTATE_PAUSED)
-                ASMAtomicWriteS32(&pCmdVbva->i32EnableState, VBVAEXHOSTCONTEXT_ESTATE_ENABLED);
+        {
+            int rc = VBoxVBVAExHPResume(pCmdVbva);
             VBoxVBVAExHPDataCompleteCtl(pCmdVbva, pCtl, VINF_SUCCESS);
             return true;
+        }
         default:
             return false;
@@ -1352 +1380 @@
 static int vboxVDMACrGuestCtlProcess(struct VBOXVDMAHOST *pVdma, VBVAEXHOSTCTL *pCmd)
 {
-    switch (pCmd->enmType)
+    VBVAEXHOSTCTL_TYPE enmType = pCmd->enmType;
+    switch (enmType)
     {
        case VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE:
@@ -1362 +1391 @@
            return pVdma->CrSrvInfo.pfnGuestCtl(pVdma->CrSrvInfo.hSvr, pCmd->u.cmd.pu8Cmd, pCmd->u.cmd.cbCmd);
         case VBVAEXHOSTCTL_TYPE_GHH_ENABLE:
+        case VBVAEXHOSTCTL_TYPE_GHH_ENABLE_PAUSED:
         {
             VBVAENABLE *pEnable = (VBVAENABLE *)pCmd->u.cmd.pu8Cmd;
             Assert(pCmd->u.cmd.cbCmd == sizeof (VBVAENABLE));
             uint32_t u32Offset = pEnable->u32Offset;
-            return vdmaVBVAEnableProcess(pVdma, u32Offset);
+            int rc = vdmaVBVAEnableProcess(pVdma, u32Offset);
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("vdmaVBVAEnableProcess failed %d\n", rc));
+                return rc;
+            }
+
+            if (enmType == VBVAEXHOSTCTL_TYPE_GHH_ENABLE_PAUSED)
+            {
+                rc = VBoxVBVAExHPPause(&pVdma->CmdVbva);
+                if (!RT_SUCCESS(rc))
+                {
+                    WARN(("VBoxVBVAExHPPause failed %d\n", rc));
+                    return rc;
+                }
+            }
+
+            return VINF_SUCCESS;
         }
         case VBVAEXHOSTCTL_TYPE_GHH_DISABLE:
@@ -2639 +2686 @@
 }
 
-static int vdmaVBVACtlEnableSubmitInternal(PVBOXVDMAHOST pVdma, VBVAENABLE *pEnable, PFNVBVAEXHOSTCTL_COMPLETE pfnComplete, void *pvComplete)
+static int vdmaVBVACtlEnableSubmitInternal(PVBOXVDMAHOST pVdma, VBVAENABLE *pEnable, bool fPaused, PFNVBVAEXHOSTCTL_COMPLETE pfnComplete, void *pvComplete)
 {
     int rc;
-    VBVAEXHOSTCTL* pHCtl = VBoxVBVAExHCtlCreate(&pVdma->CmdVbva, VBVAEXHOSTCTL_TYPE_GHH_ENABLE);
+    VBVAEXHOSTCTL* pHCtl = VBoxVBVAExHCtlCreate(&pVdma->CmdVbva, fPaused ? VBVAEXHOSTCTL_TYPE_GHH_ENABLE_PAUSED : VBVAEXHOSTCTL_TYPE_GHH_ENABLE);
     if (pHCtl)
     {
@@ -2667 +2714 @@
 }
 
-static int vdmaVBVACtlEnableSubmitSync(PVBOXVDMAHOST pVdma, uint32_t offVram)
+static int vdmaVBVACtlEnableSubmitSync(PVBOXVDMAHOST pVdma, uint32_t offVram, bool fPaused)
 {
     VBVAENABLE Enable = {0};
@@ -2682 +2729 @@
     }
 
-    rc = vdmaVBVACtlEnableSubmitInternal(pVdma, &Enable, vdmaVBVACtlSubmitSyncCompletion, &Data);
+    rc = vdmaVBVACtlEnableSubmitInternal(pVdma, &Enable, fPaused, vdmaVBVACtlSubmitSyncCompletion, &Data);
     if (RT_SUCCESS(rc))
     {
@@ -2731 +2778 @@
 }
 
+static DECLCALLBACK(int) vdmaVBVANotifyEnable(PVGASTATE pVGAState)
+{
+    for (uint32_t i = 0; i < pVGAState->cMonitors; i++)
+    {
+        int rc = pVGAState->pDrv->pfnVBVAEnable (pVGAState->pDrv, i, NULL);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("pfnVBVAEnable failed %d\n", rc));
+            for (uint32_t j = 0; j < i; j++)
+            {
+                pVGAState->pDrv->pfnVBVADisable (pVGAState->pDrv, j);
+            }
+
+            return rc;
+        }
+    }
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) vdmaVBVANotifyDisable(PVGASTATE pVGAState)
+{
+    for (uint32_t i = 0; i < pVGAState->cMonitors; i++)
+    {
+        pVGAState->pDrv->pfnVBVADisable (pVGAState->pDrv, i);
+    }
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(void) vboxCmdVBVACmdCtlGuestEnableDisableCompletion(VBVAEXHOSTCONTEXT *pVbva, struct VBVAEXHOSTCTL *pCtl, int rc, void *pvContext)
+{
+    if (rc == VINF_SUCCESS)
+    {
+        /* we need to inform Main about VBVA enable/disable
+         * main expects notifications to be done from the main thread
+         * submit it there */
+        PVBOXVDMAHOST pVdma = RT_FROM_MEMBER(pVbva, VBOXVDMAHOST, CmdVbva);
+        PVGASTATE pVGAState = pVdma->pVGAState;
+
+        if (VBoxVBVAExHSIsEnabled(&pVdma->CmdVbva))
+            VMR3ReqCallNoWait(PDMDevHlpGetVM(pVGAState->pDevInsR3), VMCPUID_ANY, (PFNRT)vdmaVBVANotifyEnable, 1, pVGAState);
+        else
+            VMR3ReqCallNoWait(PDMDevHlpGetVM(pVGAState->pDevInsR3), VMCPUID_ANY, (PFNRT)vdmaVBVANotifyDisable, 1, pVGAState);
+    }
+
+    vboxCmdVBVACmdCtlGuestCompletion(pVbva, pCtl, rc, pvContext);
+}
+
 static int vdmaVBVACtlEnableDisableSubmitInternal(PVBOXVDMAHOST pVdma, VBVAENABLE *pEnable, PFNVBVAEXHOSTCTL_COMPLETE pfnComplete, void *pvComplete)
 {
     bool fEnable = ((pEnable->u32Flags & (VBVA_F_ENABLE | VBVA_F_DISABLE)) == VBVA_F_ENABLE);
     if (fEnable)
-        return vdmaVBVACtlEnableSubmitInternal(pVdma, pEnable, pfnComplete, pvComplete);
+        return vdmaVBVACtlEnableSubmitInternal(pVdma, pEnable, false, pfnComplete, pvComplete);
     return vdmaVBVACtlDisableSubmitInternal(pVdma, pEnable, pfnComplete, pvComplete);
 }
@@ -2742 +2836 @@
 {
     VBoxSHGSMICommandMarkAsynchCompletion(&pEnable->Hdr);
-    int rc = vdmaVBVACtlEnableDisableSubmitInternal(pVdma, &pEnable->Enable, vboxCmdVBVACmdCtlGuestCompletion, pVdma);
+    int rc = vdmaVBVACtlEnableDisableSubmitInternal(pVdma, &pEnable->Enable, vboxCmdVBVACmdCtlGuestEnableDisableCompletion, pVdma);
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
@@ -3071 +3165 @@
     {
 #ifdef VBOX_WITH_CRHGSMI
-        rc = vdmaVBVACtlEnableSubmitSync(pVdma, u32);
+        rc = vdmaVBVACtlEnableSubmitSync(pVdma, u32, true);
         AssertRCReturn(rc, rc);
 
-        rc = vdmaVBVAPause(pVdma);
-        AssertRCReturn(rc, rc);
+        Assert(pVdma->CmdVbva.i32State == VBVAEXHOSTCONTEXT_ESTATE_PAUSED);
+
+        vdmaVBVANotifyEnable(pVdma->pVGAState);
 
         VBVAEXHOSTCTL HCtl;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4772 +4772 @@
 }
 
-static void crVBoxServerCrCmdBltPrimaryUpdate(const RTRECT *pRects, uint32_t cRects, uint32_t u32PrimaryID)
+static void crVBoxServerCrCmdBltPrimaryUpdate(const VBVAINFOSCREEN *pScreen, const RTRECT *pRects, uint32_t cRects, uint32_t u32PrimaryID)
 {
     if (!cRects)
@@ -4827 +4827 @@
     if (dirtyRect.xRight - dirtyRect.xLeft)
     {
-        cr_server.CrCmdClientInfo.pfnCltScrUpdateEnd(cr_server.CrCmdClientInfo.hCltScr, u32PrimaryID, dirtyRect.xLeft, dirtyRect.yTop,
+        cr_server.CrCmdClientInfo.pfnCltScrUpdateEnd(cr_server.CrCmdClientInfo.hCltScr, u32PrimaryID, pScreen->i32OriginX + dirtyRect.xLeft, pScreen->i32OriginY + dirtyRect.yTop,
                                            dirtyRect.xRight - dirtyRect.xLeft, dirtyRect.yBottom - dirtyRect.yTop);
     }
@@ -4937 +4937 @@
 
         crServerDispatchVBoxTexPresent(texId, u32PrimaryID, pCmd->Hdr.Pos.x, pCmd->Hdr.Pos.y, cRects, (const GLint*)pRects);
+
+        return 0;
     }
     else
@@ -4956 +4958 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
 
     return 0;
@@ -5107 +5109 @@
 
         crServerDispatchVBoxTexPresent(texId, u32PrimaryID, pCmd->Hdr.Pos.x, pCmd->Hdr.Pos.y, cRects, (const GLint*)pRects);
+
+        return 0;
     }
     else
@@ -5137 +5141 @@
     }
 
-    crVBoxServerCrCmdBltPrimaryUpdate(pRects, cRects, u32PrimaryID);
+    crVBoxServerCrCmdBltPrimaryUpdate(CrFbGetScreenInfo(hFb), pRects, cRects, u32PrimaryID);
 
     return 0;