lkml.org 
[lkml]   [2013]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [ 093/153] ALSA: hda - hdmi: Make jacks phantom, if theyre not detectable
    From
    Date
    On Mon, 2013-03-04 at 03:38 +0000, Ben Hutchings wrote:
    > 3.2-stable review patch. If anyone has any objections, please let me know.
    >
    > ------------------
    >
    > 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>
    > [bwh: Backported to 3.2: adjust context]
    > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

    David, do I need to change this further for 3.2.y?

    Ben.

    > ---
    > 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
    > @@ -1228,6 +1228,9 @@ static int generic_hdmi_build_jack(struc
    > int pcmdev = spec->pcm_rec[pin_idx].device;
    >
    > snprintf(hdmi_str, sizeof(hdmi_str), "HDMI/DP,pcm=%d", pcmdev);
    > + if (!is_jack_detectable(codec, per_pin->pin_nid))
    > + strncat(hdmi_str, " Phantom",
    > + sizeof(hdmi_str) - strlen(hdmi_str) - 1);
    >
    > err = snd_hda_input_jack_add(codec, per_pin->pin_nid,
    > SND_JACK_VIDEOOUT, pcmdev > 0 ? hdmi_str : NULL);
    >
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe stable" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    >

    --
    Ben Hutchings
    Always try to do things in chronological order;
    it's less confusing that way.
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2013-03-04 07:01    [W:4.149 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site