diff options
| author | Ian Romanick <idr@us.ibm.com> | 2004-10-26 19:20:40 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2004-10-26 19:20:40 +0000 |
| commit | 95ba3524970f9f63aa518d6c3dd4e702c4941861 (patch) | |
| tree | 8521aca83f93bf39a84b7397bced1bfe3b8b2485 /src/mesa/drivers/dri/r128 | |
| parent | 640492aec90b955820a762ce7724ebf681f924a8 (diff) | |
As per suggestions my Michel Daenzer, improve the fix for bugzilla #1513.
Diffstat (limited to 'src/mesa/drivers/dri/r128')
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_dd.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r128/r128_ioctl.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r128/r128_dd.c b/src/mesa/drivers/dri/r128/r128_dd.c index aec7f9d3d3..22b68467ac 100644 --- a/src/mesa/drivers/dri/r128/r128_dd.c +++ b/src/mesa/drivers/dri/r128/r128_dd.c @@ -43,7 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "utils.h" -#define DRIVER_DATE "20041001" +#define DRIVER_DATE "20041026" /* Return the width and height of the current color buffer. diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.c b/src/mesa/drivers/dri/r128/r128_ioctl.c index bf643210c5..1eb887f67c 100644 --- a/src/mesa/drivers/dri/r128/r128_ioctl.c +++ b/src/mesa/drivers/dri/r128/r128_ioctl.c @@ -43,6 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast/swrast.h" #include "vblank.h" +#include "mmio.h" #define R128_TIMEOUT 2048 #define R128_IDLE_RETRY 32 @@ -229,7 +230,7 @@ static int r128WaitForFrameCompletion( r128ContextPtr rmesa ) int wait = 0; while ( 1 ) { - uint32_t frame = LE32_TO_CPU(*(volatile uint32_t *)(R128MMIO + R128_LAST_FRAME_REG)); + uint32_t frame = read_MMIO_LE32( R128MMIO, R128_LAST_FRAME_REG ); if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) { break; |