summaryrefslogtreecommitdiff
path: root/src/radeon_commonfuncs.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-02-19 19:51:18 +1100
committerDave Airlie <airlied@redhat.com>2008-02-24 19:07:59 +1100
commit68158124366db883a901e960fe5f05f8df5efa42 (patch)
treee65459fe95f5d79900b68e6d0ba8c325ff620781 /src/radeon_commonfuncs.c
parente614bb6965588bf09dcb87f5e08e67120ec9847f (diff)
rs690: initial rs690 rotate
suffers same problem as r500 with clipping
Diffstat (limited to 'src/radeon_commonfuncs.c')
-rw-r--r--src/radeon_commonfuncs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index a626bbd4..82825b79 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, 0xA);
OUT_ACCEL_REG(R300_RB3D_ZCACHE_CTLSTAT, 0x3);
@@ -134,11 +134,11 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
OUT_ACCEL_REG(R300_SC_EDGERULE, 0xA5294A5);
OUT_ACCEL_REG(R300_SC_SCISSOR0, 0x0);
OUT_ACCEL_REG(R300_SC_SCISSOR1, 0x3ffffff);
- if (IS_AVIVO_VARIANT) {
- OUT_ACCEL_REG(R300_SC_CLIP_0_A, 0x0);
+ if (IS_R300_VARIANT || info->ChipFamily == CHIP_FAMILY_RS690) {
+ OUT_ACCEL_REG(R300_SC_CLIP_0_A, 0x880440);
OUT_ACCEL_REG(R300_SC_CLIP_0_B, 0xff0ff0);
} else {
- OUT_ACCEL_REG(R300_SC_CLIP_0_A, 0x880440);
+ OUT_ACCEL_REG(R300_SC_CLIP_0_A, 0x0);
OUT_ACCEL_REG(R300_SC_CLIP_0_B, 0xff0ff0);
}
OUT_ACCEL_REG(R300_SC_CLIP_RULE, 0xAAAA);