drm/i915: Individualize fences before adding to dma_resv obj
Subsystems (2)
PATCH 1/1 drm/i915: Individualize fences before adding to dma_resv obj
_i915_vma_move_to_active() can receive > 1 fences for multiple batch buffers submission. Because dma_resv_add_fence() can only accept one fence at a time, change _i915_vma_move_to_active() to be aware of multiple fences so that it can add individual fences to the dma resv object.
v4: Reserve fences for composite_fence on multi-batch contexts and
also reserve fence slots to composite_fence for each VMAs.
v3: dma_resv_reserve_fences is not cumulative so pass num_fences.
v2: make sure to reserve enough fence slots before adding.
Signed-off-by Nirmoy Das <[email protected]>
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 10 +++- drivers/gpu/drm/i915/i915_vma.c | 47 +++++++++++-------- 2 files changed, 36 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +9 -1
@@ -1010,7 +1010,8 @@ static int eb_validate_vmas(struct i915_execbuffer *eb) } } - err =dma_resv_reserve_fences (vma->obj->base.resv,1 ); +/* Reserve enough slots to accommodate composite fences */ + err =dma_resv_reserve_fences (vma->obj->base.resv, eb->num_batches);if (err)return err;
@@ -3146,6 +3147,7 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)struct dma_fence_array *fence_array;struct dma_fence **fences;unsigned int i; +int err;GEM_BUG_ON (!intel_context_is_parent (eb->context));
@@ -3154,6 +3156,12 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)return ERR_PTR (-ENOMEM );for_each_batch_create_order (eb, i) { + err =dma_resv_reserve_fences (eb->batches[i]->vma->obj->base.resv, eb->num_batches); +if (err) { +kfree (fences); +return ERR_PTR (err); + } + fences[i] = &eb->requests[i]->fence;__set_bit (I915_FENCE_FLAG_COMPOSITE , &eb->requests[i]->fence.flags);
drivers/gpu/drm/i915/i915_vma.c +27 -20
70 lines not on this page · raw message
Signature · 1 line
2.35.1