On 11/21/25 11:12, Pierre-Eric Pelloux-Prayer wrote:
> Deduplicate the IB padding code and will also be used
> later to check locking.
>
> Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 34 ++++++++++++-------------
> 1 file changed, 16 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 17e1892c44a2..be1232b2d55e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -162,6 +162,18 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo,
> *placement = abo->placement;
> }
>
> +static struct dma_fence *
> +amdgpu_ttm_job_submit(struct amdgpu_device *adev, struct amdgpu_job *job, u32 num_dw)
> +{
> + struct amdgpu_ring *ring;
> +
> + ring = adev->mman.buffer_funcs_ring;
> + amdgpu_ring_pad_ib(ring, &job->ibs[0]);
> + WARN_ON(job->ibs[0].length_dw > num_dw);
> +
> + return amdgpu_job_submit(job);
> +}
> +
> /**
> * amdgpu_ttm_map_buffer - Map memory into the GART windows
> * @adev: the device being used
> @@ -185,7 +197,6 @@ static int amdgpu_ttm_map_buffer(struct amdgpu_device *adev,
> {
> unsigned int offset, num_pages, num_dw, num_bytes;
> uint64_t src_addr, dst_addr;
> - struct amdgpu_ring *ring;
> struct amdgpu_job *job;
> void *cpu_addr;
> uint64_t flags;
> @@ -240,10 +251,6 @@ static int amdgpu_ttm_map_buffer(struct amdgpu_device *adev,
> amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr,
> dst_addr, num_bytes, 0);
>
> - ring = adev->mman.buffer_funcs_ring;
> - amdgpu_ring_pad_ib(ring, &job->ibs[0]);
> - WARN_ON(job->ibs[0].length_dw > num_dw);
> -
> flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, mem);
> if (tmz)
> flags |= AMDGPU_PTE_TMZ;
> @@ -261,7 +268,7 @@ static int amdgpu_ttm_map_buffer(struct amdgpu_device *adev,
> amdgpu_gart_map_vram_range(adev, pa, 0, num_pages, flags, cpu_addr);
> }
>
> - dma_fence_put(amdgpu_job_submit(job));
> + dma_fence_put(amdgpu_ttm_job_submit(adev, job, num_dw));
> return 0;
> }
>
> @@ -1497,10 +1504,7 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr, dst_addr,
> PAGE_SIZE, 0);
>
> - amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]);
> - WARN_ON(job->ibs[0].length_dw > num_dw);
> -
> - fence = amdgpu_job_submit(job);
> + fence = amdgpu_ttm_job_submit(adev, job, num_dw);
>
> if (!dma_fence_wait_timeout(fence, false, adev->sdma_timeout))
> r = -ETIMEDOUT;
> @@ -2285,11 +2289,9 @@ int amdgpu_copy_buffer(struct amdgpu_device *adev, uint64_t src_offset,
> byte_count -= cur_size_in_bytes;
> }
>
> - amdgpu_ring_pad_ib(ring, &job->ibs[0]);
> - WARN_ON(job->ibs[0].length_dw > num_dw);
> - *fence = amdgpu_job_submit(job);
> if (r)
> goto error_free;
> + *fence = amdgpu_ttm_job_submit(adev, job, num_dw);
>
> return r;
>
> @@ -2307,7 +2309,6 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_device *adev, uint32_t src_data,
> u64 k_job_id)
> {
> unsigned int num_loops, num_dw;
> - struct amdgpu_ring *ring;
> struct amdgpu_job *job;
> uint32_t max_bytes;
> unsigned int i;
> @@ -2331,10 +2332,7 @@ static int amdgpu_ttm_fill_mem(struct amdgpu_device *adev, uint32_t src_data,
> byte_count -= cur_size;
> }
>
> - ring = adev->mman.buffer_funcs_ring;
> - amdgpu_ring_pad_ib(ring, &job->ibs[0]);
> - WARN_ON(job->ibs[0].length_dw > num_dw);
> - *fence = amdgpu_job_submit(job);
> + *fence = amdgpu_ttm_job_submit(adev, job, num_dw);
> return 0;
> }
>