[PATCH 5/7] drm/amdgpu: no need pipeline sync after gpu reset

[Chunming Zhou]

Change-Id: I69ed200110a0b000280cd84d07b03fb647d8e3a7
Signed-off-by: Chunming Zhou <David1.Zhou at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index cced2f6..6ba2b0a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -378,7 +378,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring,
 		id->oa_size != oa_size);
 	int r;
 
-	if (ring->funcs->emit_pipeline_sync && (
+	if (!amdgpu_vm_is_gpu_reset(adev, id) &&
+	    ring->funcs->emit_pipeline_sync && (
 	    pd_addr != AMDGPU_VM_NO_FLUSH || gds_switch_needed ||
 	    amdgpu_vm_ring_has_compute_vm_bug(ring)))
 		amdgpu_ring_emit_pipeline_sync(ring);
-- 
1.9.1