Skip to contentSkip to conversation

ALSA: hda - Update BCLK also at hotplug for i915 HSW/BDW

PATCH New Takashi Iwai 1 participant 1 message Apr 26, 2016 Sound

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ALSA: hda - Update BCLK also at hotplug for i915 HSW/BDW

The recent bug report suggests that BCLK setup for i915 HSW/BDW needs to be updated at each HDMI hotplug, not only at initialization and resume. That is, we need to update HSW_EM4 and HSW_EM5 registers at ELD notification, too. Otherwise the HDMI audio may be out of sync and played in a wrong pitch.

However, the HDA codec driver has no access to the controller registers, and currently the code managing these registers is in hda_intel.c, i.e. local to the controller driver. For allowing the explicit BCLK update from the codec driver, as in this patch, the former haswell_set_bclk() in hda_intel.c is moved to hdac_i915.c and exposed as snd_hdac_i915_set_bclk(). This is called from both the HDA controller driver and intel_pin_eld_notify() in HDMI codec driver.

Along with this change, snd_hdac_get_display_clk() gets dropped as it's no longer used.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91410

---
 include/sound/hda_i915.h   |  5 ++--
 sound/hda/hdac_i915.c      | 62 ++++++++++++++++++++++++++++++++++++++--------
 sound/pci/hda/hda_intel.c  | 56 +++--------------------------------------
 sound/pci/hda/patch_hdmi.c |  1 +
 4 files changed, 58 insertions(+), 66 deletions(-)
include/sound/hda_i915.h +2 -3
index fa341fcb5829..f5842bcd9c94 100644
@@ -9,7 +9,7 @@
 #ifdef CONFIG_SND_HDA_I915
 int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable);
 int snd_hdac_display_power(struct hdac_bus *bus, bool enable);
-int snd_hdac_get_display_clk(struct hdac_bus *bus);
+void snd_hdac_i915_set_bclk(struct hdac_bus *bus);
 int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid, int rate);
 int snd_hdac_acomp_get_eld(struct hdac_bus *bus, hda_nid_t nid,
 			   bool *audio_enabled, char *buffer, int max_bytes);
@@ -25,9 +25,8 @@ static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable)
 {
 	return 0;
 }
-static inline int snd_hdac_get_display_clk(struct hdac_bus *bus)
+static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
 {
-	return 0;
 }
 static inline int snd_hdac_sync_audio_rate(struct hdac_bus *bus, hda_nid_t nid,
 					   int rate)
sound/hda/hdac_i915.c +51 -11

83 lines not on this page · raw message

sound/pci/hda/hda_intel.c +4 -52

80 lines not on this page · raw message

sound/pci/hda/patch_hdmi.c +1 -0
index 40933aa33afe..1483f85999ec 100644
@@ -2232,6 +2232,7 @@ static void intel_pin_eld_notify(void *audio_ptr, int port)
 	if (atomic_read(&(codec)->core.in_pm))
 		return;
 
+	snd_hdac_i915_set_bclk(&codec->bus->core);
 	check_presence_and_report(codec, pin_nid);
 }
 
Signature · 1 line
2.8.1