drm/i915/gt: Fix platform prefix

Different handling for XeHP and later platforms should be using the
xehp prefix, not gen125. Rename them.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220930050903.3479619-4-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
index e000eaf8abed78343e70aacd75d8ef5bef0cbc25..e1c76e5bfa82796432b74fd7c6637b8342a4ffcf 100644 (file)
--- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
@@ -396,10 +396,10 @@ int gen8_emit_init_breadcrumb(struct i915_request *rq)
        return 0;
 }
 
-static int __gen125_emit_bb_start(struct i915_request *rq,
-                                 u64 offset, u32 len,
-                                 const unsigned int flags,
-                                 u32 arb)
+static int __xehp_emit_bb_start(struct i915_request *rq,
+                               u64 offset, u32 len,
+                               const unsigned int flags,
+                               u32 arb)
 {
        struct intel_context *ce = rq->context;
        u32 wa_offset = lrc_indirect_bb(ce);
@@ -437,18 +437,18 @@ static int __gen125_emit_bb_start(struct i915_request *rq,
        return 0;
 }
 
-int gen125_emit_bb_start_noarb(struct i915_request *rq,
-                              u64 offset, u32 len,
-                              const unsigned int flags)
+int xehp_emit_bb_start_noarb(struct i915_request *rq,
+                            u64 offset, u32 len,
+                            const unsigned int flags)
 {
-       return __gen125_emit_bb_start(rq, offset, len, flags, MI_ARB_DISABLE);
+       return __xehp_emit_bb_start(rq, offset, len, flags, MI_ARB_DISABLE);
 }
 
-int gen125_emit_bb_start(struct i915_request *rq,
-                        u64 offset, u32 len,
-                        const unsigned int flags)
+int xehp_emit_bb_start(struct i915_request *rq,
+                      u64 offset, u32 len,
+                      const unsigned int flags)
 {
-       return __gen125_emit_bb_start(rq, offset, len, flags, MI_ARB_ENABLE);
+       return __xehp_emit_bb_start(rq, offset, len, flags, MI_ARB_ENABLE);
 }
 
 int gen8_emit_bb_start_noarb(struct i915_request *rq,

diff --git a/drivers/gpu/drm/i915/gt/gen8_engine_cs.h b/drivers/gpu/drm/i915/gt/gen8_engine_cs.h
index e4d24c811dd61dbbfdea8ced5bf6d272d0c341af..655e5c00ddc27751ef3f92d8020676ca6252d745 100644 (file)
--- a/drivers/gpu/drm/i915/gt/gen8_engine_cs.h
+++ b/drivers/gpu/drm/i915/gt/gen8_engine_cs.h
@@ -32,12 +32,12 @@ int gen8_emit_bb_start(struct i915_request *rq,
                       u64 offset, u32 len,
                       const unsigned int flags);
 
-int gen125_emit_bb_start_noarb(struct i915_request *rq,
-                              u64 offset, u32 len,
-                              const unsigned int flags);
-int gen125_emit_bb_start(struct i915_request *rq,
-                        u64 offset, u32 len,
-                        const unsigned int flags);
+int xehp_emit_bb_start_noarb(struct i915_request *rq,
+                            u64 offset, u32 len,
+                            const unsigned int flags);
+int xehp_emit_bb_start(struct i915_request *rq,
+                      u64 offset, u32 len,
+                      const unsigned int flags);
 
 u32 *gen8_emit_fini_breadcrumb_xcs(struct i915_request *rq, u32 *cs);
 u32 *gen12_emit_fini_breadcrumb_xcs(struct i915_request *rq, u32 *cs);

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 428da98c53563963894597aca178c2cd3db0953e..a61ac592ddff85c15724e0fb081f199793eea2f4 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -3471,9 +3471,9 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine)
 
        if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) {
                if (intel_engine_has_preemption(engine))
-                       engine->emit_bb_start = gen125_emit_bb_start;
+                       engine->emit_bb_start = xehp_emit_bb_start;
                else
-                       engine->emit_bb_start = gen125_emit_bb_start_noarb;
+                       engine->emit_bb_start = xehp_emit_bb_start_noarb;
        } else {
                if (intel_engine_has_preemption(engine))
                        engine->emit_bb_start = gen8_emit_bb_start;

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 0ef295a94060c970fce055c6bd7e1e1a36aeb471..d81f68fef9a857824956750c43a507e880ec6fd6 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -4094,7 +4094,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine)
 
        engine->emit_bb_start = gen8_emit_bb_start;
        if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50))
-               engine->emit_bb_start = gen125_emit_bb_start;
+               engine->emit_bb_start = xehp_emit_bb_start;
 }
 
 static void rcs_submission_override(struct intel_engine_cs *engine)