diff options
| author | Andrzej Hajda <andrzej.hajda@intel.com> | 2024-06-05 10:29:47 +0300 |
|---|---|---|
| committer | Matthew Brost <matthew.brost@intel.com> | 2024-06-05 21:28:33 +0300 |
| commit | 3494f5f5f675d84385b0f6bfcca1e10c739bf9bb (patch) | |
| tree | f493cb1382a09a64dc7ad39c0bce3b4c48515526 | |
| parent | b3181f433206a1432bc7093d1896fe36026f7fff (diff) | |
| download | linux-3494f5f5f675d84385b0f6bfcca1e10c739bf9bb.tar.xz | |
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@intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240605-fix_user_fence_posted-v3-1-06e7932f784a@intel.com
| -rw-r--r-- | drivers/gpu/drm/xe/xe_ring_ops.c | 8 |
1 files 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); |