From patchwork Tue Jul 17 11:10:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sriram Periyasamy X-Patchwork-Id: 10528991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B572603ED for ; Tue, 17 Jul 2018 11:15:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 367CD1FF6A for ; Tue, 17 Jul 2018 11:15:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2950A28B79; Tue, 17 Jul 2018 11:15:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BACD21FF6A for ; Tue, 17 Jul 2018 11:15:15 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B722A267759; Tue, 17 Jul 2018 13:15:13 +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 2F063267776; Tue, 17 Jul 2018 13:15:11 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by alsa0.perex.cz (Postfix) with ESMTP id 5938226770A for ; Tue, 17 Jul 2018 13:15:05 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2018 04:15:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,365,1526367600"; d="scan'208";a="216666747" Received: from mtbf-optiplex-9010.iind.intel.com ([10.223.96.13]) by orsmga004.jf.intel.com with ESMTP; 17 Jul 2018 04:14:59 -0700 From: Sriram Periyasamy To: ALSA ML , Mark Brown Date: Tue, 17 Jul 2018 16:40:42 +0530 Message-Id: <1531825842-26513-1-git-send-email-sriramx.periyasamy@intel.com> X-Mailer: git-send-email 2.7.4 Cc: Takashi Iwai , Sriram Periyasamy , Guneshwor Singh , Liam Girdwood , Patches Audio , Jeeja KP , Sanyog Kale Subject: [alsa-devel] [PATCH v3] ASoC: hdac_hdmi: Program pin-port-mux during jack report event 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 During d3/d0 cycle, the connection selection index of all pins points to the default value. This needs to be restored to ensure audio is restored after d3/d0 cycle. So store the connection selection index and program it during jack report event which gets invoked in cases like d3/d0 cycle, hot plug detection when multiple displays are connected. Signed-off-by: Sriram Periyasamy Signed-off-by: Sanyog Kale Signed-off-by: Jeeja KP Signed-off-by: Guneshwor Singh --- v2 -> v3: - Balance PM usage count in error path - Add more explanation to the patch v1 -> v2: - Runtime resume the device explicitly in order to use snd_hdac_codec_write() sound/soc/codecs/hdac_hdmi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 84f7a7a36e4b..39224f01e59b 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -83,6 +83,7 @@ struct hdac_hdmi_pin { struct list_head head; hda_nid_t nid; bool mst_capable; + int conn_index; struct hdac_hdmi_port *ports; int num_ports; struct hdac_ext_device *edev; @@ -141,6 +142,9 @@ struct hdac_hdmi_priv { #define hdev_to_hdmi_priv(_hdev) ((to_ehdac_device(_hdev))->private_data) +static int hdac_hdmi_port_select_set(struct hdac_ext_device *edev, + struct hdac_hdmi_port *port); + static struct hdac_hdmi_pcm * hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi, struct hdac_hdmi_cvt *cvt) @@ -167,6 +171,38 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, if (is_connect) { /* + * Restore the connection selection index in + * hdac_hdmi_jack_report() which will restore all ports + * irrespective of their usage in all use cases like D0/D3 + * cycles, Hot plug detection. + * + * Increment the usage count to ensure that the device + * is runtime active to send verb across. + */ + pm_runtime_get_sync(&edev->hdev.dev); + + /* set the device if pin is mst_capable */ + if (hdac_hdmi_port_select_set(edev, port) < 0) { + dev_err(&edev->hdev.dev, + "port %d device select fail\n", port->id); + pm_runtime_put_sync(&edev->hdev.dev); + return; + } + + /* + * Ensure that valid connection selection index of the + * respective pin is updated since writing invalid will + * lead to undefined HW behaviour in such cases like if + * mux is not set for ports from userland. + */ + if (port->pin->conn_index > 0) + snd_hdac_codec_write(&edev->hdev, port->pin->nid, + 0, AC_VERB_SET_CONNECT_SEL, + port->pin->conn_index - 1); + + pm_runtime_put_sync(&edev->hdev.dev); + + /* * Report Jack connect event when a device is connected * for the first time where same PCM is attached to multiple * ports. @@ -903,6 +939,9 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol, } } + if (ucontrol->value.enumerated.item[0] > 0) + port->pin->conn_index = ucontrol->value.enumerated.item[0]; + /* * Jack status is not reported during device probe as the * PCMs are not registered by then. So report it here.