From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A963C3A5A6 for ; Sun, 22 Sep 2019 19:22:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51B72206C2 for ; Sun, 22 Sep 2019 19:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569180120; bh=U+jKrTN27ES9qTRrcQwXEjbb0tNmYlzxjvDnmiQrrjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vp70ODAuFUGaYJ4fbRsOlC6yI6d15982zVAuff2mb+m8VjfJCFXlgE54J7OKC0JH2 xp+D87VXfUTjxZP63ax+rfW+dUlFzycW/v67j04vcQGbnO3h5NtAp0bS1xFm9krREw A+hHGmI/LBcA1hR5A3YVj+9h8tzFReSLVqudx6AU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731094AbfIVTV6 (ORCPT ); Sun, 22 Sep 2019 15:21:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:54252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389939AbfIVSyB (ORCPT ); Sun, 22 Sep 2019 14:54:01 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94A5C21479; Sun, 22 Sep 2019 18:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178441; bh=U+jKrTN27ES9qTRrcQwXEjbb0tNmYlzxjvDnmiQrrjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SogWOMItrUT+hs+VeqMu0MDCDAtNnFCyzCgo9vVgLdP3SVdv6kjUIs75JYRaAQxrL 1/xEOQjLyw+DaTQt91hyuPfrOF77J361nIhhKzaAx/MI1IwyVClAuHiG7/GEouOyBz rLEYf8F1oyPYQCh5D+1ZtkF5vlUyTf8CY8tpXi/Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin Subject: [PATCH AUTOSEL 5.2 174/185] ALSA: hda - Drop unsol event handler for Intel HDMI codecs Date: Sun, 22 Sep 2019 14:49:12 -0400 Message-Id: <20190922184924.32534-174-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184924.32534-1-sashal@kernel.org> References: <20190922184924.32534-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ 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 Signed-off-by: Sasha Levin --- 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 e49c1c00f5ce1..ca0404edd939e 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2611,6 +2611,8 @@ 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"); @@ -2619,7 +2621,12 @@ static int alloc_intel_hdmi(struct hda_codec *codec) 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