Commit 5dffaa1b authored by Nirmoy Das's avatar Nirmoy Das Committed by Lucas De Marchi
Browse files

drm/xe: Create a helper function to init job's user fence 



Refactor xe_sync_entry_signal so it doesn't have to
modify xe_sched_job struct instead create a new helper function
to set user fence values for a job.

v2: Move the sync type check to xe_sched_job_init_user_fence(Lucas)

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240321161142.4954-1-nirmoy.das@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 4b217c7f

drivers/gpu/drm/xe/xe_exec.c

+5 −4
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
				goto err_unlock_list;

			}

			for (i = 0; i < num_syncs; i++)

				xe_sync_entry_signal(&syncs[i], NULL, fence);

				xe_sync_entry_signal(&syncs[i], fence);

			xe_exec_queue_last_fence_set(q, vm, fence);

			dma_fence_put(fence);

		}
@@ -359,9 +359,10 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
		drm_gpuvm_resv_add_fence(&vm->gpuvm, exec, &job->drm.s_fence->finished,

					 DMA_RESV_USAGE_BOOKKEEP, DMA_RESV_USAGE_WRITE);



	for (i = 0; i < num_syncs; i++)

		xe_sync_entry_signal(&syncs[i], job,

				     &job->drm.s_fence->finished);

	for (i = 0; i < num_syncs; i++) {

		xe_sync_entry_signal(&syncs[i], &job->drm.s_fence->finished);

		xe_sched_job_init_user_fence(job, &syncs[i]);

	}



	if (xe_exec_queue_is_lr(q))

		q->ring_ops->emit_job(job);

drivers/gpu/drm/xe/xe_sched_job.c

+18 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include "xe_sched_job.h"



#include <drm/xe_drm.h>

#include <linux/dma-fence-array.h>

#include <linux/slab.h>
@@ -15,6 +16,7 @@ 
#include "xe_hw_fence.h"

#include "xe_lrc.h"

#include "xe_macros.h"

#include "xe_sync_types.h"

#include "xe_trace.h"

#include "xe_vm.h"
@@ -278,6 +280,22 @@ int xe_sched_job_last_fence_add_dep(struct xe_sched_job *job, struct xe_vm *vm) 
	return drm_sched_job_add_dependency(&job->drm, fence);

}



/**

 * xe_sched_job_init_user_fence - Initialize user_fence for the job

 * @job: job whose user_fence needs an init

 * @sync: sync to be use to init user_fence

 */

void xe_sched_job_init_user_fence(struct xe_sched_job *job,

				  struct xe_sync_entry *sync)

{

	if (sync->type != DRM_XE_SYNC_TYPE_USER_FENCE)

		return;



	job->user_fence.used = true;

	job->user_fence.addr = sync->addr;

	job->user_fence.value = sync->timeline_value;

}



struct xe_sched_job_snapshot *

xe_sched_job_snapshot_capture(struct xe_sched_job *job)

{

drivers/gpu/drm/xe/xe_sched_job.h

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


struct drm_printer;

struct xe_vm;

struct xe_sync_entry;



#define XE_SCHED_HANG_LIMIT 1

#define XE_SCHED_JOB_TIMEOUT LONG_MAX
@@ -58,6 +59,8 @@ void xe_sched_job_arm(struct xe_sched_job *job); 
void xe_sched_job_push(struct xe_sched_job *job);



int xe_sched_job_last_fence_add_dep(struct xe_sched_job *job, struct xe_vm *vm);

void xe_sched_job_init_user_fence(struct xe_sched_job *job,

				  struct xe_sync_entry *sync);



static inline struct xe_sched_job *

to_xe_sched_job(struct drm_sched_job *drm)

drivers/gpu/drm/xe/xe_sync.c

+1 −6
Original line number Diff line number Diff line
@@ -224,8 +224,7 @@ int xe_sync_entry_add_deps(struct xe_sync_entry *sync, struct xe_sched_job *job) 
	return 0;

}



void xe_sync_entry_signal(struct xe_sync_entry *sync, struct xe_sched_job *job,

			  struct dma_fence *fence)

void xe_sync_entry_signal(struct xe_sync_entry *sync, struct dma_fence *fence)

{

	if (!(sync->flags & DRM_XE_SYNC_FLAG_SIGNAL))

		return;
@@ -254,10 +253,6 @@ void xe_sync_entry_signal(struct xe_sync_entry *sync, struct xe_sched_job *job, 
			user_fence_put(sync->ufence);

			dma_fence_put(fence);

		}

	} else if (sync->type == DRM_XE_SYNC_TYPE_USER_FENCE) {

		job->user_fence.used = true;

		job->user_fence.addr = sync->addr;

		job->user_fence.value = sync->timeline_value;

	}

}

drivers/gpu/drm/xe/xe_sync.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ int xe_sync_entry_wait(struct xe_sync_entry *sync); 
int xe_sync_entry_add_deps(struct xe_sync_entry *sync,

			   struct xe_sched_job *job);

void xe_sync_entry_signal(struct xe_sync_entry *sync,

			  struct xe_sched_job *job,

			  struct dma_fence *fence);

void xe_sync_entry_cleanup(struct xe_sync_entry *sync);

struct dma_fence *