summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-10-22 17:42:35 +0200
committerAlex Deucher <alexander.deucher@amd.com>2012-10-23 16:23:50 +0200
commit58f8cf56f937840aa3c1416eed29f595159c60a3 (patch)
treecba423d1817a072121871db6bf1a7276b2bde375 /drivers/gpu/drm/radeon/si.c
parentdrm/radeon: add error output if VM CS fails on cayman (diff)
downloadlinux-58f8cf56f937840aa3c1416eed29f595159c60a3.tar.xz
linux-58f8cf56f937840aa3c1416eed29f595159c60a3.zip
drm/radeon: fix PFP sync in vm_flush
Otherwise the next IB might start reading commands with the page table still invalid. Signed-off-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r--drivers/gpu/drm/radeon/si.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index df8dd7701643..da184de021bd 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -2868,6 +2868,10 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)
radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);
radeon_ring_write(ring, 0);
radeon_ring_write(ring, 1 << vm->id);
+
+ /* sync PFP to ME, otherwise we might get invalid PFP reads */
+ radeon_ring_write(ring, PACKET3(PACKET3_PFP_SYNC_ME, 0));
+ radeon_ring_write(ring, 0x0);
}
/*