[PATCH 4/8] drm/xe/oa: Add input fence dependencies

[Ashutosh Dixit <ashutosh.dixit@intel.com>]

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

Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
 drivers/gpu/drm/xe/xe_oa.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index ba8f2e9d95b7f..416e031ac454b 100644
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -578,10 +578,10 @@ static __poll_t xe_oa_poll(struct file *file, poll_table *wait)
 }
 
 static int xe_oa_submit_bb(struct xe_oa_stream *stream, struct xe_bb *bb,
-			   struct dma_fence **fence)
+			   bool add_deps, struct dma_fence **fence)
 {
 	struct xe_sched_job *job;
-	int err = 0;
+	int i, err = 0;
 
 	/* Kernel configuration is issued on stream->k_exec_q, not stream->exec_q */
 	job = xe_bb_create_job(stream->k_exec_q, bb);
@@ -590,9 +590,23 @@ static int xe_oa_submit_bb(struct xe_oa_stream *stream, struct xe_bb *bb,
 		goto exit;
 	}
 
+	if (add_deps) {
+		for (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 0;
+
+err_put_job:
+	xe_sched_job_put(job);
 exit:
 	return err;
 }
@@ -670,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);
 
-	err = xe_oa_submit_bb(stream, bb, &fence);
+	err = xe_oa_submit_bb(stream, bb, false, &fence);
 	xe_bb_free(bb, fence);
 	dma_fence_put(fence);
 exit:
@@ -691,7 +705,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);
 
-	err = xe_oa_submit_bb(stream, bb, &fence);
+	err = xe_oa_submit_bb(stream, bb, false, &fence);
 	xe_bb_free(bb, fence);
 	dma_fence_put(fence);
 exit:
@@ -971,7 +985,7 @@ static int xe_oa_emit_oa_config(struct xe_oa_stream *stream, struct xe_oa_config
 		goto exit;
 	}
 
-	err = xe_oa_submit_bb(stream, oa_bo->bb, &fence);
+	err = xe_oa_submit_bb(stream, oa_bo->bb, true, &fence);
 	if (err)
 		goto exit;
 
-- 
2.41.0