[SRU][H][PATCH 6/6] UBUNTU: [Config] set SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 to n

[Hui Wang]

BugLink: https://bugs.launchpad.net/bugs/1919930

Intel recommend to set this kconfig option to n, it will introduce
hang issue on the TGL machines, and Intel sofproject kernel also set
it to n by default.

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.master/config/annotations          | 3 ++-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1b9e21432d29..6b3425c4e64d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8709,11 +8709,12 @@ CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT           policy<{'amd64': 'y'}>
 CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT            policy<{'amd64': 'y'}>
 CONFIG_SND_SOC_SOF_HDA_LINK                     policy<{'amd64': 'y'}>
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC              policy<{'amd64': 'y'}>
-CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1     policy<{'amd64': 'y'}>
+CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1     policy<{'amd64': 'n'}>
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK         policy<{'amd64': 'y'}>
 #
 CONFIG_SND_SOC_SOF_HDA_LINK                     mark<ENFORCED> note<LP:1848490>
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC              mark<ENFORCED> note<LP:1848490>
+CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1     mark<ENFORCED> note<LP:1919930>
 
 # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ARM sound devices
 CONFIG_SND_ARM                                  policy<{'armhf': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8547702d7878..ff192392a7e1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10027,7 +10027,7 @@ CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_HDA=m
-CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1=y
+# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_COMMON=m
 CONFIG_SND_SOC_SOF_HDA_LINK=y
-- 
2.25.1