From: José Roberto de Souza Date: Tue, 23 May 2023 20:14:45 +0000 (-0700) Subject: drm/xe: Replace PVC check by engine type check X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e40483644098ef75ea1344e5cdc9285e30c28ae;p=linux.git drm/xe: Replace PVC check by engine type check __emit_job_gen12_render_compute() masks some PIPE_CONTROL bits that do not exist in platforms without render engine. So here replacing the PVC check by something more generic that will support any future platforms without render engine. Reviewed-by: Thomas Hellström Signed-off-by: José Roberto de Souza Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c index a09ee8c736b53..a70fa6d9ae606 100644 --- a/drivers/gpu/drm/xe/xe_ring_ops.c +++ b/drivers/gpu/drm/xe/xe_ring_ops.c @@ -249,11 +249,11 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job, u32 ppgtt_flag = get_ppgtt_flag(job); struct xe_gt *gt = job->engine->gt; struct xe_device *xe = gt_to_xe(gt); - bool pvc = xe->info.platform == XE_PVC; + bool lacks_render = !(xe->gt[0].info.engine_mask & XE_HW_ENGINE_RCS_MASK); u32 mask_flags = 0; dw[i++] = preparser_disable(true); - if (pvc) + if (lacks_render) mask_flags = PIPE_CONTROL_3D_ARCH_FLAGS; else if (job->engine->class == XE_ENGINE_CLASS_COMPUTE) mask_flags = PIPE_CONTROL_3D_ENGINE_FLAGS; @@ -275,7 +275,7 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job, job->user_fence.value, dw, i); - i = emit_pipe_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, pvc, dw, i); + i = emit_pipe_imm_ggtt(xe_lrc_seqno_ggtt_addr(lrc), seqno, lacks_render, dw, i); i = emit_user_interrupt(dw, i);