Commit 7a91d6cb authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE 



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

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a67bcd34

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE