aboutsummaryrefslogtreecommitdiff
path: root/linux/radeon_cp.c
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2001-04-16 21:43:28 +0000
committerKevin E Martin <kem@kem.org>2001-04-16 21:43:28 +0000
commit6f5e397f2549e7d5f806d2c44053d3d306a36f3a (patch)
tree1cadff8238b48b099124682cdf31ccfad7791b1f /linux/radeon_cp.c
parentcc7afb2b16b84293258be0cc8bcffd32308cd3b9 (diff)
- Fix typo and remove magic numbers
Diffstat (limited to 'linux/radeon_cp.c')
-rw-r--r--linux/radeon_cp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/radeon_cp.c b/linux/radeon_cp.c
index c255a3e0..f8d8c2ea 100644
--- a/linux/radeon_cp.c
+++ b/linux/radeon_cp.c
@@ -520,8 +520,13 @@ static int radeon_do_engine_reset( drm_device_t *dev )
clock_cntl_index = RADEON_READ( RADEON_CLOCK_CNTL_INDEX );
mclk_cntl = RADEON_READ_PLL( dev, RADEON_MCLK_CNTL );
- /* FIXME: remove magic number here and in radeon ddx driver!!! */
- RADEON_WRITE_PLL( RADEON_MCLK_CNTL, mclk_cntl | 0x003f00000 );
+ RADEON_WRITE_PLL( RADEON_MCLK_CNTL, ( mclk_cntl |
+ RADEON_FORCEON_MCLKA |
+ RADEON_FORCEON_MCLKB |
+ RADEON_FORCEON_YCLKA |
+ RADEON_FORCEON_YCLKB |
+ RADEON_FORCEON_MC |
+ RADEON_FORCEON_AIC ) );
rbbm_soft_reset = RADEON_READ( RADEON_RBBM_SOFT_RESET );