[PATCH v3 1/2] Revert "drm/xe: flush gtt before signalling user fence on all engines"

[Cavitt, Jonathan]

-----Original Message-----
From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Andrzej Hajda
Sent: Wednesday, June 5, 2024 12:30 AM
To: intel-xe at lists.freedesktop.org
Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>; Brost, Matthew <matthew.brost at intel.com>; De Marchi, Lucas <lucas.demarchi at intel.com>; Maarten Lankhorst <maarten.lankhorst at linux.intel.com>; Auld, Matthew <matthew.auld at intel.com>; Hajda, Andrzej <andrzej.hajda at intel.com>
Subject: [PATCH v3 1/2] Revert "drm/xe: flush gtt before signalling user fence on all engines"
> 
> This reverts commit 38007fa96419a9db9719f170b9e8a7877821cdd1.
> 
> Signaling user-fence after seqno write does not seem to be good solution.
> Instead of changing order separate barrier should be put before user-fence,
> this will be done in separate patch.
> 
> v2: added fixes tag in case reverted patch gets backported to stable
> 
> Fixes: 38007fa96419 ("drm/xe: flush gtt before signalling user fence on all engines")
> Signed-off-by: Andrzej Hajda <andrzej.hajda at intel.com>
> Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>

Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  drivers/gpu/drm/xe/xe_ring_ops.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c
> index 2a607c141d65..b11b3cd16b5e 100644
> --- a/drivers/gpu/drm/xe/xe_ring_ops.c
> +++ b/drivers/gpu/drm/xe/xe_ring_ops.c
> @@ -234,13 +234,13 @@ static void __emit_job_gen12_simple(struct xe_sched_job *job, struct xe_lrc *lrc
>  
>  	i = emit_bb_start(batch_addr, ppgtt_flag, dw, i);
>  
> -	i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
> -
>  	if (job->user_fence.used)
>  		i = emit_store_imm_ppgtt_posted(job->user_fence.addr,
>  						job->user_fence.value,
>  						dw, i);
>  
> +	i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
> +
>  	i = emit_user_interrupt(dw, i);
>  
>  	xe_gt_assert(gt, i <= MAX_JOB_SIZE_DW);
> @@ -293,13 +293,13 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc,
>  
>  	i = emit_bb_start(batch_addr, ppgtt_flag, dw, i);
>  
> -	i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
> -
>  	if (job->user_fence.used)
>  		i = emit_store_imm_ppgtt_posted(job->user_fence.addr,
>  						job->user_fence.value,
>  						dw, i);
>  
> +	i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
> +
>  	i = emit_user_interrupt(dw, i);
>  
>  	xe_gt_assert(gt, i <= MAX_JOB_SIZE_DW);
> 
> -- 
> 2.34.1
> 
>