Changeset 52652 in vbox for trunk/src/VBox/Main/include

Timestamp:

Sep 9, 2014 8:12:31 AM (11 years ago)

Author:

vboxsync

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

95963

Message:

DisplayImpl: fixes for legacy VBVA locking and restoring saved state.

File:

• trunk/src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)

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

@@ -164 +164 @@
     bool i_VideoAccelAllowed(void);
     void i_VideoAccelVRDP(bool fEnable);
+
+    /* Legacy video acceleration requests coming from the VGA refresh timer. */
+    int  VideoAccelEnableVGA(bool fEnable, VBVAMEMORY *pVbvaMemory);
+
+    /* Legacy video acceleration requests coming from VMMDev. */
+    int  VideoAccelEnableVMMDev(bool fEnable, VBVAMEMORY *pVbvaMemory);
+    void VideoAccelFlushVMMDev(void);
 
     int  i_VideoCaptureStart();
@@ -375 +382 @@
     void i_handleResizeCompletedEMT(unsigned uScreenId, BOOL fResizeContext);
 
-    /* Old guest additions (3.x?) use VMMDev for VBVA and the host VBVA code (VideoAccel*)
-     * can be executed concurrently by VGA refresh timer and the guest VMMDev request
-     * in SMP VMs. The lock serialized this.
+    /* Old guest additions (3.x and older) use both VMMDev and DevVGA refresh timer 
+     * to process the VBVABUFFER memory. Therefore the legacy VBVA (VideoAccel) host
+     * code can be executed concurrently by VGA refresh timer and the guest VMMDev
+     * request in SMP VMs. The semaphore serialized this.
      */
-    RTCRITSECT mVBVALock;
-    volatile uint32_t mfu32PendingVideoAccelDisable;
-
-    int  i_vbvaLock(void);
-    void i_vbvaUnlock(void);
+    RTSEMXROADS mhXRoadsVideoAccel;
+    int videoAccelEnterVGA(void);
+    void videoAccelLeaveVGA(void);
+    int videoAccelEnterVMMDev(void);
+    void videoAccelLeaveVMMDev(void);
+
+    /* Serializes access to mpVbvaMemory, etc between VRDP and Display. */
+    RTCRITSECT mVideoAccelLock;
 
 public:
-
-    bool i_vbvaLockIsOwner(void);
 
     static int i_displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppu8Data, size_t *pcbData,