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>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 144b0ff0a3f5687e02e63743403b34cb91d8fd03..603791380cdf5e663ab741b36f90efd9d26aa055 100644 (file)
--- 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)
                return 0;
        }
 
-       mutex_lock(&dev_priv->pc8.lock);
        seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
        seq_printf(m, "IRQs disabled: %s\n",
                   yesno(dev_priv->pm.irqs_disabled));
-       mutex_unlock(&dev_priv->pc8.lock);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 84a80b610afaed9152004dbee5c4351162103681..20db5d804e20b40c7ea5cd39df88bcfd673c551c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1389,10 +1389,6 @@ struct ilk_wm_values {
  *
  * For more, read "Display Sequences for Package C8" on our documentation.
  */
-struct i915_package_c8 {
-       struct mutex lock;
-};
-
 struct i915_runtime_pm {
        bool suspended;
        bool irqs_disabled;
@@ -1633,8 +1629,6 @@ typedef struct drm_i915_private {
                struct ilk_wm_values hw;
        } wm;
 
-       struct i915_package_c8 pc8;
-
        struct i915_runtime_pm pm;
 
        /* 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 fcca82cd9695839cee72664d0131f0ce4ae4ac37..5ab1a820efdc4fc8e443e8b63b941afc4b57d614 100644 (file)
--- 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)
 
        mutex_init(&dev_priv->rps.hw_lock);
 
-       mutex_init(&dev_priv->pc8.lock);
        INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
                          intel_gen6_powersave_work);