summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-03-09 10:59:27 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-03-09 10:59:27 -0400
commitcee25efa7deabaf15501e15e0b05c8bd345fda89 (patch)
tree5e01359b5c944ed02501d06f076d1b48ae5d335d
parent160d78a88999cce552f82e6b79e50a9d2140b267 (diff)
R6xx/R7xx: remove extra padding on cache flush and wait_until
padding is properly taken care of in commit_ring
-rw-r--r--shared-core/radeon_cp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index ededb0da..5ed03bcd 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -522,7 +522,7 @@ int radeon_do_cp_idle(drm_radeon_private_t * dev_priv)
DRM_DEBUG("\n");
if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) {
- BEGIN_RING(8);
+ BEGIN_RING(5);
OUT_RING(CP_PACKET3(R600_IT_EVENT_WRITE, 0));
OUT_RING(R600_CACHE_FLUSH_AND_INV_EVENT);
@@ -530,9 +530,6 @@ int radeon_do_cp_idle(drm_radeon_private_t * dev_priv)
OUT_RING(CP_PACKET3(R600_IT_SET_CONFIG_REG, 1));
OUT_RING((R600_WAIT_UNTIL - R600_SET_CONFIG_REG_OFFSET) >> 2);
OUT_RING(RADEON_WAIT_3D_IDLE | RADEON_WAIT_3D_IDLECLEAN);
- OUT_RING(CP_PACKET2());
- OUT_RING(CP_PACKET2());
- OUT_RING(CP_PACKET2());
} else {