diff mbox series

ALSA: hda/hdmi - consider eld_valid also in sync_eld_via_acomp()

Message ID 20190613130901.26558-1-perex@perex.cz (mailing list archive)
State New, archived
Headers show
Series ALSA: hda/hdmi - consider eld_valid also in sync_eld_via_acomp() | expand

Commit Message

Jaroslav Kysela June 13, 2019, 1:09 p.m. UTC 
In the commit 7f641e26a6df9269cb25dd7a4b0a91d6586ed441 (ALSA: hda/hdmi
- Consider eld_valid when reporting jack event) the eld_valid check was
added for the jack event reports. Do the same in sync_eld_via_acomp()
function. Apparently, it is required for the NVIDIA proprietary driver
(monitor presence reported first, but ELD is available later).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 sound/pci/hda/patch_hdmi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Takashi Iwai June 13, 2019, 2 p.m. UTC | #1 
On Thu, 13 Jun 2019 15:09:01 +0200,
Jaroslav Kysela wrote:
> 
> In the commit 7f641e26a6df9269cb25dd7a4b0a91d6586ed441 (ALSA: hda/hdmi
> - Consider eld_valid when reporting jack event) the eld_valid check was
> added for the jack event reports. Do the same in sync_eld_via_acomp()
> function. Apparently, it is required for the NVIDIA proprietary driver
> (monitor presence reported first, but ELD is available later).
> 
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Thanks, applied now.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 0c61c05503f5..b522314ec5be 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1627,7 +1627,8 @@  static void sync_eld_via_acomp(struct hda_codec *codec,
 	if (jack == NULL)
 		goto unlock;
 	snd_jack_report(jack,
-			eld->monitor_present ? SND_JACK_AVOUT : 0);
+			(eld->monitor_present && eld->eld_valid) ?
+				SND_JACK_AVOUT : 0);
  unlock:
 	mutex_unlock(&per_pin->lock);
 }