This reverts commit 8a4dfdc0d2adfc362ec310ff70526e79ff8377b6. This causes flakiness in gfx11 CI tests. Revert.
Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 324d25c77897a..c3f56253d3b87 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -715,9 +715,6 @@ void amdgpu_fence_driver_force_completion(struct amdgpu_ring *ring, void amdgpu_ring_set_fence_errors_and_reemit(struct amdgpu_ring *ring, struct amdgpu_fence *guilty_fence) { - bool emit_spm_needed = ring->adev->gfx.rlc.funcs->update_spm_vmid && - (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE || - ring->funcs->type == AMDGPU_RING_TYPE_GFX); struct dma_fence *unprocessed; struct dma_fence __rcu **ptr; struct amdgpu_fence *fence; @@ -749,9 +746,6 @@ void amdgpu_ring_set_fence_errors_and_reemit(struct amdgpu_ring *ring, } ring->reemit = true; amdgpu_ring_alloc(ring, ring->ring_backup_entries_to_copy); - if (emit_spm_needed) - ring->adev->gfx.rlc.funcs->update_spm_vmid(ring->adev, ring->xcc_id, - ring->adev->vm_manager.spm_vmid); spin_lock_irqsave(&ring->fence_drv.lock, flags); do { last_seq++; -- 2.56.1
