Attachment 10888 Details for Bug 7771 – Take 3, for real this time :-/

[patch] Take 3, for real this time :-/

xf86-video-ati.patch (text/plain), 1.65 KB, created by Alon Ziv on 2007-07-26 08:57:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Ziv

Created: 2007-07-26 08:57:13 UTC

Size: 1.65 KB

patch

obsolete

>diff --git a/src/radeon.h b/src/radeon.h
>index a22e481..1f012b1 100644
>--- a/src/radeon.h
>+++ b/src/radeon.h
>@@ -1178,4 +1178,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_ */
>diff --git a/src/radeon_driver.c b/src/radeon_driver.c
>index 5c20b0e..7912177 100644
>--- a/src/radeon_driver.c
>+++ b/src/radeon_driver.c
>@@ -783,6 +783,7 @@ void RADEONWaitForVerticalSync2(ScrnInfoPtr pScrn)
>     unsigned char *RADEONMMIO = info->MMIO;
>     CARD32         crtc2_gen_cntl;
>     int            i;
>+    struct timeval timeout;
>  
>     crtc2_gen_cntl = INREG(RADEON_CRTC2_GEN_CNTL);
>     if ((crtc2_gen_cntl & RADEON_CRTC2_DISP_REQ_EN_B) ||
>@@ -793,9 +794,10 @@ void RADEONWaitForVerticalSync2(ScrnInfoPtr pScrn)
>     OUTREG(RADEON_CRTC2_STATUS, RADEON_CRTC2_VBLANK_SAVE_CLEAR);
> 
>     /* Wait for it to go back up */
>-    for (i = 0; i < RADEON_TIMEOUT/1000; i++) {
>-	if (INREG(RADEON_CRTC2_STATUS) & RADEON_CRTC2_VBLANK_SAVE) break;
>-	usleep(1);
>+    radeon_init_timeout(&timeout, 20000);
>+    while (!(INREG(RADEON_CRTC2_STATUS) & RADEON_CRTC2_VBLANK_SAVE) &&
>+        !radeon_timedout(&timeout)) {
>+	usleep(100);
>     }
> }
>

Actions: View | Splinter Review

Attachments on bug 7771: 6476 | 6477 | 10834 | 10871 | 10882 | 10888 | 10909 | 10918

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.