Message ID | 20221110124633.3135026-1-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915: Simplify internal helper function signature | expand |
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> writes: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Since we are now storing the GT backpointer in the wa list we can drop the > explicit struct intel_gt * argument to wa_list_apply. There is room for more dropping, all the platform lists inits. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 07bf115029a0..4db04761d5ea 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1717,9 +1717,9 @@ wa_verify(struct intel_gt *gt, const struct i915_wa *wa, u32 cur, > return true; > } > > -static void > -wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) > +static void wa_list_apply(const struct i915_wa_list *wal) > { > + struct intel_gt *gt = wal->gt; > struct intel_uncore *uncore = gt->uncore; > enum forcewake_domains fw; > unsigned long flags; > @@ -1755,7 +1755,7 @@ wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) > intel_gt_mcr_read_any_fw(gt, wa->mcr_reg) : > intel_uncore_read_fw(uncore, wa->reg); > > - wa_verify(wal->gt, wa, val, wal->name, "application"); > + wa_verify(gt, wa, val, wal->name, "application"); > } > } > > @@ -1765,7 +1765,7 @@ wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) > > void intel_gt_apply_workarounds(struct intel_gt *gt) > { > - wa_list_apply(gt, >->wa_list); > + wa_list_apply(>->wa_list); > } > > static bool wa_list_verify(struct intel_gt *gt, > @@ -3025,7 +3025,7 @@ void intel_engine_init_workarounds(struct intel_engine_cs *engine) > > void intel_engine_apply_workarounds(struct intel_engine_cs *engine) > { > - wa_list_apply(engine->gt, &engine->wa_list); > + wa_list_apply(&engine->wa_list); > } > > static const struct i915_range mcr_ranges_gen8[] = { > -- > 2.34.1
On 10/11/2022 14:39, Mika Kuoppala wrote: > Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> writes: > >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> >> Since we are now storing the GT backpointer in the wa list we can drop the >> explicit struct intel_gt * argument to wa_list_apply. > > There is room for more dropping, all the platform lists inits. Indeed! I'll put that on the back burner, time permitting. >> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> >> Cc: Andrzej Hajda <andrzej.hajda@intel.com> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Thanks Mika, pushed! Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 07bf115029a0..4db04761d5ea 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1717,9 +1717,9 @@ wa_verify(struct intel_gt *gt, const struct i915_wa *wa, u32 cur, return true; } -static void -wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) +static void wa_list_apply(const struct i915_wa_list *wal) { + struct intel_gt *gt = wal->gt; struct intel_uncore *uncore = gt->uncore; enum forcewake_domains fw; unsigned long flags; @@ -1755,7 +1755,7 @@ wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) intel_gt_mcr_read_any_fw(gt, wa->mcr_reg) : intel_uncore_read_fw(uncore, wa->reg); - wa_verify(wal->gt, wa, val, wal->name, "application"); + wa_verify(gt, wa, val, wal->name, "application"); } } @@ -1765,7 +1765,7 @@ wa_list_apply(struct intel_gt *gt, const struct i915_wa_list *wal) void intel_gt_apply_workarounds(struct intel_gt *gt) { - wa_list_apply(gt, >->wa_list); + wa_list_apply(>->wa_list); } static bool wa_list_verify(struct intel_gt *gt, @@ -3025,7 +3025,7 @@ void intel_engine_init_workarounds(struct intel_engine_cs *engine) void intel_engine_apply_workarounds(struct intel_engine_cs *engine) { - wa_list_apply(engine->gt, &engine->wa_list); + wa_list_apply(&engine->wa_list); } static const struct i915_range mcr_ranges_gen8[] = {