diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-03-07 18:08:09 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 11:39:00 -0400 |
commit | 34f5754c239b0cae69130b8e67bb2226560c09d4 (patch) | |
tree | 1611e1711982fc81d977f959171ebde2450209b7 | |
parent | 43694d69b4d87dde8243165a08a626ab0f034470 (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 1 |
4 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 02545ebf0dac..4960bf629615 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -2014,7 +2014,6 @@ static int i915_pc8_status(struct seq_file *m, void *unused) | |||
2014 | 2014 | ||
2015 | mutex_lock(&dev_priv->pc8.lock); | 2015 | mutex_lock(&dev_priv->pc8.lock); |
2016 | seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); | 2016 | seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); |
2017 | seq_printf(m, "Disable count: %d\n", dev_priv->pc8.disable_count); | ||
2018 | seq_printf(m, "IRQs disabled: %s\n", | 2017 | seq_printf(m, "IRQs disabled: %s\n", |
2019 | yesno(dev_priv->pc8.irqs_disabled)); | 2018 | yesno(dev_priv->pc8.irqs_disabled)); |
2020 | seq_printf(m, "Enabled: %s\n", yesno(dev_priv->pc8.enabled)); | 2019 | 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 7f86c3123c6e..41efb09282ae 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1393,7 +1393,6 @@ struct i915_package_c8 { | |||
1393 | bool irqs_disabled; | 1393 | bool irqs_disabled; |
1394 | /* Only true after the delayed work task actually enables it. */ | 1394 | /* Only true after the delayed work task actually enables it. */ |
1395 | bool enabled; | 1395 | bool enabled; |
1396 | int disable_count; | ||
1397 | struct mutex lock; | 1396 | struct mutex lock; |
1398 | 1397 | ||
1399 | struct { | 1398 | struct { |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a61efbfc81af..1e1cdcf9cc3c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -7049,13 +7049,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) | |||
7049 | static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv) | 7049 | static void __hsw_enable_package_c8(struct drm_i915_private *dev_priv) |
7050 | { | 7050 | { |
7051 | WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); | 7051 | WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); |
7052 | WARN(dev_priv->pc8.disable_count < 1, | ||
7053 | "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); | ||
7054 | |||
7055 | dev_priv->pc8.disable_count--; | ||
7056 | if (dev_priv->pc8.disable_count != 0) | ||
7057 | return; | ||
7058 | |||
7059 | intel_runtime_pm_put(dev_priv); | 7052 | intel_runtime_pm_put(dev_priv); |
7060 | } | 7053 | } |
7061 | 7054 | ||
@@ -7089,13 +7082,6 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) | |||
7089 | static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv) | 7082 | static void __hsw_disable_package_c8(struct drm_i915_private *dev_priv) |
7090 | { | 7083 | { |
7091 | WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); | 7084 | WARN_ON(!mutex_is_locked(&dev_priv->pc8.lock)); |
7092 | WARN(dev_priv->pc8.disable_count < 0, | ||
7093 | "pc8.disable_count: %d\n", dev_priv->pc8.disable_count); | ||
7094 | |||
7095 | dev_priv->pc8.disable_count++; | ||
7096 | if (dev_priv->pc8.disable_count != 1) | ||
7097 | return; | ||
7098 | |||
7099 | intel_runtime_pm_get(dev_priv); | 7085 | intel_runtime_pm_get(dev_priv); |
7100 | } | 7086 | } |
7101 | 7087 | ||
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 6de0c2396337..cc929d2a3244 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -6165,7 +6165,6 @@ void intel_pm_setup(struct drm_device *dev) | |||
6165 | mutex_init(&dev_priv->pc8.lock); | 6165 | mutex_init(&dev_priv->pc8.lock); |
6166 | dev_priv->pc8.irqs_disabled = false; | 6166 | dev_priv->pc8.irqs_disabled = false; |
6167 | dev_priv->pc8.enabled = false; | 6167 | dev_priv->pc8.enabled = false; |
6168 | dev_priv->pc8.disable_count = 0; | ||
6169 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, | 6168 | INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, |
6170 | intel_gen6_powersave_work); | 6169 | intel_gen6_powersave_work); |
6171 | } | 6170 | } |