diff options
author | Chunming Zhou <David1.Zhou@amd.com> | 2016-02-29 01:12:38 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-02 11:01:23 -0500 |
commit | 9cac537332f5502c103415b25609548c276a09f8 (patch) | |
tree | 63224379a79bf92b55da2b082b36010bd0363415 | |
parent | feebe91aa9a9d99d9ec157612a614fadb79beb99 (diff) |
drm/amdgpu/gfx8: specify which engine to wait before vm flush
Select between me and pfp properly.
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 1c40bd90afbb..7086ac17abee 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -4809,7 +4809,8 @@ static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring, | |||
4809 | 4809 | ||
4810 | amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); | 4810 | amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5)); |
4811 | amdgpu_ring_write(ring, (WAIT_REG_MEM_MEM_SPACE(1) | /* memory */ | 4811 | amdgpu_ring_write(ring, (WAIT_REG_MEM_MEM_SPACE(1) | /* memory */ |
4812 | WAIT_REG_MEM_FUNCTION(3))); /* equal */ | 4812 | WAIT_REG_MEM_FUNCTION(3) | /* equal */ |
4813 | WAIT_REG_MEM_ENGINE(usepfp))); /* pfp or me */ | ||
4813 | amdgpu_ring_write(ring, addr & 0xfffffffc); | 4814 | amdgpu_ring_write(ring, addr & 0xfffffffc); |
4814 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); | 4815 | amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff); |
4815 | amdgpu_ring_write(ring, seq); | 4816 | amdgpu_ring_write(ring, seq); |