Changeset 25069 in vbox

Timestamp:

Nov 28, 2009 10:17:22 AM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA: enable VRDP commands only if there are connected RDP clients (update).

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (7 diffs)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -108 +108 @@
     mfu32PendingVideoAccelDisable = false;
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
+#ifdef VBOX_WITH_HGSMI
+    mu32UpdateVBVAFlags = 0;
+#endif
 
     return S_OK;
@@ -1181 +1185 @@
         }
     }
+}
 
 #ifdef VBOX_WITH_HGSMI
+static void vbvaSetMemoryFlagsHGSMI (unsigned uScreenId,
+                                     uint32_t fu32SupportedOrders,
+                                     bool fVideoAccelVRDP,
+                                     DISPLAYFBINFO *pFBInfo)
+{
+    LogFlowFunc(("HGSMI[%d]: %p\n", uScreenId, pFBInfo->pVBVAHostFlags));
+
+    if (pFBInfo->pVBVAHostFlags)
+    {
+        uint32_t fu32HostEvents = VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET;
+
+        if (pFBInfo->fVBVAEnabled)
+        {
+            fu32HostEvents |= VBVA_F_MODE_ENABLED;
+
+            if (fVideoAccelVRDP)
+            {
+                fu32HostEvents |= VBVA_F_MODE_VRDP;
+            }
+        }
+
+        ASMAtomicOrU32(&pFBInfo->pVBVAHostFlags->u32HostEvents, fu32HostEvents);
+        ASMAtomicWriteU32(&pFBInfo->pVBVAHostFlags->u32SupportedOrders, fu32SupportedOrders);
+
+        LogFlowFunc(("    fu32HostEvents = 0x%08X, fu32SupportedOrders = 0x%08X\n", fu32HostEvents, fu32SupportedOrders));
+    }
+}
+
+static void vbvaSetMemoryFlagsAllHGSMI (uint32_t fu32SupportedOrders,
+                                        bool fVideoAccelVRDP,
+                                        DISPLAYFBINFO *paFBInfos,
+                                        unsigned cFBInfos)
+{
+    unsigned uScreenId;
+
     for (uScreenId = 0; uScreenId < cFBInfos; uScreenId++)
     {
-        LogFlowFunc(("HGSMI[%d]: %p\n", uScreenId, paFBInfos[uScreenId].pVBVAHostFlags));
-        if (paFBInfos[uScreenId].pVBVAHostFlags)
-        {
-            uint32_t fu32HostEvents = VBOX_VIDEO_INFO_HOST_EVENTS_F_VRDP_RESET;
-
-            if (fVideoAccelEnabled)
-            {
-                fu32HostEvents |= VBVA_F_MODE_ENABLED;
-
-                if (fVideoAccelVRDP)
-                {
-                    fu32HostEvents |= VBVA_F_MODE_VRDP;
-                }
-            }
-
-            paFBInfos[uScreenId].pVBVAHostFlags->u32HostEvents |= fu32HostEvents;
-            paFBInfos[uScreenId].pVBVAHostFlags->u32SupportedOrders = fu32SupportedOrders;
-        }
-    }
+        vbvaSetMemoryFlagsHGSMI(uScreenId, fu32SupportedOrders, fVideoAccelVRDP, &paFBInfos[uScreenId]);
+    }
+}
 #endif /* VBOX_WITH_HGSMI */
-}
 
 bool Display::VideoAccelAllowed (void)
@@ -1387 +1410 @@
 
         vbvaSetMemoryFlags (mpVbvaMemory, mfVideoAccelEnabled, mfVideoAccelVRDP, mfu32SupportedOrders, maFramebuffers, mcMonitors);
+#ifdef VBOX_WITH_HGSMI
+        /* Here is VRDP-IN thread. Process the request in vbvaUpdateBegin under DevVGA lock on an EMT. */
+        ASMAtomicIncU32(&mu32UpdateVBVAFlags);
+#endif /* VBOX_WITH_HGSMI */
 
         LogRel(("VBVA: VRDP acceleration has been disabled.\n"));
@@ -1402 +1429 @@
 
         vbvaSetMemoryFlags (mpVbvaMemory, mfVideoAccelEnabled, mfVideoAccelVRDP, mfu32SupportedOrders, maFramebuffers, mcMonitors);
+#ifdef VBOX_WITH_HGSMI
+        /* Here is VRDP-IN thread. Process the request in vbvaUpdateBegin under DevVGA lock on an EMT. */
+        ASMAtomicIncU32(&mu32UpdateVBVAFlags);
+#endif /* VBOX_WITH_HGSMI */
 
         LogRel(("VBVA: VRDP acceleration has been requested.\n"));
@@ -3160 +3191 @@
     pThis->maFramebuffers[uScreenId].pVBVAHostFlags = pHostFlags;
 
-    vbvaSetMemoryFlags(NULL, true, pThis->mfVideoAccelVRDP, pThis->mfu32SupportedOrders, pThis->maFramebuffers, pThis->mcMonitors);
+    vbvaSetMemoryFlagsHGSMI(uScreenId, pThis->mfu32SupportedOrders, pThis->mfVideoAccelVRDP, &pThis->maFramebuffers[uScreenId]);
 
     return VINF_SUCCESS;
@@ -3173 +3204 @@
 
     pThis->maFramebuffers[uScreenId].fVBVAEnabled = false;
+
+    vbvaSetMemoryFlagsHGSMI(uScreenId, 0, false, &pThis->maFramebuffers[uScreenId]);
+
     pThis->maFramebuffers[uScreenId].pVBVAHostFlags = NULL;
 }
@@ -3183 +3217 @@
     Display *pThis = pDrv->pDisplay;
     DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
+
+    if (ASMAtomicReadU32(&pThis->mu32UpdateVBVAFlags) > 0)
+    {
+        vbvaSetMemoryFlagsAllHGSMI(pThis->mfu32SupportedOrders, pThis->mfVideoAccelVRDP, pThis->maFramebuffers, pThis->mcMonitors);
+        ASMAtomicDecU32(&pThis->mu32UpdateVBVAFlags);
+    }
 
     if (RT_LIKELY(pFBInfo->u32ResizeStatus == ResizeStatus_Void))

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -361 +361 @@
     void videoAccelFlush (void);
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
+#ifdef VBOX_WITH_HGSMI
+    volatile uint32_t mu32UpdateVBVAFlags;
+#endif
 };