diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-08-07 20:37:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:30 +1000 |
| commit | ae1b1a4816ac11075d338af79a239f4c326d675c (patch) | |
| tree | 60faac04eb4cf6d08b01d41e33dddd0f8275aad0 /drivers/char/drm/radeon_cp.c | |
| parent | 8624ecbf68e90e5a8124514a0b7f92767fb80a62 (diff) | |
drm: radeon: fix up bus mastering when writeback is disabled
When writeback isn't used, actually disable it in the hardware.
Not doing this might waste bus bandwidth or even cause memory corruption or
system crashes on systems that check bus transfers. No such incident has been
reported though.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
| -rw-r--r-- | drivers/char/drm/radeon_cp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 5ad43ba7b5a..3956628b257 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c @@ -1258,6 +1258,13 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv) dev_priv->writeback_works = 0; DRM_INFO("writeback forced off\n"); } + + if (!dev_priv->writeback_works) { + /* Disable writeback to avoid unnecessary bus master transfer */ + RADEON_WRITE(RADEON_CP_RB_CNTL, RADEON_READ(RADEON_CP_RB_CNTL) | + RADEON_RB_NO_UPDATE); + RADEON_WRITE(RADEON_SCRATCH_UMSK, 0); + } } /* Enable or disable PCI-E GART on the chip */ |