| Message ID | 20160828204624.21193-9-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris Wilson <chris@chris-wilson.co.uk> writes: > Access to intel_init_emon() is strictly ordered by gt_powersave, using > struct_mutex around it is overkill (and will conflict with the caller > holding struct_mutex themselves). > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index aba6fd036c4e..5e2a33d066c4 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -6773,9 +6773,7 @@ void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv) > > if (IS_IRONLAKE_M(dev_priv)) { > ironlake_enable_drps(dev_priv); > - mutex_lock(&dev_priv->drm.struct_mutex); > intel_init_emon(dev_priv); > - mutex_unlock(&dev_priv->drm.struct_mutex); > } else if (INTEL_INFO(dev_priv)->gen >= 6) { > /* > * PCU communication is slow and this doesn't need to be > -- > 2.9.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On su, 2016-08-28 at 21:46 +0100, Chris Wilson wrote: > Access to intel_init_emon() is strictly ordered by gt_powersave, using How exactly? > struct_mutex around it is overkill (and will conflict with the caller > holding struct_mutex themselves). > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Was this intentionally added to the series? Maybe a splat could be included. Regards, Joonas
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index aba6fd036c4e..5e2a33d066c4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -6773,9 +6773,7 @@ void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv) if (IS_IRONLAKE_M(dev_priv)) { ironlake_enable_drps(dev_priv); - mutex_lock(&dev_priv->drm.struct_mutex); intel_init_emon(dev_priv); - mutex_unlock(&dev_priv->drm.struct_mutex); } else if (INTEL_INFO(dev_priv)->gen >= 6) { /* * PCU communication is slow and this doesn't need to be
Access to intel_init_emon() is strictly ordered by gt_powersave, using struct_mutex around it is overkill (and will conflict with the caller holding struct_mutex themselves). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-)