drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE

Moves are exclusive operations anyway, just use the undefined owner for those.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index e615fffdb3f2..5961d63f8913 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -405,7 +405,6 @@ struct amdgpu_fence_driver {
 /* some special values for the owner field */
 #define AMDGPU_FENCE_OWNER_UNDEFINED    ((void*)0ul)
 #define AMDGPU_FENCE_OWNER_VM           ((void*)1ul)
-#define AMDGPU_FENCE_OWNER_MOVE         ((void*)2ul)
 
 #define AMDGPU_FENCE_FLAG_64BIT         (1 << 0)
 #define AMDGPU_FENCE_FLAG_INT           (1 << 1)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index c6489b198a99..a6697fd05217 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -191,8 +191,8 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
                          * for other VM updates and moves.
                          */
                         fence_owner = amdgpu_sync_get_owner(f);
-                        if ((owner != AMDGPU_FENCE_OWNER_MOVE) &&
-                            (fence_owner != AMDGPU_FENCE_OWNER_MOVE) &&
+                        if ((owner != AMDGPU_FENCE_OWNER_UNDEFINED) &&
+                            (fence_owner != AMDGPU_FENCE_OWNER_UNDEFINED) &&
                             ((owner == AMDGPU_FENCE_OWNER_VM) !=
                              (fence_owner == AMDGPU_FENCE_OWNER_VM)))
                                 continue;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index a089e69e9927..81bb8e9fc26d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1041,7 +1041,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring,
         WARN_ON(ib->length_dw > num_dw);
         r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1,
                                                  &amdgpu_vm_free_job,
-                                                 AMDGPU_FENCE_OWNER_MOVE,
+                                                 AMDGPU_FENCE_OWNER_UNDEFINED,
                                                  fence);
         if (r)
                 goto error_free;