lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 85/89] ALSA: hda - Drop unsol event handler for Intel HDMI codecs
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit f2dbe87c5ac1f88e6007ba1f1374f4bd8a197fb6 ]

    We don't need to deal with the unsol events for Intel chips that are
    tied with the graphics via audio component notifier. Although the
    presence of the audio component is checked at the beginning of
    hdmi_unsol_event(), better to short cut by dropping unsol_event ops.

    BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204565
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/hda/patch_hdmi.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
    index f5803f9bba9bb..f214055972150 100644
    --- a/sound/pci/hda/patch_hdmi.c
    +++ b/sound/pci/hda/patch_hdmi.c
    @@ -2555,13 +2555,20 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec,
    /* precondition and allocation for Intel codecs */
    static int alloc_intel_hdmi(struct hda_codec *codec)
    {
    + int err;
    +
    /* requires i915 binding */
    if (!codec->bus->core.audio_component) {
    codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n");
    return -ENODEV;
    }

    - return alloc_generic_hdmi(codec);
    + err = alloc_generic_hdmi(codec);
    + if (err < 0)
    + return err;
    + /* no need to handle unsol events */
    + codec->patch_ops.unsol_event = NULL;
    + return 0;
    }

    /* parse and post-process for Intel codecs */
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-22 21:09    [W:5.586 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site