diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-23 16:34:30 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-02-23 16:34:30 +0000 |
| commit | bc54ede0a865d55b3cc39db79aae3a8bc12bbcc0 (patch) | |
| tree | 910e11bf52eb85774e933f035780f09a8d4dfd3f /shared-core/savage_drv.h | |
| parent | f3cf4bc5f2bd556689ef197877de596b83dbd3d9 (diff) | |
Use wrap counter to extend 16-bit hardware event tags to 32-bit logical
event counters in the SAVAGE_EVENT_EMIT/WAIT ioctls. This is needed for
reliable client-side texture heap aging. Slightly simplified DMA buffer
aging while at it. Bumped minor version and driver date.
Diffstat (limited to 'shared-core/savage_drv.h')
| -rw-r--r-- | shared-core/savage_drv.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h index 54ba7e71..2b44e529 100644 --- a/shared-core/savage_drv.h +++ b/shared-core/savage_drv.h @@ -30,10 +30,10 @@ #define DRIVER_NAME "savage" #define DRIVER_DESC "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]" -#define DRIVER_DATE "20050120" +#define DRIVER_DATE "20050222" #define DRIVER_MAJOR 2 -#define DRIVER_MINOR 2 +#define DRIVER_MINOR 3 #define DRIVER_PATCHLEVEL 0 /* Interface history: * @@ -42,6 +42,9 @@ * 2.1 Scissors registers managed by the DRM, 3D operations clipped by * cliprects of the cmdbuf ioctl * 2.2 Implemented SAVAGE_CMD_DMA_IDX and SAVAGE_CMD_VB_IDX + * 2.3 Event counters used by BCI_EVENT_EMIT/WAIT ioctls are now 32 bits + * wide and thus very long lived (unlikely to ever wrap). The size + * in the struct was 32 bits before, but only 16 bits were used */ typedef struct drm_savage_age { @@ -489,9 +492,7 @@ extern void savage_emit_clip_rect_s4(drm_savage_private_t *dev_priv, (age)->wrap = w; \ } while(0) -#define TEST_AGE( age, e, w ) \ - ( (age)->wrap+1 < (w) || \ - ( (age)->wrap+1 == (w) && (e) <= dev_priv->event_counter ) || \ - (age)->event <= (e) ) +#define TEST_AGE( age, e, w ) \ + ( (age)->wrap < (w) || (age)->event <= (e) ) #endif /* __SAVAGE_DRV_H__ */ |