drm/xe/oa: Add input fence dependencies

[ Upstream commit 2fb4350a283af03a5ee34ba765783a941f942b82 ]

Add input fence dependencies which will make OA configuration wait till
these dependencies are met (till input fences signal).

v2: Change add_deps arg to xe_oa_submit_bb from bool to enum (Matt Brost)

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241022200352.1192560-4-ashutosh.dixit@intel.com
Stable-dep-of: f0ed39830e60 ("xe/oa: Fix query mode of operation for OAR/OAC")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 20d279ed3c3822c9f6848bc9e927ee8547e78b3a..1bfc4b58b5c174fdfb1999e92120f94435066616 100644 (file)
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -42,6 +42,11 @@
 #define DEFAULT_POLL_PERIOD_NS (NSEC_PER_SEC / DEFAULT_POLL_FREQUENCY_HZ)
 #define XE_OA_UNIT_INVALID U32_MAX
 
+enum xe_oa_submit_deps {
+       XE_OA_SUBMIT_NO_DEPS,
+       XE_OA_SUBMIT_ADD_DEPS,
+};
+
 struct xe_oa_reg {
        struct xe_reg addr;
        u32 value;
@@ -572,7 +577,8 @@ static __poll_t xe_oa_poll(struct file *file, poll_table *wait)
        return ret;
 }
 
-static struct dma_fence *xe_oa_submit_bb(struct xe_oa_stream *stream, struct xe_bb *bb)
+static struct dma_fence *xe_oa_submit_bb(struct xe_oa_stream *stream, enum xe_oa_submit_deps deps,
+                                        struct xe_bb *bb)
 {
        struct xe_sched_job *job;
        struct dma_fence *fence;
@@ -585,11 +591,22 @@ static struct dma_fence *xe_oa_submit_bb(struct xe_oa_stream *stream, struct xe_
                goto exit;
        }
 
+       if (deps == XE_OA_SUBMIT_ADD_DEPS) {
+               for (int i = 0; i < stream->num_syncs && !err; i++)
+                       err = xe_sync_entry_add_deps(&stream->syncs[i], job);
+               if (err) {
+                       drm_dbg(&stream->oa->xe->drm, "xe_sync_entry_add_deps err %d\n", err);
+                       goto err_put_job;
+               }
+       }
+
        xe_sched_job_arm(job);
        fence = dma_fence_get(&job->drm.s_fence->finished);
        xe_sched_job_push(job);
 
        return fence;
+err_put_job:
+       xe_sched_job_put(job);
 exit:
        return ERR_PTR(err);
 }
@@ -667,7 +684,7 @@ static int xe_oa_modify_ctx_image(struct xe_oa_stream *stream, struct xe_lrc *lr
 
        xe_oa_store_flex(stream, lrc, bb, flex, count);
 
-       fence = xe_oa_submit_bb(stream, bb);
+       fence = xe_oa_submit_bb(stream, XE_OA_SUBMIT_NO_DEPS, bb);
        if (IS_ERR(fence)) {
                err = PTR_ERR(fence);
                goto free_bb;
@@ -696,7 +713,7 @@ static int xe_oa_load_with_lri(struct xe_oa_stream *stream, struct xe_oa_reg *re
 
        write_cs_mi_lri(bb, reg_lri, 1);
 
-       fence = xe_oa_submit_bb(stream, bb);
+       fence = xe_oa_submit_bb(stream, XE_OA_SUBMIT_NO_DEPS, bb);
        if (IS_ERR(fence)) {
                err = PTR_ERR(fence);
                goto free_bb;
@@ -944,7 +961,7 @@ static int xe_oa_emit_oa_config(struct xe_oa_stream *stream, struct xe_oa_config
                goto exit;
        }
 
-       fence = xe_oa_submit_bb(stream, oa_bo->bb);
+       fence = xe_oa_submit_bb(stream, XE_OA_SUBMIT_ADD_DEPS, oa_bo->bb);
        if (IS_ERR(fence)) {
                err = PTR_ERR(fence);
                goto exit;