Commit 15e7ec29 authored by Maarten Lankhorst's avatar Maarten Lankhorst
parent a1475e77
...@@ -5273,6 +5273,9 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc, ...@@ -5273,6 +5273,9 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc,
mask |= BIT(intel_display_port_power_domain(intel_encoder)); mask |= BIT(intel_display_port_power_domain(intel_encoder));
} }
if (crtc_state->shared_dpll)
mask |= BIT(POWER_DOMAIN_PLLS);
return mask; return mask;
} }
...@@ -15703,9 +15706,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) ...@@ -15703,9 +15706,6 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
DRM_DEBUG_KMS("%s hw state readout: crtc_mask 0x%08x, on %i\n", DRM_DEBUG_KMS("%s hw state readout: crtc_mask 0x%08x, on %i\n",
pll->name, pll->config.crtc_mask, pll->on); pll->name, pll->config.crtc_mask, pll->on);
if (pll->config.crtc_mask)
intel_display_power_get(dev_priv, POWER_DOMAIN_PLLS);
} }
for_each_intel_encoder(dev, encoder) { for_each_intel_encoder(dev, encoder) {
......
...@@ -135,8 +135,6 @@ void intel_enable_shared_dpll(struct intel_crtc *crtc) ...@@ -135,8 +135,6 @@ void intel_enable_shared_dpll(struct intel_crtc *crtc)
} }
WARN_ON(pll->on); WARN_ON(pll->on);
intel_display_power_get(dev_priv, POWER_DOMAIN_PLLS);
DRM_DEBUG_KMS("enabling %s\n", pll->name); DRM_DEBUG_KMS("enabling %s\n", pll->name);
pll->funcs.enable(dev_priv, pll); pll->funcs.enable(dev_priv, pll);
pll->on = true; pll->on = true;
...@@ -173,8 +171,6 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc) ...@@ -173,8 +171,6 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc)
DRM_DEBUG_KMS("disabling %s\n", pll->name); DRM_DEBUG_KMS("disabling %s\n", pll->name);
pll->funcs.disable(dev_priv, pll); pll->funcs.disable(dev_priv, pll);
pll->on = false; pll->on = false;
intel_display_power_put(dev_priv, POWER_DOMAIN_PLLS);
} }
static struct intel_shared_dpll * static struct intel_shared_dpll *
......
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