I assume you didn't mean to read GUI_STAT twice in a row here, right?
Here's a patch:
Index: mach64_dma.c
===================================================================
RCS file:
/cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Attic/mach64_dma.c,v
retrieving revision 1.1.6.4.2.27.2.5
diff -u -r1.1.6.4.2.27.2.5 mach64_dma.c
--- mach64_dma.c 14 Jul 2002 18:36:40 -0000 1.1.6.4.2.27.2.5
+++ mach64_dma.c 14 Jul 2002 18:59:34 -0000
@@ -197,13 +197,12 @@
i = 0;
while ( i < dev_priv->usec_timeout ) {
mach64_update_ring_snapshot( dev_priv );
- if ( ring->head == ring->tail && !(MACH64_READ(MACH64_GUI_STAT) &
MACH64_GUI_ACTIVE) ) {
- if ( !(MACH64_READ(MACH64_GUI_STAT) & MACH64_GUI_ACTIVE) ) {
- if (i > 0) {
- DRM_DEBUG( "mach64_ring_idle: %d usecs\n", i );
- }
- return 0;
+ if ( ring->head == ring->tail &&
+ !(MACH64_READ(MACH64_GUI_STAT) & MACH64_GUI_ACTIVE) ) {
+ if (i > 0) {
+ DRM_DEBUG( "mach64_ring_idle: %d usecs\n", i );
}
+ return 0;
}
if ( ring->head == head ) {
++i;
On Sun, 14 Jul 2002, Jos? R. Fonseca wrote:
> CVSROOT: /cvsroot/dri
> Module name: xc
> Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/
> Changes by: jrfonseca@usw-pr-cvs1. 02/07/14 11:36:41
>
> Log message:
> Changed mach64_ring_idle to mesure the time for the ring head advances instead of
>completion to avoid spurious timeouts.
>
> Modified files:
> xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/: Tag:
>mach64-0-0-5-branch
> mach64_dma.c
>
> Revision Changes Path
> 1.1.6.4.2.27.2.5 +16 -5
>xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Attic/mach64_dma.c
>
>
>
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> Dri-patches mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/dri-patches
>
--
Leif Delgass
http://www.retinalburn.net
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
