Commit 2fb4350a authored by Ashutosh Dixit's avatar Ashutosh Dixit
Browse files

drm/xe/oa: Add input fence dependencies 



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: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241022200352.1192560-4-ashutosh.dixit@intel.com
parent c8507a25

drivers/gpu/drm/xe/xe_oa.c

+21 −4
Original line number Diff line number Diff line
@@ -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;
@@ -575,7 +580,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;
@@ -588,11 +594,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);

}
@@ -670,7 +687,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;
@@ -699,7 +716,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;
@@ -949,7 +966,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;