diff options
| author | Maarten Lankhorst | 2016-03-14 09:27:54 +0100 |
|---|---|---|
| committer | Maarten Lankhorst | 2016-03-17 09:27:55 +0100 |
| commit | 15e7ec29ce5555a7b6048a1cfdaeb172de75a649 (patch) | |
| tree | d9b57a7b7d8f14a6ae349584f7e239d0d2cd039b /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Perform dpll commit first, v2. (diff) | |
| download | kernel-qcow2-linux-15e7ec29ce5555a7b6048a1cfdaeb172de75a649.tar.gz kernel-qcow2-linux-15e7ec29ce5555a7b6048a1cfdaeb172de75a649.tar.xz kernel-qcow2-linux-15e7ec29ce5555a7b6048a1cfdaeb172de75a649.zip | |
drm/i915: Move pll power state to crtc power domains.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1457944075-14123-4-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 80aa51c98a2d..e3e158175256 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5273,6 +5273,9 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc, mask |= BIT(intel_display_port_power_domain(intel_encoder)); } + if (crtc_state->shared_dpll) + mask |= BIT(POWER_DOMAIN_PLLS); + return mask; } @@ -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", 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) { |