diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2004-04-29 12:23:39 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2004-04-29 12:23:39 +0000 |
| commit | 74d563cdfbfb07cc666d60dc909e90ddb9949cbb (patch) | |
| tree | 8f1f7b77465c03c9dcb6a4ae3937b278dc275bc0 /src/mesa/drivers/dri/r128/r128_ioctl.c | |
| parent | c35dcfcf0adb335a28fdb1503447655dbb809927 (diff) | |
Allow *_dri.so to build in Mesa tree with the 'linux-dri' target.
Diffstat (limited to 'src/mesa/drivers/dri/r128/r128_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.c b/src/mesa/drivers/dri/r128/r128_ioctl.c index 6ea8d52965..d9fc02501a 100644 --- a/src/mesa/drivers/dri/r128/r128_ioctl.c +++ b/src/mesa/drivers/dri/r128/r128_ioctl.c @@ -44,12 +44,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "vblank.h" -#ifdef _SOLO -/* temporary - should really split r128_reg.h into r128_reg.h & r128_macros.h - * like the radeon */ -#include "r128_macros.h" -#endif - #define R128_TIMEOUT 2048 #define R128_IDLE_RETRY 32 @@ -221,6 +215,7 @@ static void delay( void ) { #define R128_MAX_OUTSTANDING 2 + /* Throttle the frame rate -- only allow one pending swap buffers * request at a time. * GH: We probably don't want a timeout here, as we can wait as @@ -235,7 +230,8 @@ static int r128WaitForFrameCompletion( r128ContextPtr rmesa ) int wait = 0; while ( 1 ) { - frame = INREG( R128_LAST_FRAME_REG ); + frame = *(volatile unsigned int *)(R128MMIO + R128_LAST_FRAME_REG); + if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) { break; } |