[SRU][J][PATCH 1/1] Revert "UBUNTU: [Config] enable Intel DMA remapping options by default"

[Andrea Righi]

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

It seems that enabling IOMMU can cause some weird gfx problems, see for
example:

 https://bugs.launchpad.net/bugs/1971146
 https://bugs.launchpad.net/bugs/1965882

Even if upstream decided to enable these options by default, it is
probably safer for now to keep IOMMU disabled, to prevent potential
issues like those mentioned above.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 debian.master/config/annotations          | 9 ++++-----
 debian.master/config/config.common.ubuntu | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b29b955240d5..8f9066b40ab1 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -3280,11 +3280,10 @@ CONFIG_IOMMU_DEFAULT_PASSTHROUGH                policy<{'amd64': 'n', 'arm64': '
 # Menu: Device Drivers >> IOMMU Hardware Support >> Support for Intel IOMMU using DMA Remapping Devices
 CONFIG_INTEL_IOMMU                              policy<{'amd64': 'y'}>
 CONFIG_INTEL_IOMMU_SVM                          policy<{'amd64': 'y'}>
-CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'y'}>
-CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON     policy<{'amd64': 'y'}>
-
-CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<LP:1951440>
-CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON     note<LP:1951440>
+CONFIG_INTEL_IOMMU_DEFAULT_ON                   policy<{'amd64': 'n'}>
+CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON     policy<{'amd64': 'n'}>
+#
+CONFIG_INTEL_IOMMU_DEFAULT_ON                   note<the IOMMU can trigger boot failures> flag<REVIEW>
 
 # Menu: Device Drivers >> IRQ chip support
 CONFIG_AL_FIC                                   policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1fc252155a38..4029cf842652 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4985,9 +4985,9 @@ CONFIG_INTEL_IDXD_SVM=y
 CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IOMMU=y
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_SVM=y
 CONFIG_INTEL_IPS=m
 CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
-- 
2.34.1