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 9E6C01E2834; Wed, 19 Mar 2025 14:37:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395073; cv=none; b=tLzNXZefmbk33OG4aeLIt71HzPW7RZCHbVGFFUhrRJfn4ipfC51elxcsS9DXrems+x5nWEgYXYOlXE/4jn9GUjG49f/oSpaE3fQBatNU2CcddrH5w7Tu19tY0ATNLKzA1FQlZW6aPUNrsT3EZWJJCvm7f4FaN9AoMnsMus+OvHw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395073; c=relaxed/simple; bh=/Be+ecNPNwlCQLqqLZGRNYxl9wEjQsvN++/EvHwhBhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=V6lhjQd478Ktl6vR2mIMLny4M4pnNnDVdH18HVPfViE+pxscGLOlgEwaePSqI1ChxzLWrJN2qQ8dgcwB+puPODUw2rgatckexu0ltqoulpnb4Jt/IZlDoSH/WhT3WCx3/VXlRh0Knwf5Cn2mSZazOFGTKxQsL/PRu28TWqRncn0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZcL8A1i5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZcL8A1i5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72D65C4CEE4; Wed, 19 Mar 2025 14:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395073; bh=/Be+ecNPNwlCQLqqLZGRNYxl9wEjQsvN++/EvHwhBhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZcL8A1i5tb8HkYmIm4NINMzXunWeS4wwXK0JbeH2qxir1Ndv9JjR36tTAo9v2zAZI aJjRJ4kZ69rzIOno21vdOiZ32g8uST3suDFzbai1xq5trITmsMJTalLzx0BrtUAgyc c/2cwViXUMTDaxYWyxMmrcxIB9VVUVA3tPrHzqtQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Terry Cheong , Bard Liao , Johny Lin , =?UTF-8?q?P=C3=A9ter=20Ujfalusi?= , Mark Brown , Sasha Levin Subject: [PATCH 6.12 112/231] ASoC: SOF: Intel: hda: add softdep pre to snd-hda-codec-hdmi module Date: Wed, 19 Mar 2025 07:30:05 -0700 Message-ID: <20250319143029.609423912@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143026.865956961@linuxfoundation.org> References: <20250319143026.865956961@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Terry Cheong [ Upstream commit 33b7dc7843dbdc9b90c91d11ba30b107f9138ffd ] In enviornment without KMOD requesting module may fail to load snd-hda-codec-hdmi, resulting in HDMI audio not usable. Add softdep to loading HDMI codec module first to ensure we can load it correctly. Signed-off-by: Terry Cheong Reviewed-by: Bard Liao Reviewed-by: Johny Lin Reviewed-by: Péter Ujfalusi Signed-off-by: Peter Ujfalusi Link: https://patch.msgid.link/20250206094723.18013-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/intel/hda-codec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index dc46888faa0dc..c0c58b4297155 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -454,6 +454,7 @@ int hda_codec_i915_exit(struct snd_sof_dev *sdev) } EXPORT_SYMBOL_NS_GPL(hda_codec_i915_exit, SND_SOC_SOF_HDA_AUDIO_CODEC_I915); +MODULE_SOFTDEP("pre: snd-hda-codec-hdmi"); #endif MODULE_LICENSE("Dual BSD/GPL"); -- 2.39.5