Changeset 24931 in vbox for trunk/src

Timestamp:

Nov 25, 2009 10:19:40 AM (15 years ago)

Author:

vboxsync

Message:

DisplayImpl: VBVA lock (xTracker 4463).

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1322 +1322 @@
         mpVbvaMemory->indexRecordFree = 0;
 
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+        mfu32PendingVideoAccelDisable = false;
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
         LogRel(("VBVA: Enabled.\n"));
     }
@@ -2281 +2285 @@
 }
 
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+int Display::DrawToScreenEMT(Display *pDisplay, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height)
+{
+    int rc;
+    pDisplay->vbvaLock();
+    rc = pDisplay->mpDrv->pUpPort->pfnDisplayBlt(pDisplay->mpDrv->pUpPort, address, x, y, width, height);
+    pDisplay->vbvaUnlock();
+    return rc;
+}
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
 
 STDMETHODIMP Display::DrawToScreen (BYTE *address, ULONG x, ULONG y,
@@ -2314 +2328 @@
      */
 #ifdef VBOX_WITH_OLD_VBVA_LOCK
-    int rcVBox = 0;
-// @todo vbva   int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)Display::DrawToScreenEMT, 6,
-//                                  this, address, x, y, width, height);
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)Display::DrawToScreenEMT, 6,
+                                 this, address, x, y, width, height);
 #else
     int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)mpDrv->pUpPort->pfnDisplayBlt, 6,
@@ -2347 +2360 @@
 }
 
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+void Display::InvalidateAndUpdateEMT(Display *pDisplay)
+{
+    pDisplay->vbvaLock();
+    pDisplay->mpDrv->pUpPort->pfnUpdateDisplayAll(pDisplay->mpDrv->pUpPort);
+    pDisplay->vbvaUnlock();
+}
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
 /**
  * Does a full invalidation of the VM display and instructs the VM
@@ -2376 +2398 @@
     /* pdm.h says that this has to be called from the EMT thread */
 #ifdef VBOX_WITH_OLD_VBVA_LOCK
-    int rcVBox = 0;
-// #todo vbva    int rcVBox = VMR3ReqCallVoidWait(pVM, VMCPUID_ANY, (PFNRT)Display::InvalidateAndUpdateEMT,
-//                                     1, this);
+    int rcVBox = VMR3ReqCallVoidWait(pVM, VMCPUID_ANY, (PFNRT)Display::InvalidateAndUpdateEMT,
+                                     1, this);
 #else
     int rcVBox = VMR3ReqCallVoidWait(pVM, VMCPUID_ANY,
@@ -2709 +2730 @@
                 /* No VBVA do a display update. */
                 DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN];
-                if (!pFBInfo->pFramebuffer.isNull())
+                if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
                     Assert(pDrv->Connector.pu8Data);
-                    Assert(pFBInfo->u32ResizeStatus == ResizeStatus_Void);
+                    pDisplay->vbvaLock();
                     pDrv->pUpPort->pfnUpdateDisplay(pDrv->pUpPort);
+                    pDisplay->vbvaUnlock();
                 }
             }

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

@@ -351 +351 @@
 
 private:
+    static void InvalidateAndUpdateEMT(Display *pDisplay);
+    static int DrawToScreenEMT(Display *pDisplay, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
+
     int videoAccelRefreshProcess(void);