Changeset 53789 in vbox

Timestamp:

Jan 13, 2015 4:43:25 PM (10 years ago)

Author:

vboxsync

Message:

Improved the ugly SVGA_REG_BUSY read hack a bit.

Location:

trunk

Files:

• include/VBox/vmm/tm.h (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/TMAllVirtual.cpp (modified) (1 diff)

trunk/include/VBox/vmm/tm.h

@@ -118 +118 @@
 VMM_INT_DECL(uint64_t)  TMVirtualSyncGetEx(PVM pVM, bool fCheckTimers);
 VMM_INT_DECL(uint64_t)  TMVirtualSyncGetWithDeadlineNoCheck(PVM pVM, uint64_t *pcNsToDeadline);
-VMM_INT_DECL(uint64_t)  TMVirtualSyncGetNsToDeadline(PVM pVM);
+VMMDECL(uint64_t)       TMVirtualSyncGetNsToDeadline(PVM pVM);
 VMM_INT_DECL(uint64_t)  TMVirtualToNano(PVM pVM, uint64_t u64VirtualTicks);
 VMM_INT_DECL(uint64_t)  TMVirtualToMicro(PVM pVM, uint64_t u64VirtualTicks);

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

@@ -793 +793 @@
                     RTSemEventMultiReset(pSVGAState->hBusyDelayedEmts);
                 if (pThis->svga.fBusy)
-                    RTSemEventMultiWait(pSVGAState->hBusyDelayedEmts, 50);
+                {
+                    /** @todo If this code is going to stay, we need to call into the halt/wait
+                     *        code in VMEmt.cpp here, otherwise all kind of EMT interaction will
+                     *        suffer when the guest is polling on a busy FIFO. */
+                    uint64_t cNsMaxWait = TMVirtualSyncGetNsToDeadline(PDMDevHlpGetVM(pThis->pDevInsR3));
+                    if (cNsMaxWait >= RT_NS_100US)
+                        RTSemEventMultiWaitEx(pSVGAState->hBusyDelayedEmts,
+                                              RTSEMWAIT_FLAGS_NANOSECS |  RTSEMWAIT_FLAGS_RELATIVE,
+                                              RT_MIN(cNsMaxWait, RT_NS_10MS));
+                }
 
                 ASMAtomicDecU32(&pSVGAState->cBusyDelayedEmts);

trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

@@ -926 +926 @@
  * @remarks May set the timer and virtual sync FFs.
  */
-VMM_INT_DECL(uint64_t) TMVirtualSyncGetNsToDeadline(PVM pVM)
+VMMDECL(uint64_t) TMVirtualSyncGetNsToDeadline(PVM pVM)
 {
     uint64_t cNsToDeadline;