drm/amdgpu: move ib.fence to job.fence

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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 345cac9948be..8443cea6821a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -92,7 +92,6 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f)
 {
         amdgpu_sa_bo_free(adev, &ib->sa_bo, f);
-        fence_put(ib->fence);
 }
 
 /**
@@ -124,6 +123,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         struct amdgpu_ib *ib = &ibs[0];
         struct amdgpu_ctx *ctx, *old_ctx;
         struct amdgpu_vm *vm;
+        struct fence *hwf;
         unsigned i;
         int r = 0;
 
@@ -180,7 +180,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                         amdgpu_ring_emit_hdp_invalidate(ring);
         }
 
-        r = amdgpu_fence_emit(ring, &ib->fence);
+        r = amdgpu_fence_emit(ring, &hwf);
         if (r) {
                 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
                 ring->current_ctx = old_ctx;
@@ -199,7 +199,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
         }
 
         if (f)
-                *f = fence_get(ib->fence);
+                *f = fence_get(hwf);
 
         amdgpu_ring_commit(ring);
         return 0;