Skip to content

Commit

Permalink
Revert "drm/xe: flush gtt before signalling user fence on all engines"
Browse files Browse the repository at this point in the history
This reverts commit 38007fa.

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: 38007fa ("drm/xe: flush gtt before signalling user fence on all engines")
Signed-off-by: Andrzej Hajda <[email protected]>
Reviewed-by: Thomas Hellström <[email protected]>
Signed-off-by: Matthew Brost <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
ahajda authored and mbrost05 committed Jun 5, 2024
1 parent b3181f4 commit 3494f5f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/xe/xe_ring_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 3494f5f

Please sign in to comment.