diff options
| author | Daryll Strauss <daryll@users.sourceforge.net> | 2000-07-11 19:37:14 +0000 |
|---|---|---|
| committer | Daryll Strauss <daryll@users.sourceforge.net> | 2000-07-11 19:37:14 +0000 |
| commit | 3fdcc554e29fc62e2bc987e044607326324f768f (patch) | |
| tree | 586d32b944f1e244d13f8dce73617f5c12535b3d /linux/mga_state.c | |
| parent | dc2701a9f6034a04319f71e43e7f928f818be6db (diff) | |
Merge the trunk onto the tdfx-2-1 branch. Now up to date with 4.0.1.tdfx-2-1-20000711
Diffstat (limited to 'linux/mga_state.c')
| -rw-r--r-- | linux/mga_state.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/mga_state.c b/linux/mga_state.c index 0f7da2c79..723ccc539 100644 --- a/linux/mga_state.c +++ b/linux/mga_state.c @@ -546,7 +546,6 @@ static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) 10 + 15 * MGA_NR_SAREA_CLIPRECTS); PRIM_OVERFLOW(dev, dev_priv, primary_needed); mgaEmitState(dev_priv); - do { if (i < sarea_priv->nbox) { DRM_DEBUG("idx %d Emit box %d/%d:" @@ -572,7 +571,6 @@ static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf) PRIMADVANCE(dev_priv); } while (++i < sarea_priv->nbox); } - if (buf_priv->discard) { if (buf_priv->dispatched == 1) AGEBUF(dev_priv, buf_priv); @@ -748,10 +746,15 @@ static void mga_dma_dispatch_swap(drm_device_t * dev) DRM_DEBUG("%s\n", __FUNCTION__); primary_needed = nbox * 5; - primary_needed += 60; + primary_needed += 65; PRIM_OVERFLOW(dev, dev_priv, primary_needed); PRIMGETPTR(dev_priv); + PRIMOUTREG(MGAREG_DMAPAD, 0); + PRIMOUTREG(MGAREG_DMAPAD, 0); + PRIMOUTREG(MGAREG_DWGSYNC, 0x7100); + PRIMOUTREG(MGAREG_DWGSYNC, 0x7000); + PRIMOUTREG(MGAREG_DSTORG, dev_priv->frontOffset); PRIMOUTREG(MGAREG_MACCESS, dev_priv->mAccess); PRIMOUTREG(MGAREG_SRCORG, dev_priv->backOffset); |