diff options
| author | Alon Ziv <alonz@nolaviz.org> | 2007-07-30 22:47:59 +0300 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-08-23 12:12:01 +0200 |
| commit | de26e406f52b3b13f03eee2b8023924ec6406f0a (patch) | |
| tree | 8e842e5ded3b28eecb846bd91de5e68a5635ff47 /src/radeon.h | |
| parent | c66e5de26ae93caa368213f3cce139aacec955d2 (diff) | |
radeon: Sane handling of timeouts in WaitForVerticalSync(2).
RADEONWaitForVerticalSync() and RADEONWaitForVerticalSync2() need to wait
for a timeout specified in milliseconds; looping around usleep() causes
the timeout to be unnecessarily long, as the OS may sleep longer than
requested (on Linux the minimum actual sleep value may be several ms).
The new logic uses gettimeofday() in the loop to see when the (absolute)
timeout has arrived.
Signed-off-by: Alon Ziv <alonz@nolaviz.org>
Diffstat (limited to 'src/radeon.h')
| -rw-r--r-- | src/radeon.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/radeon.h b/src/radeon.h index bf1444c9..8babf391 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -39,6 +39,8 @@ #include <stdlib.h> /* For abs() */ #include <unistd.h> /* For usleep() */ +#include <sys/time.h> /* For +#include <time.h> * gettimeofday() */ #include "xf86str.h" #include "compiler.h" @@ -159,6 +161,8 @@ typedef enum { #define RADEON_IDLE_RETRY 16 /* Fall out of idle loops after this count */ #define RADEON_TIMEOUT 2000000 /* Fall out of wait loops after this count */ +#define RADEON_VSYNC_TIMEOUT 20000 /* Maximum wait for VSYNC (in usecs) */ + /* Buffer are aligned on 4096 byte boundaries */ #define RADEON_BUFFER_ALIGN 0x00000fff #define RADEON_VBIOS_SIZE 0x00010000 @@ -1224,4 +1228,21 @@ static __inline__ void RADEON_SYNC(RADEONInfoPtr info, ScrnInfoPtr pScrn) #endif } +static __inline__ void radeon_init_timeout(struct timeval *endtime, + unsigned int timeout) +{ + gettimeofday(endtime, NULL); + endtime->tv_usec += timeout; + endtime->tv_sec += endtime->tv_usec / 1000000; + endtime->tv_usec %= 1000000; +} + +static __inline__ int radeon_timedout(const struct timeval *endtime) +{ + struct timeval now; + gettimeofday(&now, NULL); + return now.tv_sec == endtime->tv_sec ? + now.tv_usec > endtime->tv_usec : now.tv_sec > endtime->tv_sec; +} + #endif /* _RADEON_H_ */ |