|
@@ -3905,7 +3905,21 @@ void cik_fence_gfx_ring_emit(struct radeon_device *rdev,
|
|
|
struct radeon_ring *ring = &rdev->ring[fence->ring];
|
|
|
u64 addr = rdev->fence_drv[fence->ring].gpu_addr;
|
|
|
|
|
|
- /* EVENT_WRITE_EOP - flush caches, send int */
|
|
|
+ /* Workaround for cache flush problems. First send a dummy EOP
|
|
|
+ * event down the pipe with seq one below.
|
|
|
+ */
|
|
|
+ radeon_ring_write(ring, PACKET3(PACKET3_EVENT_WRITE_EOP, 4));
|
|
|
+ radeon_ring_write(ring, (EOP_TCL1_ACTION_EN |
|
|
|
+ EOP_TC_ACTION_EN |
|
|
|
+ EVENT_TYPE(CACHE_FLUSH_AND_INV_TS_EVENT) |
|
|
|
+ EVENT_INDEX(5)));
|
|
|
+ radeon_ring_write(ring, addr & 0xfffffffc);
|
|
|
+ radeon_ring_write(ring, (upper_32_bits(addr) & 0xffff) |
|
|
|
+ DATA_SEL(1) | INT_SEL(0));
|
|
|
+ radeon_ring_write(ring, fence->seq - 1);
|
|
|
+ radeon_ring_write(ring, 0);
|
|
|
+
|
|
|
+ /* Then send the real EOP event down the pipe. */
|
|
|
radeon_ring_write(ring, PACKET3(PACKET3_EVENT_WRITE_EOP, 4));
|
|
|
radeon_ring_write(ring, (EOP_TCL1_ACTION_EN |
|
|
|
EOP_TC_ACTION_EN |
|