Changeset 24890 in vbox for trunk/src

Timestamp:

Nov 24, 2009 11:28:44 AM (15 years ago)

Author:

vboxsync

Message:

DisplayImpl: VBVA lock (incomplete, xTracker 4463).

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (11 diffs)
• Makefile.kmk (modified) (1 diff)
• include/DisplayImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -103 +103 @@
     mLastHeight = 0;
 
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+    int rc = RTCritSectInit (&mVBVALock);
+    AssertRC (rc);
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
     return S_OK;
 }
@@ -109 +114 @@
 {
     uninit();
+
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+    if (RTCritSectIsInitialized (&mVBVALock))
+    {
+        RTCritSectDelete (&mVBVALock);
+        memset (&mVBVALock, 0, sizeof (mVBVALock));
+    }
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
 }
 
@@ -965 +978 @@
  *  @thread EMT
  */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+/*
+ * Always runs under VBVA or DevVGA lock.
+ * Safe to use VBVA vars and take the framebuffer lock.
+ */
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
 void Display::handleDisplayUpdate (int x, int y, int w, int h)
 {
@@ -1165 +1184 @@
  * @thread EMT
  */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
 int Display::VideoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory)
+{
+    int rc;
+    RTCritSectEnter(&mVBVALock);
+    rc = videoAccelEnable (fEnable, pVbvaMemory);
+    RTCritSectLeave(&mVBVALock);
+    return rc;
+}
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+int Display::videoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory)
+#else
+int Display::VideoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory)
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 {
     int rc = VINF_SUCCESS;
@@ -1218 +1252 @@
     {
         /* Process any pending orders and empty the VBVA ring buffer. */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+        videoAccelFlush ();
+#else
         VideoAccelFlush ();
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
     }
 
@@ -1595 +1633 @@
  * @thread EMT
  */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
 void Display::VideoAccelFlush (void)
+{
+    RTCritSectEnter(&mVBVALock);
+    videoAccelFlush();
+    RTCritSectLeave(&mVBVALock);
+}
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
+
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+/* Under VBVA lock. DevVGA is not taken. */
+void Display::videoAccelFlush (void)
+#else
+void Display::VideoAccelFlush (void)
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 {
 #ifdef DEBUG_sunlover_2
@@ -1623 +1675 @@
     /* Process the ring buffer */
     unsigned uScreenId;
+#ifndef VBOX_WITH_OLD_VBVA_LOCK
     for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
     {
@@ -1630 +1683 @@
         }
     }
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 
     /* Initialize dirty rectangles accumulator. */
@@ -1647 +1701 @@
 
             /* Disable VBVA on those processing errors. */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+            videoAccelEnable (false, NULL);
+#else
             VideoAccelEnable (false, NULL);
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 
             break;
@@ -1710 +1768 @@
     for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
     {
+#ifndef VBOX_WITH_OLD_VBVA_LOCK
         if (!maFramebuffers[uScreenId].pFramebuffer.isNull())
         {
             maFramebuffers[uScreenId].pFramebuffer->Unlock ();
         }
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 
         if (maFramebuffers[uScreenId].u32ResizeStatus == ResizeStatus_Void)
@@ -2599 +2659 @@
 
     /* Disable VBVA mode in any case. The guest driver reenables VBVA mode if necessary. */
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+    /* This is called under DevVGA lock. Postpone disabling VBVA. */
+    /* @todo vbva */
+#else
     pDrv->pDisplay->VideoAccelEnable (false, NULL);
+#endif /* !VBOX_WITH_OLD_VBVA_LOCK */
 }
 

trunk/src/VBox/Main/Makefile.kmk

@@ -552 +552 @@
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,)
 endif
+ifdef VBOX_WITH_OLD_VBVA_LOCK
+VBoxC_DEFS += VBOX_WITH_OLD_VBVA_LOCK
+endif
 ifdef VBOX_WITH_HGSMI
 VBoxC_DEFS += VBOX_WITH_HGSMI

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

@@ -339 +339 @@
 
     void handleResizeCompletedEMT (void);
+
+#ifdef VBOX_WITH_OLD_VBVA_LOCK
+    RTCRITSECT mVBVALock;
+
+    /* Functions run under VBVA lock. */
+    int videoAccelEnable (bool fEnable, VBVAMEMORY *pVbvaMemory);
+    void videoAccelFlush (void);
+#endif /* VBOX_WITH_OLD_VBVA_LOCK */
 };