summaryrefslogtreecommitdiff
path: root/src/radeon_accel.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-06 22:59:25 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-06 22:59:25 -0500
commit0d3e0735f710cb7b9505e4330997aa332f73c102 (patch)
tree002fb8271a042eb3151b9a6800f7dd87ebb94fe8 /src/radeon_accel.c
parent0abfe3150ce3eed4db93ccc2975bd4622dfa54a7 (diff)
First round of avivo support
Diffstat (limited to 'src/radeon_accel.c')
-rw-r--r--src/radeon_accel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 6028affe..eb833fba 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -250,7 +250,7 @@ void RADEONEngineReset(ScrnInfoPtr pScrn)
host_path_cntl = INREG(RADEON_HOST_PATH_CNTL);
rbbm_soft_reset = INREG(RADEON_RBBM_SOFT_RESET);
- if (IS_R300_VARIANT) {
+ if (IS_R300_VARIANT || IS_AVIVO_VARIANT) {
CARD32 tmp;
OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset |
@@ -284,7 +284,7 @@ void RADEONEngineReset(ScrnInfoPtr pScrn)
INREG(RADEON_HOST_PATH_CNTL);
OUTREG(RADEON_HOST_PATH_CNTL, host_path_cntl);
- if (!IS_R300_VARIANT)
+ if (!IS_R300_VARIANT && !IS_AVIVO_VARIANT)
OUTREG(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset);
OUTREG(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index);