diff options
| author | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-30 10:50:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-30 10:50:25 +1000 |
| commit | 487376cce72ef8f19b4e3dc742b53500bed7c480 (patch) | |
| tree | d0ba3da92e4cad8458940a52ab5405c47a6b8111 | |
| parent | cd9bbbcb9032c5dbb46802690de6196ca6db0084 (diff) | |
Bug #6761: Fix font rendering in non-DRI mode by replacing RB2D_DSTCACHE_*
with RB3D_DSTCACHE_*. The RB2D versions are read-only mirrors of the
RB3D. This is masked when DRI is enabled because the DRM uses the right
registers in its flushing.
| -rw-r--r-- | src/radeon_accel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 0e0ede9..5c50cfa 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -154,16 +154,16 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn) unsigned char *RADEONMMIO = info->MMIO; int i; - OUTREGP(RADEON_RB2D_DSTCACHE_CTLSTAT, - RADEON_RB2D_DC_FLUSH_ALL, - ~RADEON_RB2D_DC_FLUSH_ALL); + OUTREGP(RADEON_RB3D_DSTCACHE_CTLSTAT, + RADEON_RB3D_DC_FLUSH_ALL, + ~RADEON_RB3D_DC_FLUSH_ALL); for (i = 0; i < RADEON_TIMEOUT; i++) { - if (!(INREG(RADEON_RB2D_DSTCACHE_CTLSTAT) & RADEON_RB2D_DC_BUSY)) + if (!(INREG(RADEON_RB3D_DSTCACHE_CTLSTAT) & RADEON_RB3D_DC_BUSY)) break; } if (i == RADEON_TIMEOUT) { RADEONTRACE(("DC flush timeout: %x\n", - INREG(RADEON_RB2D_DSTCACHE_CTLSTAT))); + INREG(RADEON_RB3D_DSTCACHE_CTLSTAT))); } } @@ -254,8 +254,8 @@ void RADEONEngineReset(ScrnInfoPtr pScrn) RADEON_SOFT_RESET_E2)); INREG(RADEON_RBBM_SOFT_RESET); OUTREG(RADEON_RBBM_SOFT_RESET, 0); - tmp = INREG(RADEON_RB2D_DSTCACHE_MODE); - OUTREG(RADEON_RB2D_DSTCACHE_MODE, tmp | (1 << 17)); /* FIXME */ + tmp = INREG(RADEON_RB3D_DSTCACHE_MODE); + OUTREG(RADEON_RB3D_DSTCACHE_MODE, tmp | (1 << 17)); /* FIXME */ } else { OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset | RADEON_SOFT_RESET_CP | |