提交 d688e095 编写于 作者: P Paulo Zanoni 提交者: Daniel Vetter

drm/i915: kill struct i915_package_c8

The only remaining field of the struct was the lock, which was
useless.

v2: - Rebase.
Reviewed-by: NJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 5d584b2e
...@@ -2012,11 +2012,9 @@ static int i915_pc8_status(struct seq_file *m, void *unused) ...@@ -2012,11 +2012,9 @@ static int i915_pc8_status(struct seq_file *m, void *unused)
return 0; return 0;
} }
mutex_lock(&dev_priv->pc8.lock);
seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy)); seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));
seq_printf(m, "IRQs disabled: %s\n", seq_printf(m, "IRQs disabled: %s\n",
yesno(dev_priv->pm.irqs_disabled)); yesno(dev_priv->pm.irqs_disabled));
mutex_unlock(&dev_priv->pc8.lock);
return 0; return 0;
} }
......
...@@ -1389,10 +1389,6 @@ struct ilk_wm_values { ...@@ -1389,10 +1389,6 @@ struct ilk_wm_values {
* *
* For more, read "Display Sequences for Package C8" on our documentation. * For more, read "Display Sequences for Package C8" on our documentation.
*/ */
struct i915_package_c8 {
struct mutex lock;
};
struct i915_runtime_pm { struct i915_runtime_pm {
bool suspended; bool suspended;
bool irqs_disabled; bool irqs_disabled;
...@@ -1633,8 +1629,6 @@ typedef struct drm_i915_private { ...@@ -1633,8 +1629,6 @@ typedef struct drm_i915_private {
struct ilk_wm_values hw; struct ilk_wm_values hw;
} wm; } wm;
struct i915_package_c8 pc8;
struct i915_runtime_pm pm; struct i915_runtime_pm pm;
/* Old dri1 support infrastructure, beware the dragons ya fools entering /* Old dri1 support infrastructure, beware the dragons ya fools entering
......
...@@ -6157,7 +6157,6 @@ void intel_pm_setup(struct drm_device *dev) ...@@ -6157,7 +6157,6 @@ void intel_pm_setup(struct drm_device *dev)
mutex_init(&dev_priv->rps.hw_lock); mutex_init(&dev_priv->rps.hw_lock);
mutex_init(&dev_priv->pc8.lock);
INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,
intel_gen6_powersave_work); intel_gen6_powersave_work);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册