Commit e1e9fb84 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: ddi: enable runtime pm during dpms

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Remove now bogus comment.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 03af2045
...@@ -4890,17 +4890,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) ...@@ -4890,17 +4890,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
if (enable) { if (enable) {
if (!intel_crtc->active) { if (!intel_crtc->active) {
/* domains = get_crtc_power_domains(crtc);
* FIXME: DDI plls and relevant code isn't converted for_each_power_domain(domain, domains)
* yet, so do runtime PM for DPMS only for all other intel_display_power_get(dev_priv, domain);
* platforms for now. intel_crtc->enabled_power_domains = domains;
*/
if (!HAS_DDI(dev)) {
domains = get_crtc_power_domains(crtc);
for_each_power_domain(domain, domains)
intel_display_power_get(dev_priv, domain);
intel_crtc->enabled_power_domains = domains;
}
dev_priv->display.crtc_enable(crtc); dev_priv->display.crtc_enable(crtc);
} }
...@@ -4908,12 +4901,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) ...@@ -4908,12 +4901,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
if (intel_crtc->active) { if (intel_crtc->active) {
dev_priv->display.crtc_disable(crtc); dev_priv->display.crtc_disable(crtc);
if (!HAS_DDI(dev)) { domains = intel_crtc->enabled_power_domains;
domains = intel_crtc->enabled_power_domains; for_each_power_domain(domain, domains)
for_each_power_domain(domain, domains) intel_display_power_put(dev_priv, domain);
intel_display_power_put(dev_priv, domain); intel_crtc->enabled_power_domains = 0;
intel_crtc->enabled_power_domains = 0;
}
} }
} }
......
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