diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-21 09:36:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-21 09:36:22 +1000 |
| commit | 3c31b96afa20913ad947e68fe0c3a662e5eafbdd (patch) | |
| tree | 1db77a5ca5bc88876b3f21d35d3ddce3cff0f900 /src/radeon_accel.c | |
| parent | eb99c3c5c9a2249cb84920f0f225e525fc3a4144 (diff) | |
| parent | f5e8c185001e62e744310667c2d1bd3fe6542a62 (diff) | |
Merge remote branch 'origin/atombios-support'
Conflicts:
src/radeon_display.c
src/radeon_driver.c
Diffstat (limited to 'src/radeon_accel.c')
| -rw-r--r-- | src/radeon_accel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index ed7d1e94..5bf03f52 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); @@ -322,7 +322,7 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn) #endif /* Restore SURFACE_CNTL */ - OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl); + OUTREG(RADEON_SURFACE_CNTL, info->ModeReg->surface_cntl); RADEONWaitForFifo(pScrn, 1); OUTREG(RADEON_DEFAULT_SC_BOTTOM_RIGHT, (RADEON_DEFAULT_SC_RIGHT_MAX @@ -853,6 +853,9 @@ Bool RADEONAccelInit(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; RADEONInfoPtr info = RADEONPTR(pScrn); + if (info->ChipFamily >= CHIP_FAMILY_R600) + return FALSE; + #ifdef USE_EXA if (info->useEXA) { # ifdef XF86DRI |