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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D5D0C433F5 for ; Sun, 2 Oct 2022 22:57:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbiJBW5k (ORCPT ); Sun, 2 Oct 2022 18:57:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbiJBW5L (ORCPT ); Sun, 2 Oct 2022 18:57:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B52A11152; Sun, 2 Oct 2022 15:54:42 -0700 (PDT) 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 A9D73B80D9A; Sun, 2 Oct 2022 22:52:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25C1BC433C1; Sun, 2 Oct 2022 22:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664751136; bh=cP8iZQW+GANxcdQXd1eRU4DsQZikYhpQ9Lwu6Y6BBZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1cRNOMYXu9f9RndpmXW4fJcMlO5L/Vu7K6XyjiMHmGHJhMJEXlOPMX0pFwflbi1I fE6B1Uz6xGcZmB31n0gDwfHjRElpcODnKTXa++7HwkAjEdzEOXi4LpdFYaz3utQEtN vXL7Nj9bvz1nQyaXXWmZBLhMBraWbcfNYIC7lQ+4LP9JHufsxODzN/Z+plv8o2LL7o FJk9Mv55d9NSaG7apWMje2ULrSfvE3GO9m7GWWW3l/M6AGKlNXQClA3GRieOSw0Kev H8JZU6ySbdvtRR7vFwO/xlWeZI7uI3i8+I8GMS+w60x/zBX6vNLtmKuB63fFrh2BlW V6BYHyHIo9gCg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jaroslav Kysela , Kai Vehmanen , Takashi Iwai , Sasha Levin , tiwai@suse.com, mkumard@nvidia.com, pierre-louis.bossart@linux.intel.com, ville.syrjala@linux.intel.com, kai.heng.feng@canonical.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.10 08/14] ALSA: hda/hdmi: Fix the converter reuse for the silent stream Date: Sun, 2 Oct 2022 18:51:49 -0400 Message-Id: <20221002225155.239480-8-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221002225155.239480-1-sashal@kernel.org> References: <20221002225155.239480-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 71e11481ba41..64f5192bcff8 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1257,6 +1257,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