Changeset 87904 in vbox

Timestamp:

Mar 1, 2021 6:14:51 PM (4 years ago)

Author:

vboxsync

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

142990

Message:

DevVGA,DisplayImpl.cpp,pdmifs.h: Don't require EMT for pfnUpdateDisplayAll and pfnCopyRect. (Prep for moving real clock timers to thread.) bugref:9943

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (3 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -521 +521 @@
      * @param   pInterface          Pointer to this interface.
      * @param   fFailOnResize       Fail is a resize is pending.
-     * @thread  The emulation thread.
+     * @thread  The emulation thread - bird sees no need for EMT here!
      */
     DECLR3CALLBACKMEMBER(int, pfnUpdateDisplayAll,(PPDMIDISPLAYPORT pInterface, bool fFailOnResize));
@@ -646 +646 @@
      * @param   cbDstLine           The line length of the destination frame buffer.
      * @param   cDstBitsPerPixel    The pixel depth of the destination.
-     * @thread  The emulation thread.
+     * @thread  The emulation thread - bird sees no need for EMT here!
      */
     DECLR3CALLBACKMEMBER(int, pfnCopyRect,(PPDMIDISPLAYPORT pInterface, uint32_t cx, uint32_t cy,
@@ -807 +807 @@
      *
      * @param   pInterface          Pointer to this interface.
-     * @thread  The emulation thread.
+     * @thread  The emulation thread or timer queue thread.
      */
     DECLR3CALLBACKMEMBER(void, pfnRefresh,(PPDMIDISPLAYCONNECTOR pInterface));

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

@@ -4738 +4738 @@
     PPDMDEVINS  pDevIns = pThisCC->pDevIns;
     PVGASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
-    PDMDEV_ASSERT_EMT(pDevIns);
 
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_SEM_BUSY);
@@ -4785 +4784 @@
  * Internal vgaR3PortUpdateDisplayAll worker called under pThis->CritSect.
  */
+/** @todo Why the 'vboxR3' prefix? */
 static int vboxR3UpdateDisplayAllInternal(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC, bool fFailOnResize)
 {
 # ifdef VBOX_WITH_VMSVGA
-    if (    !pThis->svga.fEnabled
-        ||  pThis->svga.fTraces)
-    {
+    if (   !pThis->svga.fEnabled
+        || pThis->svga.fTraces)
 # endif
-    /* The dirty bits array has been just cleared, reset handlers as well. */
-    if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
-        PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
-# ifdef VBOX_WITH_VMSVGA
-    }
-# endif
+    {
+        /* The dirty bits array has been just cleared, reset handlers as well. */
+        if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
+            PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+    }
     if (pThis->fRemappedVGA)
     {
@@ -4819 +4817 @@
     PPDMDEVINS  pDevIns = pThisCC->pDevIns;
     PVGASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
-    PDMDEV_ASSERT_EMT(pDevIns);
 
     /* This is called both in VBVA mode and normal modes. */

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -976 +976 @@
 #ifndef VBOX_WITH_HGSMI
     if (!mVideoAccelLegacy.fVideoAccelEnabled)
-    {
 #else
     if (!mVideoAccelLegacy.fVideoAccelEnabled && !maFramebuffers[uScreenId].fVBVAEnabled)
-    {
-#endif /* VBOX_WITH_HGSMI */
+#endif
+    {
         /* When VBVA is enabled, the VRDP server is informed
          * either in VideoAccelFlush or displayVBVAUpdateProcess.
@@ -2306 +2305 @@
 }
 
+/** @todo r=bird: cannot quite see why this would be required to run on an
+ *        EMT any more.  It's not an issue in the COM methods, but for the
+ *        VGA device interface it is an issue, see querySourceBitmap. */
 /*static*/ DECLCALLBACK(int) Display::i_InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll)
 {
@@ -2569 +2571 @@
 
         if (fInvalidate)
+#if 1 /* bird: Cannot see why this needs to run on an EMT. It deadlocks now with timer callback moving to non-EMT worker threads. */
+            Display::i_InvalidateAndUpdateEMT(this, aScreenId, false /*fUpdateAll*/);
+#else
             VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
                              3, this, aScreenId, false);
+#endif
     }