| Message ID | 1393540010-1582-14-git-send-email-przanoni@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 27 Feb 2014 19:26:40 -0300 Paulo Zanoni <przanoni@gmail.com> wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > Since after the latest patches it's only being used to prevent > getting/putting the runtime PM refcount. > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 1 - > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_display.c | 14 -------------- > drivers/gpu/drm/i915/intel_pm.c | 1 - > 4 files changed, 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 36daaa8..ad6c209 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1998,7 +1998,6 @@ static int i915_pc8_status(struct seq_file *m, void *unused) > > mutex_lock(&dev_priv->pc8.lock); > seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); > - seq_printf(m, "Disable count: %d\n", dev_priv->pc8.disable_count); > seq_printf(m, "IRQs disabled: %s\n", > yesno(dev_priv->pc8.irqs_disabled)); > seq_printf(m, "Enabled: %s\n", yesno(dev_priv->pc8.enabled)); > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 6ea5c4b..8b66c14 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1353,7 +1353,6 @@ struct i915_package_c8 { > bool irqs_disabled; > /* Only true after the delayed work task actually enables it. */ > bool enabled; > - int disable_count; > struct mutex lock; > > struct { > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 0de1aa7..3b57257 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6676,13 +6676,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) > static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv) > { > WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); > - WARN(dev_priv->pc8.disable_count < 1, > - "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); > - > - dev_priv->pc8.disable_count--; > - if (dev_priv->pc8.disable_count != 0) > - return; > - > intel_runtime_pm_put(dev_priv); > } > > @@ -6716,13 +6709,6 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) > static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv) > { > WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); > - WARN(dev_priv->pc8.disable_count < 0, > - "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); > - > - dev_priv->pc8.disable_count++; > - if (dev_priv->pc8.disable_count != 1) > - return; > - > intel_runtime_pm_get(dev_priv); > } > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 962e0d1..86e6835 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -5793,7 +5793,6 @@ void intel_pm_setup(struct drm_device *dev) > mutex_init(&dev_priv->pc8.lock); > dev_priv->pc8.irqs_disabled = false; > dev_priv->pc8.enabled = false; > - dev_priv->pc8.disable_count = 0; > INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, > intel_gen6_powersave_work); > } So now it looks like these functions are just documentation around the runtime PM bits. I don't see them get remove totally in favor of the runtime_pm_get|put calls later on, is that possible or desirable? Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 36daaa8..ad6c209 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1998,7 +1998,6 @@ static int i915_pc8_status(struct seq_file *m, void *unused) mutex_lock(&dev_priv->pc8.lock); seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); - seq_printf(m, "Disable count: %d\n", dev_priv->pc8.disable_count); seq_printf(m, "IRQs disabled: %s\n", yesno(dev_priv->pc8.irqs_disabled)); seq_printf(m, "Enabled: %s\n", yesno(dev_priv->pc8.enabled)); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 6ea5c4b..8b66c14 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1353,7 +1353,6 @@ struct i915_package_c8 { bool irqs_disabled; /* Only true after the delayed work task actually enables it. */ bool enabled; - int disable_count; struct mutex lock; struct { diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0de1aa7..3b57257 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6676,13 +6676,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv) { WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); - WARN(dev_priv->pc8.disable_count < 1, - "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); - - dev_priv->pc8.disable_count--; - if (dev_priv->pc8.disable_count != 0) - return; - intel_runtime_pm_put(dev_priv); } @@ -6716,13 +6709,6 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv) { WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); - WARN(dev_priv->pc8.disable_count < 0, - "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); - - dev_priv->pc8.disable_count++; - if (dev_priv->pc8.disable_count != 1) - return; - intel_runtime_pm_get(dev_priv); } diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 962e0d1..86e6835 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5793,7 +5793,6 @@ void intel_pm_setup(struct drm_device *dev) mutex_init(&dev_priv->pc8.lock); dev_priv->pc8.irqs_disabled = false; dev_priv->pc8.enabled = false; - dev_priv->pc8.disable_count = 0; INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, intel_gen6_powersave_work); }