Commit 8fcd5cd8 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: Simplify CHV pipe A power well code

The pipe A power well is the "disp2d" well on CHV and pipe B and C wells
don't even exist. Thereforce we can remove the checks for pipe A vs.
others and just assume it's always pipe A.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarSivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 60bfe44f
...@@ -1042,53 +1042,46 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv, ...@@ -1042,53 +1042,46 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv,
static void chv_pipe_power_well_sync_hw(struct drm_i915_private *dev_priv, static void chv_pipe_power_well_sync_hw(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
WARN_ON_ONCE(power_well->data != PIPE_A);
chv_set_pipe_power_well(dev_priv, power_well, power_well->count > 0); chv_set_pipe_power_well(dev_priv, power_well, power_well->count > 0);
} }
static void chv_pipe_power_well_enable(struct drm_i915_private *dev_priv, static void chv_pipe_power_well_enable(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
WARN_ON_ONCE(power_well->data != PIPE_A && WARN_ON_ONCE(power_well->data != PIPE_A);
power_well->data != PIPE_B &&
power_well->data != PIPE_C);
chv_set_pipe_power_well(dev_priv, power_well, true); chv_set_pipe_power_well(dev_priv, power_well, true);
if (power_well->data == PIPE_A) { spin_lock_irq(&dev_priv->irq_lock);
spin_lock_irq(&dev_priv->irq_lock); valleyview_enable_display_irqs(dev_priv);
valleyview_enable_display_irqs(dev_priv); spin_unlock_irq(&dev_priv->irq_lock);
spin_unlock_irq(&dev_priv->irq_lock);
/* /*
* During driver initialization/resume we can avoid restoring the * During driver initialization/resume we can avoid restoring the
* part of the HW/SW state that will be inited anyway explicitly. * part of the HW/SW state that will be inited anyway explicitly.
*/ */
if (dev_priv->power_domains.initializing) if (dev_priv->power_domains.initializing)
return; return;
intel_hpd_init(dev_priv); intel_hpd_init(dev_priv);
i915_redisable_vga_power_on(dev_priv->dev); i915_redisable_vga_power_on(dev_priv->dev);
}
} }
static void chv_pipe_power_well_disable(struct drm_i915_private *dev_priv, static void chv_pipe_power_well_disable(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
WARN_ON_ONCE(power_well->data != PIPE_A && WARN_ON_ONCE(power_well->data != PIPE_A);
power_well->data != PIPE_B &&
power_well->data != PIPE_C); spin_lock_irq(&dev_priv->irq_lock);
valleyview_disable_display_irqs(dev_priv);
if (power_well->data == PIPE_A) { spin_unlock_irq(&dev_priv->irq_lock);
spin_lock_irq(&dev_priv->irq_lock);
valleyview_disable_display_irqs(dev_priv);
spin_unlock_irq(&dev_priv->irq_lock);
}
chv_set_pipe_power_well(dev_priv, power_well, false); chv_set_pipe_power_well(dev_priv, power_well, false);
if (power_well->data == PIPE_A) vlv_power_sequencer_reset(dev_priv);
vlv_power_sequencer_reset(dev_priv);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment