From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DF061F60B; Mon, 11 Dec 2023 13:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q091HkTK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77453C433CD; Mon, 11 Dec 2023 13:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702303194; bh=mwRMxAXDSDOt3VEbst4HcA3jGRVpwBIp3rlBTdALsj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q091HkTK6RqgSetdvwEEjX+85/ZCSCxwamELpobrFjw9YoWMsEfOoOXw1CGPn9hAI i3SXDybLzpzKmZfjWUwbafnXnummTLzWfFSnLBL7KABeD0xvBFHIwM1sMXvJR3HL8X kCsng8Vf7QtUFPmC4/q5sRWOM1AgXmOfW9LShBE4JDwPuIjPM3ebgp810OaJ9KldKE ecbSBhaHjMLBguNqDlD9AOLvjtiTzcxQpMqefKc7l9Uup+3i2AnFV+ROcOSCB37wu5 Ozg6Ub/KNBx+vAkyBD6RtXAbmp8eisotcmKDJUpzygror6fui0VPaCMN9mwivknq/L IyiOxZXvjS5Lg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Ujfalusi , Bard Liao , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Sasha Levin , cezary.rojewski@intel.com, liam.r.girdwood@linux.intel.com, ranjani.sridharan@linux.intel.com, perex@perex.cz, tiwai@suse.com, kuninori.morimoto.gx@renesas.com, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 08/19] ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available Date: Mon, 11 Dec 2023 08:57:42 -0500 Message-ID: <20231211135908.385694-8-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135908.385694-1-sashal@kernel.org> References: <20231211135908.385694-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.142 Content-Transfer-Encoding: 8bit From: Peter Ujfalusi [ Upstream commit 3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8 ] When the HDMI is not present due to disabled display support we will use dummy codec and the HDMI routes will refer to non existent DAPM widgets. Trim the route list from the HDMI routes to be able to probe the card even if the HDMI dais are not registered. Signed-off-by: Peter Ujfalusi Reviewed-by: Bard Liao Reviewed-by: Kai Vehmanen Reviewed-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20231124124015.15878-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index f4b4eeca3e03c..0cbacebe0613e 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -157,6 +157,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) card->dapm_widgets = skl_hda_widgets; card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); if (!ctx->idisp_codec) { + card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT]; + num_route -= IDISP_ROUTE_COUNT; for (i = 0; i < IDISP_DAI_COUNT; i++) { skl_hda_be_dai_links[i].codecs = dummy_codec; skl_hda_be_dai_links[i].num_codecs = -- 2.42.0