ALSA: hda/hdmi: fix i915 silent stream programming flow

[ Upstream commit ada261b690ecd5c2f55f0c51bdf11d852a4561a6 ]

The i915 display codec may not successfully transition to
normal audio streaming mode, if the stream id is programmed
while codec is actively transmitting data. This can happen
when silent stream is enabled in KAE mode.

Fix the issue by implementing a i915 specific programming
flow, where the silent streaming is temporarily stopped,
a small delay is applied to ensure display codec becomes
idle, and then proceed with reprogramming the stream ID.

Fixes: 15175a4f2bbb ("ALSA: hda/hdmi: add keep-alive support for ADL-P and DG2")
Link: https://gitlab.freedesktop.org/drm/intel/-/issues/7353
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20221209101822.3893675-2-kai.vehmanen@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 287f4f78e7b1e36b6f20166e997a86e9a6d409b1..3655584fc37bb1fe2e7f517ee8e8548c1cff36c2 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2963,9 +2963,33 @@ static int i915_hsw_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,
                                 hda_nid_t pin_nid, int dev_id, u32 stream_tag,
                                 int format)
 {
+       struct hdmi_spec *spec = codec->spec;
+       int pin_idx = pin_id_to_pin_index(codec, pin_nid, dev_id);
+       struct hdmi_spec_per_pin *per_pin;
+       int res;
+
+       if (pin_idx < 0)
+               per_pin = NULL;
+       else
+               per_pin = get_pin(spec, pin_idx);
+
        haswell_verify_D0(codec, cvt_nid, pin_nid);
-       return hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,
-                                stream_tag, format);
+
+       if (spec->silent_stream_type == SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) {
+               silent_stream_set_kae(codec, per_pin, false);
+               /* wait for pending transfers in codec to clear */
+               usleep_range(100, 200);
+       }
+
+       res = hdmi_setup_stream(codec, cvt_nid, pin_nid, dev_id,
+                               stream_tag, format);
+
+       if (spec->silent_stream_type == SILENT_STREAM_KAE && per_pin && per_pin->silent_stream) {
+               usleep_range(100, 200);
+               silent_stream_set_kae(codec, per_pin, true);
+       }
+
+       return res;
 }
 
 /* pin_cvt_fixup ops override for HSW+ and VLV+ */