Re: [PATCH v2 10/20] drm/admgpu: handle resv dependencies in amdgpu_ttm_map_buffer

Christian König
2025-11-17T08:44:38Z

On 11/13/25 17:05, Pierre-Eric Pelloux-Prayer wrote:
> If a resv object is passed, its fences are treated as a dependency
> for the amdgpu_ttm_map_buffer operation.
>
> This will be used by amdgpu_bo_release_notify through
> amdgpu_fill_buffer.

Why should updating the GART window depend on fences in a resv object?

Regards,
Christian.

>
> Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index b13f0993dbf1..411997db70eb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -184,7 +184,8 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entity *entity,
> struct amdgpu_res_cursor *mm_cur,
> unsigned int window, struct amdgpu_ring *ring,
> bool tmz, uint64_t *size, uint64_t *addr,
> - struct dma_fence *dep)
> + struct dma_fence *dep,
> + struct dma_resv *resv)
> {
> struct amdgpu_device *adev = ring->adev;
> unsigned int offset, num_pages, num_dw, num_bytes;
> @@ -239,6 +240,10 @@ static int amdgpu_ttm_map_buffer(struct drm_sched_entity *entity,
> if (dep)
> drm_sched_job_add_dependency(&job->base, dma_fence_get(dep));
>
> + if (resv)
> + drm_sched_job_add_resv_dependencies(&job->base, resv,
> + DMA_RESV_USAGE_BOOKKEEP);
> +
> src_addr = num_dw * 4;
> src_addr += job->ibs[0].gpu_addr;
>
> @@ -332,14 +337,14 @@ static int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,
> r = amdgpu_ttm_map_buffer(&entity->base,
> src->bo, src->mem, &src_mm,
> entity->gart_window_id0, ring, tmz, &cur_size, &from,
> - NULL);
> + NULL, NULL);
> if (r)
> goto error;
>
> r = amdgpu_ttm_map_buffer(&entity->base,
> dst->bo, dst->mem, &dst_mm,
> entity->gart_window_id1, ring, tmz, &cur_size, &to,
> - NULL);
> + NULL, NULL);
> if (r)
> goto error;
>
> @@ -2451,7 +2456,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo,
> r = amdgpu_ttm_map_buffer(&entity->base,
> &bo->tbo, bo->tbo.resource, &cursor,
> entity->gart_window_id1, ring, false, &size, &addr,
> - NULL);
> + NULL, NULL);
> if (r)
> goto err;
>
> @@ -2506,7 +2511,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity *entity,
> &bo->tbo, bo->tbo.resource, &dst,
> entity->gart_window_id1, ring, false,
> &cur_size, &to,
> - dependency);
> + dependency,
> + resv);
> if (r)
> goto error;
>