summaryrefslogtreecommitdiff
path: root/src/radeon_textured_videofuncs.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-12-02 22:02:21 -0500
committerAlex Deucher <alexdeucher@gmail.com>2008-12-02 22:02:21 -0500
commit678693aabd0b4c1812ab44bf5abb4c8394b254bb (patch)
tree69005619dbd729a7240c328e8a08bb10eba78cc0 /src/radeon_textured_videofuncs.c
parentf231e4d9b2c683dc16f42cf09484fae926a892c1 (diff)
Stability fixes from radeon-gem-cs
Diffstat (limited to 'src/radeon_textured_videofuncs.c')
-rw-r--r--src/radeon_textured_videofuncs.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index c5ad0e18..8a4a31d7 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -45,9 +45,6 @@
#endif
#endif
-#define VTX_DWORD_COUNT_FILTER 6
-#define VTX_DWORD_COUNT 4
-
#ifdef ACCEL_CP
#define VTX_OUT_FILTER(_dstX, _dstY, _srcX, _srcY, _maskX, _maskY) \
@@ -145,9 +142,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
FINISH_ACCEL();
if (pPriv->bicubic_enabled)
- vtx_count = VTX_DWORD_COUNT_FILTER;
+ vtx_count = 6;
else
- vtx_count = VTX_DWORD_COUNT;
+ vtx_count = 4;
if (IS_R300_3D || IS_R500_3D) {
uint32_t output_fmt;
@@ -1237,7 +1234,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
}
if (IS_R300_3D || IS_R500_3D) {
- BEGIN_ACCEL(2);
+ BEGIN_ACCEL(3);
+ OUT_ACCEL_REG(R300_SC_CLIP_RULE, 0xAAAA);
OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
} else
BEGIN_ACCEL(1);