Skip to content

Commit eaa96d2

Browse files
tursulinrodrigovivi
authored andcommitted
drm/i915: Fix workarounds on Gen2-3
In 3653727 ("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 <[email protected]> Fixes: 3653727 ("drm/i915: Simplify internal helper function signature") Reported-by: Ville Syrjälä <[email protected]> Cc: Mika Kuoppala <[email protected]> Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 71feb6f) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 41f425a commit eaa96d2

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/gpu/drm/i915/gt/intel_workarounds.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3011,7 +3011,7 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li
30113011
static void
30123012
engine_init_workarounds(struct intel_engine_cs *engine, struct i915_wa_list *wal)
30133013
{
3014-
if (I915_SELFTEST_ONLY(GRAPHICS_VER(engine->i915) < 4))
3014+
if (GRAPHICS_VER(engine->i915) < 4)
30153015
return;
30163016

30173017
engine_fake_wa_init(engine, wal);
@@ -3036,9 +3036,6 @@ void intel_engine_init_workarounds(struct intel_engine_cs *engine)
30363036
{
30373037
struct i915_wa_list *wal = &engine->wa_list;
30383038

3039-
if (GRAPHICS_VER(engine->i915) < 4)
3040-
return;
3041-
30423039
wa_init_start(wal, engine->gt, "engine", engine->name);
30433040
engine_init_workarounds(engine, wal);
30443041
wa_init_finish(wal);

0 commit comments

Comments
 (0)