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 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDFC6C32793 for ; Wed, 18 Jan 2023 10:14:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C94A83C01; Wed, 18 Jan 2023 11:14:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C94A83C01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1674036894; bh=pWSIOtNM3rtei0PbIPXjr0Zi8acsApuWkoJmLOqf0U0=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=sbf+jWdI2EXgxWefQ//oQu4dPgGG264whM/VhxRvWU8rOybhTq5m1LBMXc56lOAeo nY3BljwUWOB4iQ9ZmpccRlZIIdrls2dp01ZNpuFrkUr+ysqa79WGrszpCPn2UhDlOK /xh545JIyn6ybAR725tJ4cTvDuoJdCoi0UfO2kJs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 966D3F80548; Wed, 18 Jan 2023 11:13:32 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AAB5AF80549; Wed, 18 Jan 2023 11:13:31 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 50625F80544 for ; Wed, 18 Jan 2023 11:13:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 50625F80544 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=dnc7EeGx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674036810; x=1705572810; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pWSIOtNM3rtei0PbIPXjr0Zi8acsApuWkoJmLOqf0U0=; b=dnc7EeGxPwCAKBVVm4DMwqwhxaQ+Xm92I6JwIIxlzbyzoBDZDHmalLVk rM7Dlzj1mtDDwDIXL+IdWNJzXmTaEgVV7xWBt8IggsOyBHqIwz2poSWfz J0awe3EHNVvUWfqtWf3KNgu6pzTkVPMPdafXBlIB6+h97yRhl7TraBoII rpJQMQYjZDFfZl7u1oTd9iRTbNAEOuNJ32dONvB1xZRfyecknj2GuafbV qPhQbcKkj1246C7V5Y3DNbrhM7pHGwqsd+BM6ohpbMIXSGSwRzWx6cc3o NK8MlDmXx3BgJmY7yfabhYR4u3iDf7ci+x9+iXFg+3iCFKXz5UTP7eJug g==; X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="304630459" X-IronPort-AV: E=Sophos;i="5.97,226,1669104000"; d="scan'208";a="304630459" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 02:13:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10593"; a="661653828" X-IronPort-AV: E=Sophos;i="5.97,224,1669104000"; d="scan'208";a="661653828" Received: from kevinkeo-mobl.ger.corp.intel.com (HELO pujfalus-desk.ger.corp.intel.com) ([10.252.26.150]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2023 02:12:58 -0800 From: Peter Ujfalusi To: lgirdwood@gmail.com, broonie@kernel.org Subject: [PATCH v3 3/3] ASoC: SOF: keep prepare/unprepare widgets in sink path Date: Wed, 18 Jan 2023 12:12:55 +0200 Message-Id: <20230118101255.29139-4-peter.ujfalusi@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230118101255.29139-1-peter.ujfalusi@linux.intel.com> References: <20230118101255.29139-1-peter.ujfalusi@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 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: , Cc: alsa-devel@alsa-project.org, kai.vehmanen@linux.intel.com, pierre-louis.bossart@linux.intel.com, rander.wang@intel.com, ranjani.sridharan@linux.intel.com, yung-chuan.liao@linux.intel.com, angelogioacchino.delregno@collabora.com Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Bard Liao The existing code return when a widget doesn't need to prepare/unprepare. This will prevent widgets in the sink path from being prepared/unprepared. Cc: # 6.1 Link: https://github.com/thesofproject/linux/issues/4021 Signed-off-by: Bard Liao Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart Reviewed-by: Rander Wang Signed-off-by: Peter Ujfalusi --- sound/soc/sof/sof-audio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 8c114e6a23c6..ff716bfbcb67 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -271,9 +271,9 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg struct snd_sof_widget *swidget = widget->dobj.private; struct snd_soc_dapm_path *p; - /* return if the widget is in use or if it is already unprepared */ + /* skip if the widget is in use or if it is already unprepared */ if (!swidget || !swidget->prepared || swidget->use_count > 0) - return; + goto sink_unprepare; if (widget_ops[widget->id].ipc_unprepare) /* unprepare the source widget */ @@ -281,6 +281,7 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg swidget->prepared = false; +sink_unprepare: /* unprepare all widgets in the sink paths */ snd_soc_dapm_widget_for_each_sink_path(widget, p) { if (!p->walking && p->sink->dobj.private) { -- 2.39.0