[PATCH] drm/i915: Get audio power domain during initial hw readout (v2)

Bob Paauwe
2016-04-20T20:38:07Z

if the crtc has audio is enabled. Otherwise, when the first atomic
modeset happens it will warn when trying to drop the audio power
domain.

v2: move this to get_crtc_power_domains to be consistent with other
power domain setup (Ville)

Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f29f2f6..96f7a87 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5264,6 +5264,9 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc,
if (crtc_state->shared_dpll)
mask |= BIT(POWER_DOMAIN_PLLS);

+ if (crtc_state->has_audio)
+ mask |= BIT(POWER_DOMAIN_AUDIO);
+
return mask;
}

--
2.5.5