Commit 0c1beb7c authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: make non-NULL out fence mandatory 



amdgpu_ttm_copy_mem_to_mem has a single caller, make sure the out
fence is non-NULL to simplify the code.
Since none of the pointers should be NULL, we can enable
__attribute__((nonnull))__.

While at it make the function static since it's only used from
amdgpuu_ttm.c.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 17f5bd95

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

+8 −9
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ static int amdgpu_ttm_map_buffer(struct ttm_buffer_object *bo, 
 * move and different for a BO to BO copy.

 *

 */

int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,

__attribute__((nonnull))

static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,

				      const struct amdgpu_copy_mem *src,

				      const struct amdgpu_copy_mem *dst,

				      uint64_t size, bool tmz,
@@ -365,9 +366,7 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, 
	}

error:

	mutex_unlock(&adev->mman.gtt_window_lock);

	if (f)

		*f = dma_fence_get(fence);

	dma_fence_put(fence);

	*f = fence;

	return r;

}

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

+0 −6
Original line number Diff line number Diff line
@@ -170,12 +170,6 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, 
		       struct dma_resv *resv,

		       struct dma_fence **fence, bool direct_submit,

		       bool vm_needs_flush, uint32_t copy_flags);

int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,

			       const struct amdgpu_copy_mem *src,

			       const struct amdgpu_copy_mem *dst,

			       uint64_t size, bool tmz,

			       struct dma_resv *resv,

			       struct dma_fence **f);

int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo,

			    struct dma_resv *resv,

			    struct dma_fence **fence);