intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915: Fix audio power up sequence for gen10/11
@ 2019-10-01 16:35 Kai Vehmanen
  2019-10-01 16:35 ` [PATCH 2/2] drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms Kai Vehmanen
                   ` (5 more replies)
  0 siblings, 6 replies; 11+ messages in thread
From: Kai Vehmanen @ 2019-10-01 16:35 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jani Nikula, tiwai

On gen10/11 platforms, driver must set the enable bit of AUD_PIN_BUF_CTL
as part of audio power up sequence.

Failing to do this resulted in errors during display audio codec probe,
and failures during resume from suspend.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111214
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_audio.c | 5 +++++
 drivers/gpu/drm/i915/i915_reg.h            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 54638d99e021..a731af7ada08 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -862,6 +862,11 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)
 		/* Force CDCLK to 2*BCLK as long as we need audio powered. */
 		if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
 			glk_force_audio_cdclk(dev_priv, true);
+
+		if (INTEL_GEN(dev_priv) == 11 || INTEL_GEN(dev_priv) == 10)
+			I915_WRITE(AUD_PIN_BUF_CTL,
+				   (I915_READ(AUD_PIN_BUF_CTL) |
+				    AUD_PIN_BUF_ENABLE));
 	}
 
 	return ret;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 058aa5ca8b73..daff9058f0e8 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -9133,6 +9133,8 @@ enum {
 #define   SKL_AUD_CODEC_WAKE_SIGNAL		(1 << 15)
 
 #define AUD_FREQ_CNTRL			_MMIO(0x65900)
+#define AUD_PIN_BUF_CTL		_MMIO(0x48414)
+#define   AUD_PIN_BUF_ENABLE		BIT(31)
 
 /*
  * HSW - ICL power wells
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-10-03  9:58 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-01 16:35 [PATCH 1/2] drm/i915: Fix audio power up sequence for gen10/11 Kai Vehmanen
2019-10-01 16:35 ` [PATCH 2/2] drm/i915: extend audio CDCLK>=2*BCLK constraint to more platforms Kai Vehmanen
2019-10-01 16:39   ` Chris Wilson
2019-10-01 21:49 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix audio power up sequence for gen10/11 Patchwork
2019-10-02  7:45 ` ✓ Fi.CI.IGT: " Patchwork
2019-10-02  9:43 ` [PATCH 1/2] " Chris Wilson
2019-10-02 10:29   ` Kai Vehmanen
2019-10-02 12:11 ` Imre Deak
2019-10-02 16:53   ` Kai Vehmanen
2019-10-03  9:58     ` Kai Vehmanen
2019-10-02 14:33 ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).