Patchwork [3.5.y.z,extended,stable] Patch "ALSA: hda - hdmi: Make jacks phantom, if they're not" has been added to staging queue

login
register
mail settings
Submitter Luis Henriques
Date March 4, 2013, 8:48 p.m.
Message ID <1362430139-22147-1-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/224798/
State New
Headers show

Comments

Luis Henriques - March 4, 2013, 8:48 p.m.
This is a note to let you know that I have just added a patch titled

    ALSA: hda - hdmi: Make jacks phantom, if they're not

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From fa09c75eff9277959cc21dc0b9a4f066049f7d43 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 22 Feb 2013 10:16:28 +0100
Subject: [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not
 detectable

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: Luis Henriques <luis.henriques@canonical.com>
---
 sound/pci/hda/patch_hdmi.c | 3 +++
 1 file changed, 3 insertions(+)

--
1.8.1.2
David Henningsson - March 5, 2013, 4:16 a.m.
On 03/04/2013 09:48 PM, Luis Henriques wrote:
> This is a note to let you know that I have just added a patch titled
>
>      ALSA: hda - hdmi: Make jacks phantom, if they're not
>
> to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree
> which can be found at:
>
>   http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue
>
> If you, or anyone else, feels it should not be added to this tree, please
> reply to this email.

I believe this should be applied to our Ubuntu 3.5 tree directly, rather 
than the upstream one, as the phantom jacks were added in 3.6 but 
backported to our 3.5 kernel.

>
> For more information about the 3.5.y.z tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
>
> Thanks.
> -Luis
>
> ------
>
>  From fa09c75eff9277959cc21dc0b9a4f066049f7d43 Mon Sep 17 00:00:00 2001
> From: David Henningsson <david.henningsson@canonical.com>
> Date: Fri, 22 Feb 2013 10:16:28 +0100
> Subject: [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not
>   detectable
>
> 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: Luis Henriques <luis.henriques@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 45e3102..54eb763 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1234,6 +1234,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.8.1.2
>
Luis Henriques - March 5, 2013, 9:42 a.m.
On Tue, Mar 05, 2013 at 05:16:24AM +0100, David Henningsson wrote:
> On 03/04/2013 09:48 PM, Luis Henriques wrote:
> >This is a note to let you know that I have just added a patch titled
> >
> >     ALSA: hda - hdmi: Make jacks phantom, if they're not
> >
> >to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree
> >which can be found at:
> >
> >  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue
> >
> >If you, or anyone else, feels it should not be added to this tree, please
> >reply to this email.
> 
> I believe this should be applied to our Ubuntu 3.5 tree directly,
> rather than the upstream one, as the phantom jacks were added in 3.6
> but backported to our 3.5 kernel.

Great, I'll drop it from 3.5 tree.  Thanks.

Cheers,
--
Luis

>
> >
> >For more information about the 3.5.y.z tree, see
> >https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
> >
> >Thanks.
> >-Luis
> >
> >------
> >
> > From fa09c75eff9277959cc21dc0b9a4f066049f7d43 Mon Sep 17 00:00:00 2001
> >From: David Henningsson <david.henningsson@canonical.com>
> >Date: Fri, 22 Feb 2013 10:16:28 +0100
> >Subject: [PATCH] ALSA: hda - hdmi: Make jacks phantom, if they're not
> >  detectable
> >
> >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: Luis Henriques <luis.henriques@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 45e3102..54eb763 100644
> >--- a/sound/pci/hda/patch_hdmi.c
> >+++ b/sound/pci/hda/patch_hdmi.c
> >@@ -1234,6 +1234,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.8.1.2
> >
> 
> 
> 
> -- 
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 45e3102..54eb763 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1234,6 +1234,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);
 }