diff options
| author | dawes <dawes> | 2001-06-14 21:52:36 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-06-14 21:52:36 +0000 |
| commit | 9d8ac1f4820f6a1984bcc9e4a4151ba9f0acdc1f (patch) | |
| tree | c337d03f29b9e9b8dbe806c9ada6c9db11559892 /xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c | |
| parent | d7e11f5cb2c191e4478fca7c6b964a6e600decfa (diff) | |
Import of XFree86 4.1.0X_4_1_0
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c index 55c481090..023dcd3f4 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c,v 1.13 2001/03/28 20:08:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c,v 1.14 2001/05/02 15:06:08 dawes Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -238,8 +238,13 @@ void RADEONEngineReset(ScrnInfoPtr pScrn) clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX); mclk_cntl = INPLL(pScrn, RADEON_MCLK_CNTL); - /* FIXME: Remove magic numbers! */ - OUTPLL(RADEON_MCLK_CNTL, (mclk_cntl | 0x003f0000)); + OUTPLL(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 = INREG(RADEON_RBBM_SOFT_RESET); |