forked from Minki/linux
drm/i915: kill pc8.disable_count
Since after the latest patches it's only being used to prevent getting/putting the runtime PM refcount. Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
43694d69b4
commit
34f5754c23
@ -2014,7 +2014,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));
|
||||
|
@ -1393,7 +1393,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 {
|
||||
|
@ -7049,13 +7049,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);
|
||||
}
|
||||
|
||||
@ -7089,13 +7082,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);
|
||||
}
|
||||
|
||||
|
@ -6165,7 +6165,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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user