diff options
| author | Kevin E Martin <kem@kem.org> | 2000-04-16 03:19:13 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2000-04-16 03:19:13 +0000 |
| commit | 7e3ef8a5e2dcbd0ef0dc4be15b1c902f9fdc8332 (patch) | |
| tree | d1b2b17df74412a3ecbdaac709b6ea3495c8d41a | |
| parent | 782b476dd30b2e81061c44fc5b849e7c8cf143fd (diff) | |
- Fixed swap buffers throttlingati-4-0-1-beta
- Removed old depth software fallback code
- Fixed glBindTexture crash
- Fixed kernel vertex buffer cleanup
| -rw-r--r-- | linux/r128_dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/r128_dma.c b/linux/r128_dma.c index 7c2e41f44..9c645b492 100644 --- a/linux/r128_dma.c +++ b/linux/r128_dma.c @@ -38,7 +38,6 @@ #define R128_MAX_VBUF_AGE 0x10000000 -#define R128_VBUF_AGE_TAKEN R128_MAX_VBUF_AGE*2 #define R128_VB_AGE_REG R128_GUI_SCRATCH_REG0 extern int r128_do_engine_reset(drm_device_t *dev); @@ -325,7 +324,6 @@ int r128_do_cce_wait_for_idle(drm_device_t *dev) int pm4stat = R128_READ(R128_PM4_STAT); if ((pm4stat & R128_PM4_FIFOCNT_MASK) >= dev_priv->cce_fifo_size && !(pm4stat & (R128_PM4_BUSY | R128_PM4_GUI_ACTIVE))) { - r128_mark_vertbufs_done(dev); return 0; } } @@ -340,7 +338,6 @@ int r128_do_cce_wait_for_idle(drm_device_t *dev) for (i = 0; i < dev_priv->usec_timeout; i++) { int pm4stat = R128_READ(R128_PM4_STAT); if (!(pm4stat & (R128_PM4_BUSY | R128_PM4_GUI_ACTIVE))) { - r128_mark_vertbufs_done(dev); return r128_do_engine_flush(dev); } udelay(1); @@ -653,7 +650,8 @@ static int r128_send_vertbufs(drm_device_t *dev, drm_r128_vertex_t *v) if (++dev_priv->submit_age == R128_MAX_VBUF_AGE) { dev_priv->submit_age = 0; - r128_do_cce_wait_for_idle(dev); + (void)r128_do_cce_wait_for_idle(dev); + r128_mark_vertbufs_done(dev); } for (i = 0; i < v->send_count; i++) { |