Merge tag 'drm-intel-gt-next-2024-04-26' of https://anongit.freedesktop.org/git/drm...

[linux-block.git] / drivers / gpu / drm / i915 / gt / gen8_engine_cs.c

diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
index 2e27bcb52e0d9493212727182837d3607e36d485..e9f65f27b53fb9c247a0c4ad89d2de2a50794630 100644 (file)
--- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
@@ -740,21 +740,25 @@ static u32 *gen12_emit_preempt_busywait(struct i915_request *rq, u32 *cs)
 }
 
 /* Wa_14014475959:dg2 */
-#define CCS_SEMAPHORE_PPHWSP_OFFSET    0x540
-static u32 ccs_semaphore_offset(struct i915_request *rq)
+/* Wa_16019325821 */
+/* Wa_14019159160 */
+#define HOLD_SWITCHOUT_SEMAPHORE_PPHWSP_OFFSET 0x540
+static u32 hold_switchout_semaphore_offset(struct i915_request *rq)
 {
        return i915_ggtt_offset(rq->context->state) +
-               (LRC_PPHWSP_PN * PAGE_SIZE) + CCS_SEMAPHORE_PPHWSP_OFFSET;
+               (LRC_PPHWSP_PN * PAGE_SIZE) + HOLD_SWITCHOUT_SEMAPHORE_PPHWSP_OFFSET;
 }
 
 /* Wa_14014475959:dg2 */
-static u32 *ccs_emit_wa_busywait(struct i915_request *rq, u32 *cs)
+/* Wa_16019325821 */
+/* Wa_14019159160 */
+static u32 *hold_switchout_emit_wa_busywait(struct i915_request *rq, u32 *cs)
 {
        int i;
 
        *cs++ = MI_ATOMIC_INLINE | MI_ATOMIC_GLOBAL_GTT | MI_ATOMIC_CS_STALL |
                MI_ATOMIC_MOVE;
-       *cs++ = ccs_semaphore_offset(rq);
+       *cs++ = hold_switchout_semaphore_offset(rq);
        *cs++ = 0;
        *cs++ = 1;
 
@@ -770,7 +774,7 @@ static u32 *ccs_emit_wa_busywait(struct i915_request *rq, u32 *cs)
                MI_SEMAPHORE_POLL |
                MI_SEMAPHORE_SAD_EQ_SDD;
        *cs++ = 0;
-       *cs++ = ccs_semaphore_offset(rq);
+       *cs++ = hold_switchout_semaphore_offset(rq);
        *cs++ = 0;
 
        return cs;
@@ -787,8 +791,10 @@ gen12_emit_fini_breadcrumb_tail(struct i915_request *rq, u32 *cs)
                cs = gen12_emit_preempt_busywait(rq, cs);
 
        /* Wa_14014475959:dg2 */
-       if (intel_engine_uses_wa_hold_ccs_switchout(rq->engine))
-               cs = ccs_emit_wa_busywait(rq, cs);
+       /* Wa_16019325821 */
+       /* Wa_14019159160 */
+       if (intel_engine_uses_wa_hold_switchout(rq->engine))
+               cs = hold_switchout_emit_wa_busywait(rq, cs);
 
        rq->tail = intel_ring_offset(rq, cs);
        assert_ring_tail_valid(rq->ring, rq->tail);