]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe: flush engine buffers before signalling user fence on all engines
authorAndrzej Hajda <andrzej.hajda@intel.com>
Wed, 5 Jun 2024 07:29:48 +0000 (09:29 +0200)
committerMatthew Brost <matthew.brost@intel.com>
Wed, 5 Jun 2024 18:28:33 +0000 (11:28 -0700)
Tests show that user fence signalling requires kind of write barrier,
otherwise not all writes performed by the workload will be available
to userspace. It is already done for render and compute, we need it
also for the rest: video, gsc, copy.

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
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-2-06e7932f784a@intel.com
drivers/gpu/drm/xe/xe_ring_ops.c

index b11b3cd16b5e669a7be5a564d8044639b66251a9..db630d27beba4ae7ce7b0f560125a6f2f078cbda 100644 (file)
@@ -80,6 +80,16 @@ static int emit_store_imm_ggtt(u32 addr, u32 value, u32 *dw, int i)
        return i;
 }
 
+static int emit_flush_dw(u32 *dw, int i)
+{
+       dw[i++] = MI_FLUSH_DW | MI_FLUSH_IMM_DW;
+       dw[i++] = 0;
+       dw[i++] = 0;
+       dw[i++] = 0;
+
+       return i;
+}
+
 static int emit_flush_imm_ggtt(u32 addr, u32 value, bool invalidate_tlb,
                               u32 *dw, int i)
 {
@@ -234,10 +244,12 @@ 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);
 
-       if (job->user_fence.used)
+       if (job->user_fence.used) {
+               i = emit_flush_dw(dw, i);
                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);
 
@@ -293,10 +305,12 @@ 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);
 
-       if (job->user_fence.used)
+       if (job->user_fence.used) {
+               i = emit_flush_dw(dw, i);
                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);