Skip to content

Commit 11ef40e

Browse files
Tvrtko Ursulinlucasdemarchi
authored andcommitted
drm/xe: Pass flags directly to emit_flush_imm_ggtt
This is more readable than the nameless booleans and will also come handy later. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Tejas Upadhyay <tejas.upadhyay@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250307111402.26577-4-tvrtko.ursulin@igalia.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> (cherry picked from commit 52a237e) Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
1 parent e2a0a63 commit 11ef40e

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

drivers/gpu/drm/xe/xe_ring_ops.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ static int emit_flush_dw(u32 *dw, int i)
9090
return i;
9191
}
9292

93-
static int emit_flush_imm_ggtt(u32 addr, u32 value, bool invalidate_tlb,
94-
u32 *dw, int i)
93+
static int emit_flush_imm_ggtt(u32 addr, u32 value, u32 flags, u32 *dw, int i)
9594
{
9695
dw[i++] = MI_FLUSH_DW | MI_FLUSH_DW_OP_STOREDW | MI_FLUSH_IMM_DW |
97-
(invalidate_tlb ? MI_INVALIDATE_TLB : 0);
96+
flags;
9897
dw[i++] = addr | MI_FLUSH_DW_USE_GTT;
9998
dw[i++] = 0;
10099
dw[i++] = value;
@@ -254,7 +253,7 @@ static void __emit_job_gen12_simple(struct xe_sched_job *job, struct xe_lrc *lrc
254253
if (job->ring_ops_flush_tlb) {
255254
dw[i++] = preparser_disable(true);
256255
i = emit_flush_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc),
257-
seqno, true, dw, i);
256+
seqno, MI_INVALIDATE_TLB, dw, i);
258257
dw[i++] = preparser_disable(false);
259258
} else {
260259
i = emit_store_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc),
@@ -270,7 +269,7 @@ static void __emit_job_gen12_simple(struct xe_sched_job *job, struct xe_lrc *lrc
270269
dw, i);
271270
}
272271

273-
i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
272+
i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, 0, dw, i);
274273

275274
i = emit_user_interrupt(dw, i);
276275

@@ -316,7 +315,7 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc,
316315

317316
if (job->ring_ops_flush_tlb)
318317
i = emit_flush_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc),
319-
seqno, true, dw, i);
318+
seqno, MI_INVALIDATE_TLB, dw, i);
320319

321320
dw[i++] = preparser_disable(false);
322321

@@ -333,7 +332,7 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc,
333332
dw, i);
334333
}
335334

336-
i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, false, dw, i);
335+
i = emit_flush_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, 0, dw, i);
337336

338337
i = emit_user_interrupt(dw, i);
339338

0 commit comments

Comments
 (0)