From 5dba340d698f08e4bec97d553574b58870623cec Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 26 Jun 2014 11:35:36 -0700 Subject: [PATCH] drm/i915: take display power well ref around mode set Needed for all the state readout we do during the mode set. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 065984d..f8ac530 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10810,13 +10810,24 @@ static int intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode, int x, int y, struct drm_framebuffer *fb) { + struct drm_i915_private *dev_priv = crtc->dev->dev_private; + enum intel_display_power_domain domain; + unsigned long pipe_domain; int ret; + pipe_domain = get_crtc_power_domains(crtc); + + for_each_power_domain(domain, pipe_domain) + intel_display_power_get(dev_priv, domain); + ret = __intel_set_mode(crtc, mode, x, y, fb); if (ret == 0) intel_modeset_check_state(crtc->dev); + for_each_power_domain(domain, pipe_domain) + intel_display_power_put(dev_priv, domain); + return ret; } -- 1.9.1