From: Daniel Vetter Date: Wed, 25 Jun 2014 19:02:04 +0000 (+0300) Subject: drm/i915: ddi: enable runtime pm during dpms X-Git-Tag: android-x86-4.4-r2~688^2~20^2~73 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1e9fb840b684703cbc65eaef99f69194e0f161f;p=android-x86%2Fkernel.git drm/i915: ddi: enable runtime pm during dpms Signed-off-by: Imre Deak Reviewed-by: Paulo Zanoni [danvet: Remove now bogus comment.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 54381d7a6b8a..f31ad8d0f6ea 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4890,17 +4890,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) if (enable) { if (!intel_crtc->active) { - /* - * FIXME: DDI plls and relevant code isn't converted - * yet, so do runtime PM for DPMS only for all other - * platforms for now. - */ - 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; - } + 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); } @@ -4908,12 +4901,10 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) if (intel_crtc->active) { dev_priv->display.crtc_disable(crtc); - if (!HAS_DDI(dev)) { - domains = intel_crtc->enabled_power_domains; - for_each_power_domain(domain, domains) - intel_display_power_put(dev_priv, domain); - intel_crtc->enabled_power_domains = 0; - } + domains = intel_crtc->enabled_power_domains; + for_each_power_domain(domain, domains) + intel_display_power_put(dev_priv, domain); + intel_crtc->enabled_power_domains = 0; } }