drm/i915: Fix workarounds on Gen2-3
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fri, 18 Nov 2022 11:52:49 +0000 (11:52 +0000)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 23 Nov 2022 16:37:55 +0000 (11:37 -0500)
In 3653727560d0 ("drm/i915: Simplify internal helper function signature")
I broke the old platforms by not noticing engine workaround init does not
initialize the list on old platforms. Fix it by always initializing which
already does the right thing by mostly not doing anything if there aren't
any workarounds on the list.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 3653727560d0 ("drm/i915: Simplify internal helper function signature")
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221118115249.2683946-1-tvrtko.ursulin@linux.intel.com
(cherry picked from commit 71feb6f901ecba962177a0a029dc545c91a4b396)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/gt/intel_workarounds.c

index 1bd8d63..2afb4f8 100644 (file)
@@ -3011,7 +3011,7 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li
 static void
 engine_init_workarounds(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 {
-       if (I915_SELFTEST_ONLY(GRAPHICS_VER(engine->i915) < 4))
+       if (GRAPHICS_VER(engine->i915) < 4)
                return;
 
        engine_fake_wa_init(engine, wal);
@@ -3036,9 +3036,6 @@ void intel_engine_init_workarounds(struct intel_engine_cs *engine)
 {
        struct i915_wa_list *wal = &engine->wa_list;
 
-       if (GRAPHICS_VER(engine->i915) < 4)
-               return;
-
        wa_init_start(wal, engine->gt, "engine", engine->name);
        engine_init_workarounds(engine, wal);
        wa_init_finish(wal);