* [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not detectable
@ 2013-02-22 9:16 David Henningsson
2013-02-22 9:36 ` [alsa-devel] " Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: David Henningsson @ 2013-02-22 9:16 UTC (permalink / raw)
To: tiwai, alsa-devel; +Cc: 961286, superquad.vortex2, David Henningsson, stable
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.
Cc: stable@vger.kernel.org
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>
---
sound/pci/hda/patch_hdmi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 21425fb..78e1827 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1640,6 +1640,9 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
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);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [alsa-devel] [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not detectable
2013-02-22 9:16 [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not detectable David Henningsson
@ 2013-02-22 9:36 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2013-02-22 9:36 UTC (permalink / raw)
To: David Henningsson; +Cc: alsa-devel, 961286, superquad.vortex2, stable
At Fri, 22 Feb 2013 10:16:28 +0100,
David Henningsson wrote:
>
> 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.
>
> Cc: stable@vger.kernel.org
> 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>
Thanks, applied.
Takashi
> ---
> sound/pci/hda/patch_hdmi.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 21425fb..78e1827 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1640,6 +1640,9 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
>
> 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);
> }
> --
> 1.7.9.5
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-22 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-22 9:16 [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not detectable David Henningsson
2013-02-22 9:36 ` [alsa-devel] " Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).