Changeset 69848 in vbox for trunk/src/VBox

Timestamp:

Nov 27, 2017 6:08:01 PM (7 years ago)

Author:

vboxsync

Message:

Devices/Graphics: VDMA: ability to work when SharedOpenGL HGCM service is disabled (second try).

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (10 diffs)

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

@@ -1278 +1278 @@
     }
 
-    if (!pVdma->CrSrvInfo.pfnEnable)
-    {
-# ifdef DEBUG_misha
-        WARN(("pfnEnable is NULL\n"));
-        return VERR_NOT_SUPPORTED;
-# endif
-    }
-
     int rc = VBoxVBVAExHSEnable(&pVdma->CmdVbva, pVBVA);
     if (RT_SUCCESS(rc))
     {
+        if (!pVdma->CrSrvInfo.pfnEnable)
+        {
+            /* "HGCM-less" mode. All inited. */
+            return VINF_SUCCESS;
+        }
+
         VBOXCRCMDCTL_DISABLE Disable;
         Disable.Hdr.enmType = VBOXCRCMDCTL_TYPE_DISABLE;
@@ -1330 +1328 @@
     }
 
+    if (!pVdma->CrSrvInfo.pfnDisable)
+    {
+        /* "HGCM-less" mode. Just undo what vdmaVBVAEnableProcess did. */
+        VBoxVBVAExHSDisable(&pVdma->CmdVbva);
+        return VINF_SUCCESS;
+    }
+
     int rc = pVdma->CrSrvInfo.pfnDisable(pVdma->CrSrvInfo.hSvr);
     if (RT_SUCCESS(rc))
@@ -1374 +1379 @@
                 return VERR_INVALID_STATE;
             }
+            if (!pVdma->CrSrvInfo.pfnHostCtl)
+            {
+                /* Should not be. */
+                WARN(("VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE for HGCM-less mode\n"));
+                return VERR_INVALID_STATE;
+            }
             return pVdma->CrSrvInfo.pfnHostCtl(pVdma->CrSrvInfo.hSvr, pCmd->u.cmd.pu8Cmd, pCmd->u.cmd.cbCmd);
         }
@@ -1418 +1429 @@
             VGA_SAVED_STATE_PUT_MARKER(pCmd->u.state.pSSM, 4);
 
+            if (!pVdma->CrSrvInfo.pfnSaveState)
+            {
+                /* Done. */
+                return VINF_SUCCESS;
+            }
+
             return pVdma->CrSrvInfo.pfnSaveState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM);
         }
@@ -1433 +1450 @@
 
             VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pCmd->u.state.pSSM, pCmd->u.state.u32Version, 4);
+            if (!pVdma->CrSrvInfo.pfnLoadState)
+            {
+                /* Done. */
+                return VINF_SUCCESS;
+            }
+
             rc = pVdma->CrSrvInfo.pfnLoadState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM, pCmd->u.state.u32Version);
             if (RT_FAILURE(rc))
@@ -1549 +1572 @@
     ASMBitClearRange(aTargetMap, pVGAState->cMonitors, VBOX_VIDEO_MAX_SCREENS);
 
-    rc = pVdma->CrSrvInfo.pfnResize(pVdma->CrSrvInfo.hSvr, &Screen, aTargetMap);
-    if (RT_FAILURE(rc))
-    {
-        WARN(("pfnResize failed %d\n", rc));
-        return rc;
+    if (pVdma->CrSrvInfo.pfnResize)
+    {
+        /* Also inform the HGCM service, if it is there. */
+        rc = pVdma->CrSrvInfo.pfnResize(pVdma->CrSrvInfo.hSvr, &Screen, aTargetMap);
+        if (RT_FAILURE(rc))
+        {
+            WARN(("pfnResize failed %d\n", rc));
+            return rc;
+        }
     }
 
@@ -1614 +1641 @@
             {
                 WARN(("VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE for disabled vdma VBVA\n"));
+                return VERR_INVALID_STATE;
+            }
+            if (!pVdma->CrSrvInfo.pfnGuestCtl)
+            {
+                /* Unexpected. */
+                WARN(("VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE in HGCM-less mode\n"));
                 return VERR_INVALID_STATE;
             }
@@ -1895 +1928 @@
         }
         default:
+            if (!pVdma->CrSrvInfo.pfnCmd)
+            {
+                /* Unexpected. */
+                WARN(("no HGCM"));
+                return -1;
+            }
             return pVdma->CrSrvInfo.pfnCmd(pVdma->CrSrvInfo.hSvr, pCmd, cbCmd);
     }
@@ -2800 +2839 @@
                 {
                     pVGAState->pVdma = pVdma;
-                    int rcIgnored = vboxVDMACrCtlHgsmiSetup(pVdma); NOREF(rcIgnored); /** @todo is this ignoring intentional? */
+
+                    /* No HGCM service if VMSVGA is enabled. */
+                    if (!pVGAState->fVMSVGAEnabled)
+                    {
+                        int rcIgnored = vboxVDMACrCtlHgsmiSetup(pVdma); NOREF(rcIgnored); /** @todo is this ignoring intentional? */
+                    }
                     return VINF_SUCCESS;
                 }
@@ -2843 +2887 @@
         return VINF_SUCCESS;
 #ifdef VBOX_WITH_CRHGSMI
-    vdmaVBVACtlDisableSync(pVdma);
+    if (pVdma->pVGAState->fVMSVGAEnabled)
+        VBoxVBVAExHSDisable(&pVdma->CmdVbva);
+    else
+    {
+        /** @todo Remove. It does nothing because pVdma->CmdVbva is already disabled at this point
+         *        as the result of the SharedOpenGL HGCM service unloading.
+         */
+        vdmaVBVACtlDisableSync(pVdma);
+    }
     VBoxVDMAThreadCleanup(&pVdma->Thread);
     VBoxVBVAExHSTerm(&pVdma->CmdVbva);