aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-03-07 18:08:16 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-19 11:40:19 -0400
commitd688e0955003794fc5a25a1fd574202d64541a34 (patch)
tree956696bca9e5702c23fad96cb8e1d9734c66e797
parent5d584b2eca96543568a8db8eba008f2dab784367 (diff)
drm/i915: kill struct i915_package_c8
The only remaining field of the struct was the lock, which was useless. v2: - Rebase. 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.c2
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h6
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c1
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 144b0ff0a3f5..603791380cdf 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2012,11 +2012,9 @@ static int i915_pc8_status(struct seq_file *m, void *unused)
2012 return 0; 2012 return 0;
2013 } 2013 }
2014 2014
2015 mutex_lock(&dev_priv->pc8.lock);
2016 seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); 2015 seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
2017 seq_printf(m, "IRQs disabled: %s\n", 2016 seq_printf(m, "IRQs disabled: %s\n",
2018 yesno(dev_priv->pm.irqs_disabled)); 2017 yesno(dev_priv->pm.irqs_disabled));
2019 mutex_unlock(&dev_priv->pc8.lock);
2020 2018
2021 return 0; 2019 return 0;
2022} 2020}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 84a80b610afa..20db5d804e20 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1389,10 +1389,6 @@ struct ilk_wm_values {
1389 * 1389 *
1390 * For more, read "Display Sequences for Package C8" on our documentation. 1390 * For more, read "Display Sequences for Package C8" on our documentation.
1391 */ 1391 */
1392struct i915_package_c8 {
1393 struct mutex lock;
1394};
1395
1396struct i915_runtime_pm { 1392struct i915_runtime_pm {
1397 bool suspended; 1393 bool suspended;
1398 bool irqs_disabled; 1394 bool irqs_disabled;
@@ -1633,8 +1629,6 @@ typedef struct drm_i915_private {
1633 struct ilk_wm_values hw; 1629 struct ilk_wm_values hw;
1634 } wm; 1630 } wm;
1635 1631
1636 struct i915_package_c8 pc8;
1637
1638 struct i915_runtime_pm pm; 1632 struct i915_runtime_pm pm;
1639 1633
1640 /* Old dri1 support infrastructure, beware the dragons ya fools entering 1634 /* Old dri1 support infrastructure, beware the dragons ya fools entering
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index fcca82cd9695..5ab1a820efdc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6157,7 +6157,6 @@ void intel_pm_setup(struct drm_device *dev)
6157 6157
6158 mutex_init(&dev_priv->rps.hw_lock); 6158 mutex_init(&dev_priv->rps.hw_lock);
6159 6159
6160 mutex_init(&dev_priv->pc8.lock);
6161 INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, 6160 INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
6162 intel_gen6_powersave_work); 6161 intel_gen6_powersave_work);
6163 6162