Changeset 69847 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

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

119288

Message:

Devices/Graphics: reverted r119268, not entirely correct.

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.hSvr)
-        {
-            /* "HGCM-less" mode. All inited. */
-            return VINF_SUCCESS;
-        }
-
         VBOXCRCMDCTL_DISABLE Disable;
         Disable.Hdr.enmType = VBOXCRCMDCTL_TYPE_DISABLE;
@@ -1328 +1330 @@
     }
 
-    if (!pVdma->CrSrvInfo.hSvr)
-    {
-        /* "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))
@@ -1379 +1374 @@
                 return VERR_INVALID_STATE;
             }
-            if (!pVdma->CrSrvInfo.hSvr)
-            {
-                /* 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);
         }
@@ -1429 +1418 @@
             VGA_SAVED_STATE_PUT_MARKER(pCmd->u.state.pSSM, 4);
 
-            if (!pVdma->CrSrvInfo.hSvr)
-            {
-                /* Done. */
-                return VINF_SUCCESS;
-            }
-
             return pVdma->CrSrvInfo.pfnSaveState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM);
         }
@@ -1450 +1433 @@
 
             VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pCmd->u.state.pSSM, pCmd->u.state.u32Version, 4);
-            if (!pVdma->CrSrvInfo.hSvr)
-            {
-                /* Done. */
-                return VINF_SUCCESS;
-            }
-
             rc = pVdma->CrSrvInfo.pfnLoadState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM, pCmd->u.state.u32Version);
             if (RT_FAILURE(rc))
@@ -1572 +1549 @@
     ASMBitClearRange(aTargetMap, pVGAState->cMonitors, VBOX_VIDEO_MAX_SCREENS);
 
-    if (pVdma->CrSrvInfo.hSvr)
-    {
-        /* 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;
-        }
+    rc = pVdma->CrSrvInfo.pfnResize(pVdma->CrSrvInfo.hSvr, &Screen, aTargetMap);
+    if (RT_FAILURE(rc))
+    {
+        WARN(("pfnResize failed %d\n", rc));
+        return rc;
     }
 
@@ -1641 +1614 @@
             {
                 WARN(("VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE for disabled vdma VBVA\n"));
-                return VERR_INVALID_STATE;
-            }
-            if (!pVdma->CrSrvInfo.hSvr)
-            {
-                /* Unexpected. */
-                WARN(("VBVAEXHOSTCTL_TYPE_GHH_BE_OPAQUE in HGCM-less mode\n"));
                 return VERR_INVALID_STATE;
             }
@@ -1928 +1895 @@
         }
         default:
-            if (!pVdma->CrSrvInfo.hSvr)
-            {
-                /* Unexpected. */
-                WARN(("no HGCM"));
-                return -1;
-            }
             return pVdma->CrSrvInfo.pfnCmd(pVdma->CrSrvInfo.hSvr, pCmd, cbCmd);
     }
@@ -2839 +2800 @@
                 {
                     pVGAState->pVdma = pVdma;
-
-                    /* No HGCM service if VMSVGA is enabled. */
-                    if (!pVGAState->fVMSVGAEnabled)
-                    {
-                        int rcIgnored = vboxVDMACrCtlHgsmiSetup(pVdma); NOREF(rcIgnored); /** @todo is this ignoring intentional? */
-                    }
+                    int rcIgnored = vboxVDMACrCtlHgsmiSetup(pVdma); NOREF(rcIgnored); /** @todo is this ignoring intentional? */
                     return VINF_SUCCESS;
                 }
@@ -2887 +2843 @@
         return VINF_SUCCESS;
 #ifdef VBOX_WITH_CRHGSMI
-    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);
-    }
+    vdmaVBVACtlDisableSync(pVdma);
     VBoxVDMAThreadCleanup(&pVdma->Thread);
     VBoxVBVAExHSTerm(&pVdma->CmdVbva);