mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
79 lines
3.2 KiB
Diff
79 lines
3.2 KiB
Diff
commit aad0b407edfef6e2527a9bb877ce754e1efb7b10
|
|
Author: Stefan Saraev <stefan@saraev.ca>
|
|
Date: Mon Jul 1 13:06:10 2013 +0300
|
|
|
|
ALSA: hda - Avoid outputting HDMI audio before prepare() and after close()
|
|
|
|
adapted to 3.10
|
|
|
|
From a6024295fd3290a8c9c5519a03316081ee82378a Mon Sep 17 00:00:00 2001
|
|
From: Anssi Hannula <anssi.hannula@iki.fi>
|
|
Date: Sat, 16 Feb 2013 17:42:46 +0200
|
|
Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and
|
|
after close()
|
|
|
|
Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) start
|
|
transmitting an empty audio stream as soon as PIN_OUT and AC_DIG1_ENABLE
|
|
are enabled.
|
|
|
|
Since commit 6169b673618bf0b2518ce413b54925782a603f06 ("ALSA: hda -
|
|
Always turn on pins for HDMI/DP") this happens at first open() time, and
|
|
will continue even after close().
|
|
|
|
Additionally, some codecs (at least Intel PantherPoint HDMI) currently
|
|
continue transmitting HDMI audio even after close() in case some actual
|
|
audio was output after open() (this happens regardless of PIN_OUT).
|
|
|
|
Empty HDMI audio transmission when not intended has the effect that a
|
|
possible HDMI audio sink/receiver may prefer the empty HDMI audio stream
|
|
over an actual audio stream on its S/PDIF inputs.
|
|
|
|
To avoid the issue before first prepare(), set stream format to 0 on
|
|
codec initialization. 0 is not a valid format value for HDMI and will
|
|
prevent the audio stream from being output.
|
|
|
|
Additionally, at close() time, make sure that the stream is cleaned up.
|
|
This will ensure that the format is reset to 0 at that time, preventing
|
|
audio from being output in that case.
|
|
|
|
Thanks to OpenELEC developers and users for their help in investigating
|
|
this issue on the affected NVIDIA "ION2" hardware. Testing of the final
|
|
version on NVIDIA ION2 was done by OpenELEC user "MrXIII". Testing on
|
|
Intel PantherPoint was done by myself.
|
|
|
|
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
|
|
Cc: stable@vger.kernel.org
|
|
|
|
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
|
index e12f7a0..9bfdd51 100644
|
|
--- a/sound/pci/hda/patch_hdmi.c
|
|
+++ b/sound/pci/hda/patch_hdmi.c
|
|
@@ -1360,6 +1360,14 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
|
|
if (err < 0)
|
|
return err;
|
|
|
|
+ /*
|
|
+ * Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100)
|
|
+ * start transmitting an empty audio stream as soon as PIN_OUT and
|
|
+ * AC_DIG1_ENABLE are enabled, which happens at open() time.
|
|
+ * To avoid that, set format to 0, which is not valid for HDMI.
|
|
+ */
|
|
+ snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
|
|
+
|
|
if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids))
|
|
spec->cvt_nids[spec->num_cvts] = cvt_nid;
|
|
spec->num_cvts++;
|
|
@@ -1474,6 +1482,12 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
|
|
struct hdmi_spec_per_pin *per_pin;
|
|
|
|
if (hinfo->nid) {
|
|
+ /*
|
|
+ * Make sure no empty audio is output after this point by
|
|
+ * setting stream format to 0, which is not valid for HDMI.
|
|
+ */
|
|
+ __snd_hda_codec_cleanup_stream(codec, hinfo->nid, 1);
|
|
+
|
|
cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
|
|
if (snd_BUG_ON(cvt_idx < 0))
|
|
return -EINVAL;
|