summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Kuehling <fxkuehl@gmx.de>2005-01-05 14:34:12 +0000
committerFelix Kuehling <fxkuehl@gmx.de>2005-01-05 14:34:12 +0000
commit094f02c568fb2096a93b30adf291f82e0b87bbce (patch)
tree873714e446ff9e394be564cae40e8129a073d07e
parent04842e8bcf0cc1b3553ba380c450ad1f22b8b463 (diff)
Fixed the DMA buffer age test. Should fix occasional "soft" lockups. Bumped
patch level and driver date.
-rw-r--r--shared-core/savage_drv.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h
index f5d732af..1ed6ee9e 100644
--- a/shared-core/savage_drv.h
+++ b/shared-core/savage_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_NAME "savage"
#define DRIVER_DESC "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]"
-#define DRIVER_DATE "20050101"
+#define DRIVER_DATE "20050105"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 0
+#define DRIVER_PATCHLEVEL 1
typedef struct drm_savage_age {
uint16_t event;
@@ -456,7 +456,7 @@ extern void savage_reclaim_buffers(drm_device_t *dev, DRMFILE filp);
#define TEST_AGE( age, e, w ) \
( (age)->wrap+1 < (w) || \
- ( (age)->wrap+1 == (w) && (e) < 0x7fff ) || \
- (age)->event < (uint16_t)(e) )
+ ( (age)->wrap+1 == (w) && (e) <= dev_priv->event_counter ) || \
+ (age)->event <= (e) )
#endif /* __SAVAGE_DRV_H__ */