From dbeb2bd25350c7e771547638e266ce16030ba91c Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 4 May 2023 00:32:44 -0700 Subject: [PATCH] drm/xe: Do not mark 1809175790 as a WA Additional programming annotated with Wa_ should be reserved to those that have a official workaround. Just pointing to a bug or additional reference can be done with something else. Copy what i915 does and refer to it as "hsdes: ....". Reviewed-by: Rodrigo Vivi Link: https://lore.kernel.org/r/20230504073250.1436293-2-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_ring_ops.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c index 4c5f46f89241..c1b738e033c7 100644 --- a/drivers/gpu/drm/xe/xe_ring_ops.c +++ b/drivers/gpu/drm/xe/xe_ring_ops.c @@ -199,7 +199,8 @@ static void __emit_job_gen12_video(struct xe_sched_job *job, struct xe_lrc *lrc, bool decode = job->engine->class == XE_ENGINE_CLASS_VIDEO_DECODE; dw[i++] = preparser_disable(true); - /* Wa_1809175790 */ + + /* hsdes: 1809175790 */ if (!xe->info.has_flat_ccs) { if (decode) i = emit_aux_table_inv(gt, VD0_AUX_INV.reg, dw, i); @@ -244,9 +245,11 @@ static void __emit_job_gen12_render_compute(struct xe_sched_job *job, else if (job->engine->class == XE_ENGINE_CLASS_COMPUTE) mask_flags = PIPE_CONTROL_3D_ENGINE_FLAGS; i = emit_pipe_invalidate(mask_flags, dw, i); - /* Wa_1809175790 */ + + /* hsdes: 1809175790 */ if (!xe->info.has_flat_ccs) i = emit_aux_table_inv(gt, CCS_AUX_INV.reg, dw, i); + dw[i++] = preparser_disable(false); i = emit_store_imm_ggtt(xe_lrc_start_seqno_ggtt_addr(lrc),