diff mbox

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

Message ID 83E9754AABFD724886879E166F79B1DA0D2A71C7@fmsmsx101.amr.corp.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

James Xiong April 22, 2016, 4:40 p.m. UTC 
-----Original Message-----
From: isg-gms-request@eclists.intel.com [mailto:isg-gms-request@eclists.intel.com] On Behalf Of Paauwe, Bob J
Sent: Wednesday, April 20, 2016 1:38 PM
To: isg-gms <isg-gms@eclists.intel.com>; intel-gfx <intel-gfx@lists.freedesktop.org>
Cc: Paauwe, Bob J <bob.j.paauwe@intel.com>; Ville Syrjälä <ville.syrjala@linux.intel.com>
Subject: [isg-gms] [PATCH] drm/i915: Get audio power domain during initial hw readout (v2)

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>
Reviewed-by: James Xiong <james.xiong@intel.com>
Tested-by: James Xiong <james.xiong@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 3 +++
 1 file changed, 3 insertions(+)

--
2.5.5

-------------------------------------
isg-gms@eclists.intel.com
https://eclists.intel.com/sympa/info/isg-gms
Unsubscribe by sending email to sympa@eclists.intel.com with subject "Unsubscribe isg-gms"
diff mbox

Patch

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;
 }