diff options
| author | Alex Deucher <alex@samba.(none)> | 2008-02-24 05:37:22 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2008-02-24 05:37:22 -0500 |
| commit | 85e470e64f629de72e361c77770e2e29998d1bf4 (patch) | |
| tree | 547b9c164d3279b0cd348e2d7cb0ce3a951cebad /src/radeon_commonfuncs.c | |
| parent | 27ddb39b12a0b54e099fd5274c4c91f08e2d2822 (diff) | |
| parent | 1b84c76f27c8d24cb42beae26abf000721901c1c (diff) | |
Merge master and fix conflicts
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
Conflicts:
src/radeon_commonfuncs.c
Diffstat (limited to 'src/radeon_commonfuncs.c')
| -rw-r--r-- | src/radeon_commonfuncs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index b8236a7..a829f4a 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -57,7 +57,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) info->texW[0] = info->texH[0] = info->texW[1] = info->texH[1] = 1; - if (IS_R300_VARIANT || IS_AVIVO_VARIANT) { + if (IS_R300_VARIANT || IS_AVIVO_VARIANT || info->ChipFamily == CHIP_FAMILY_RS690) { BEGIN_ACCEL(3); OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D | R300_DC_FREE_3D); OUT_ACCEL_REG(R300_RB3D_ZCACHE_CTLSTAT, R300_ZC_FLUSH | R300_ZC_FREE); @@ -178,14 +178,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn) (0 << R300_SCISSOR_Y_SHIFT))); OUT_ACCEL_REG(R300_SC_SCISSOR1, ((8191 << R300_SCISSOR_X_SHIFT) | (8191 << R300_SCISSOR_Y_SHIFT))); - if (IS_AVIVO_VARIANT) { - OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((0 << R300_CLIP_X_SHIFT) | - (0 << R300_CLIP_Y_SHIFT))); + + if (IS_R300_VARIANT || (info->ChipFamily == CHIP_FAMILY_RS690)) { + OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) | + (1088 << R300_CLIP_Y_SHIFT))); OUT_ACCEL_REG(R300_SC_CLIP_0_B, ((4080 << R300_CLIP_X_SHIFT) | (2040 << R300_CLIP_Y_SHIFT))); } else { - OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((1088 << R300_CLIP_X_SHIFT) | - (1088 << R300_CLIP_Y_SHIFT))); + OUT_ACCEL_REG(R300_SC_CLIP_0_A, ((0 << R300_CLIP_X_SHIFT) | + (0 << R300_CLIP_Y_SHIFT))); OUT_ACCEL_REG(R300_SC_CLIP_0_B, ((4080 << R300_CLIP_X_SHIFT) | (2040 << R300_CLIP_Y_SHIFT))); } |