Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e9fb84 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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

drivers/gpu/drm/i915/intel_display.c

+8 −17
Original line number Diff line number Diff line
@@ -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;

			}



			dev_priv->display.crtc_enable(crtc);

		}
@@ -4908,14 +4901,12 @@ 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;

		}

	}

	}



	intel_crtc_update_sarea(crtc, enable);

}