Commit b5290939 authored by Lin.Cao's avatar Lin.Cao Committed by Alex Deucher
Browse files

drm/amdgpu: fix ring timeout issue in gfx10 sr-iov environment 



commit 26c95e83 ("drm/amdgpu: set the VM pointer to NULL in
amdgpu_job_prepare") set job->vm as NULL if there is no fence. It will
cause emit switch buffer be skippen if job->vm set as NULL.

Check job rather than vm could solve this problem.

Fixes: 26c95e83 ("drm/amdgpu: set the VM pointer to NULL in amdgpu_job_prepare")
Signed-off-by: default avatarLin.Cao <lincao12@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1bf06a1f

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

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned int num_ibs, 
	amdgpu_ring_patch_cond_exec(ring, cond_exec);



	ring->current_ctx = fence_ctx;

	if (vm && ring->funcs->emit_switch_buffer)

	if (job && ring->funcs->emit_switch_buffer)

		amdgpu_ring_emit_switch_buffer(ring);



	if (ring->funcs->emit_wave_limit &&