| From 30efd8debd1ef30be342d374f01e993509f5b76b Mon Sep 17 00:00:00 2001 |
| From: David Henningsson <david.henningsson@canonical.com> |
| Date: Fri, 22 Feb 2013 10:16:28 +0100 |
| Subject: ALSA: hda - hdmi: Make jacks phantom, if they're not detectable |
| |
| From: David Henningsson <david.henningsson@canonical.com> |
| |
| commit 30efd8debd1ef30be342d374f01e993509f5b76b upstream. |
| |
| Just as for analog codecs, a jack that isn't suitable for detection |
| (in this case, NO_PRESENCE was set) should be a phantom Jack |
| instead of a normal one. |
| |
| Thanks to Raymond Yau for spotting. |
| |
| BugLink: https://bugs.launchpad.net/bugs/961286 |
| BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=903869 |
| Signed-off-by: David Henningsson <david.henningsson@canonical.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/patch_hdmi.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/sound/pci/hda/patch_hdmi.c |
| +++ b/sound/pci/hda/patch_hdmi.c |
| @@ -1244,6 +1244,9 @@ static int generic_hdmi_build_jack(struc |
| |
| if (pcmdev > 0) |
| sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev); |
| + if (!is_jack_detectable(codec, per_pin->pin_nid)) |
| + strncat(hdmi_str, " Phantom", |
| + sizeof(hdmi_str) - strlen(hdmi_str) - 1); |
| |
| return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); |
| } |
