From: Christian König Date: Wed, 31 Jan 2018 10:21:23 +0000 (+0100) Subject: drm/amdgpu: stop checking GPU reset counter during VMID grab X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=782dcfdfd9c1c30e0b8304915297cef665a9867c;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: stop checking GPU reset counter during VMID grab We do this later on when we flush the VMID anyway. Signed-off-by: Christian König Reviewed-by: Chunming Zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c index ac31740d1cd3..5761a659baf2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c @@ -266,8 +266,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, bool needs_flush = vm->use_cpu_for_update; flushed = id->flushed_updates; - if ((amdgpu_vmid_had_gpu_reset(adev, id)) || - (id->owner != vm->entity.fence_context) || + if ((id->owner != vm->entity.fence_context) || (job->vm_pd_addr != id->pd_gpu_addr) || (updates && (!flushed || updates->context != flushed->context || dma_fence_is_later(updates, flushed))) || @@ -350,9 +349,6 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, bool needs_flush = vm->use_cpu_for_update; /* Check all the prerequisites to using this VMID */ - if (amdgpu_vmid_had_gpu_reset(adev, id)) - continue; - if (id->owner != vm->entity.fence_context) continue;