From patchwork Tue Jul 21 07:57:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Henningsson X-Patchwork-Id: 6832751 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5A698C05AC for ; Tue, 21 Jul 2015 07:59:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8C1DB2061B for ; Tue, 21 Jul 2015 07:59:35 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 25214205F9 for ; Tue, 21 Jul 2015 07:59:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4B34D2650BD; Tue, 21 Jul 2015 09:59:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, RCVD_IN_DNSWL_NONE,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E2ED32619DB; Tue, 21 Jul 2015 09:57:47 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id EDCB8261AD0; Tue, 21 Jul 2015 09:57:46 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 862C02619DB for ; Tue, 21 Jul 2015 09:57:32 +0200 (CEST) Received: from 1.general.diwic.uk.vpn ([10.172.196.28] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ZHSQe-0005Kr-9q; Tue, 21 Jul 2015 07:57:32 +0000 From: David Henningsson To: alsa-devel@alsa-project.org, intel-gfx@lists.freedesktop.org, tiwai@suse.de, daniel.vetter@intel.com, jani.nikula@linux.intel.com Date: Tue, 21 Jul 2015 09:57:27 +0200 Message-Id: <1437465447-8974-5-git-send-email-david.henningsson@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1437465447-8974-1-git-send-email-david.henningsson@canonical.com> References: <1437465447-8974-1-git-send-email-david.henningsson@canonical.com> Cc: vinod.koul@intel.com, libin.yang@intel.com, David Henningsson Subject: [alsa-devel] [PATCH 4/4] ALSA: hda - Wake the codec up on hotplug notify events X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP As a first cautious step, we're not going to trust the information coming directly from the i915 driver, we're just going to use the fact that there was an event to wakeup the codec and ask for its status. This fixes the issue with lost unsol events in power save mode, the codec and controller can now sleep in D3 and still know when the HDMI monitor has been connected. Signed-off-by: David Henningsson --- sound/pci/hda/patch_hdmi.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 2f24338..230d83d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2316,6 +2316,24 @@ static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg, snd_hda_codec_set_power_to_all(codec, fg, power_state); } +static void intel_haswell_hotplug_notify(struct hdac_device *dev, + const struct i915_audio_hotplug_info *info) +{ + struct hda_codec *codec = container_of(dev, struct hda_codec, core); + int pin_nid = info->port + 0x04; + + check_presence_and_report(codec, pin_nid); +} + +static void intel_valleyview_hotplug_notify(struct hdac_device *dev, + const struct i915_audio_hotplug_info *info) +{ + struct hda_codec *codec = container_of(dev, struct hda_codec, core); + int pin_nid = 0x03; /* TODO: Ask Intel engineers to verify this */ + + check_presence_and_report(codec, pin_nid); +} + static int patch_generic_hdmi(struct hda_codec *codec) { struct hdmi_spec *spec; @@ -2331,7 +2349,9 @@ static int patch_generic_hdmi(struct hda_codec *codec) if (is_haswell_plus(codec)) { intel_haswell_enable_all_pins(codec, true); intel_haswell_fixup_enable_dp12(codec); - } + codec->core.hotplug_notify = intel_haswell_hotplug_notify; + } else if (is_valleyview_plus(codec)) + codec->core.hotplug_notify = intel_valleyview_hotplug_notify; /* For Valleyview/Cherryview, only the display codec is in the display * power well and can use link_power ops to request/release the power.