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 89754C433FE for ; Sun, 2 Oct 2022 22:52:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8CC2D28E5; Mon, 3 Oct 2022 00:51:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8CC2D28E5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1664751143; bh=fePKjXwvZe4cssNgNOsnoApiIf49pkGwedEnC0k3pl0=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fpc7V7cuOv2XxzqxkXDNPoF3JoUbBQQJ/Iqp1FqHKY7W5xS6LgplND6IrFucZ3d5J J1QQdPXMF4uPTNGVUmFz2CD1LyJlcUjnd4MY34a6wHJhnarmzakxaJcA/qZ17OBJXr pWVspT/rCS/9ilx0sP9IGSO9cN/zziaEfxT56V2I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 32120F8013D; Mon, 3 Oct 2022 00:51:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 72425F80246; Mon, 3 Oct 2022 00:51:32 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B6B92F800CC for ; Mon, 3 Oct 2022 00:51:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B6B92F800CC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="u4QqXy0P" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 012E0B80D9B; Sun, 2 Oct 2022 22:51:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C0BAC433C1; Sun, 2 Oct 2022 22:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664751085; bh=fePKjXwvZe4cssNgNOsnoApiIf49pkGwedEnC0k3pl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4QqXy0P6hSOnCM7uWr3nw+MhYJ6Qom1iVuGiH91dRCcrwxK9DHp6SG1KntNUjw0L MrTvG9n2xBV3gQBOiTEEw3LrQwkqxXcxg1yu+kZWpSg+KBPfzDj8uuyMDScA9vMleP zOJSJ8WJxTfhmIJvcV20YlavN9QH7rzWyQDiKs9FojzpR6bgN7KXo++LE+knSFBnHi KAFcE5jB3kUOtAnBSoEeW6W+VHmmTZsBuwT7KnsdJ5GLWfn7cAwBhG7D31ZgOEA/dP iHa394xKrayCRPVR7O8TF1J+wVC/Tzt4dTVN+2AH5VHpUrdSYigaTPbX/w4mS3cNwM 7E3FNv2+0g7ew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 12/20] ALSA: hda/hdmi: Fix the converter reuse for the silent stream Date: Sun, 2 Oct 2022 18:50:51 -0400 Message-Id: <20221002225100.239217-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221002225100.239217-1-sashal@kernel.org> References: <20221002225100.239217-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , pierre-louis.bossart@linux.intel.com, alsa-devel@alsa-project.org, Kai Vehmanen , Takashi Iwai , tiwai@suse.com, kai.heng.feng@canonical.com, mkumard@nvidia.com, ville.syrjala@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Jaroslav Kysela [ Upstream commit 5f80d6bd2b01de4cafac3302f58456bf860322fc ] When the user space pcm stream uses the silent stream converter, it is no longer allocated for the silent stream. Clear the appropriate flag in the hdmi_pcm_open() function. The silent stream setup may be applied in hdmi_pcm_close() (and the error path - open fcn) again. If the flag is not cleared, the reuse conditions for the silent stream converter in hdmi_choose_cvt() may improperly share this converter. Cc: Kai Vehmanen Signed-off-by: Jaroslav Kysela Link: https://lore.kernel.org/r/20220913070216.3233974-1-perex@perex.cz Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 24da843f39a1..b3bcc6df5985 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1259,6 +1259,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, set_bit(pcm_idx, &spec->pcm_in_use); per_pin = get_pin(spec, pin_idx); per_pin->cvt_nid = per_cvt->cvt_nid; + per_pin->silent_stream = false; hinfo->nid = per_cvt->cvt_nid; /* flip stripe flag for the assigned stream if supported */ -- 2.35.1