Commit ee60209b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx9: re-emit unprocessed state on kcq reset 



Re-emit the unprocessed state after resetting the queue.

Reviewed-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 81df6bfa

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

+2 −8
Original line number Diff line number Diff line
@@ -7189,7 +7189,7 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring, 
	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)

		return -EINVAL;



	drm_sched_wqueue_stop(&ring->sched);

	amdgpu_ring_reset_helper_begin(ring, timedout_fence);



	spin_lock_irqsave(&kiq->ring_lock, flags);
@@ -7246,13 +7246,7 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring, 
		DRM_ERROR("fail to remap queue\n");

		return r;

	}



	r = amdgpu_ring_test_ring(ring);

	if (r)

		return r;

	amdgpu_fence_driver_force_completion(ring);

	drm_sched_wqueue_start(&ring->sched);

	return 0;

	return amdgpu_ring_reset_helper_end(ring, timedout_fence);

}



static void gfx_v9_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)