Commit ae1589f6 authored Jun 07, 2019 by Monk Liu Committed by Alex Deucher Jun 11, 2019

drm/amdgpu: drop the incorrect soft_reset for SRIOV



It's incorrect to do soft reset for SRIOV, when GFX
hang the WREG would stuck there becuase it goes KIQ way.

the GPU reset counter is incorrect: always increase twice
for each timedout

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent df0a8064

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -399,7 +399,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
		{
		ktime_t deadline = ktime_add_us(ktime_get(), 10000);

		if (!ring->funcs->soft_recovery \|\| !fence)
		if (amdgpu_sriov_vf(ring->adev) \|\| !ring->funcs->soft_recovery \|\| !fence)
		return false;

		atomic_inc(&ring->adev->gpu_reset_counter);

Admin message