[SRU][Mantic][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_MTK_IOMMU on arm64

[Jian Hui Lee]

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

Enable CONFIG_MTK_IOMMU as module for multimedia and PCIE peripherals on Mediatek platform.

Signed-off-by: Jian Hui Lee <jianhui.lee at canonical.com>
---
 debian.master/config/annotations | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index ce5137a8719b..b4382c3b256f 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6488,7 +6488,8 @@ CONFIG_IOMMU_DMA                                policy<{'amd64': 'y', 'arm64': '
 CONFIG_IOMMU_HELPER                             policy<{'amd64': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_IOMMU_IOVA                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_IOMMU_IO_PGTABLE                         policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y'}>
-CONFIG_IOMMU_IO_PGTABLE_ARMV7S                  policy<{'arm64': 'n', 'armhf': 'n'}>
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S                  policy<{'arm64': 'y', 'armhf': 'n'}>
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST         policy<{'arm64': 'n'}>
 CONFIG_IOMMU_IO_PGTABLE_DART                    policy<{'arm64': 'y'}>
 CONFIG_IOMMU_IO_PGTABLE_LPAE                    policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST           policy<{'arm64': 'n', 'armhf': 'n'}>
@@ -8210,7 +8211,7 @@ CONFIG_MTK_CQDMA                                policy<{'arm64': 'm', 'armhf': '
 CONFIG_MTK_DEVAPC                               policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTK_HSDMA                                policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTK_INFRACFG                             policy<{'arm64': 'y', 'armhf': 'y'}>
-CONFIG_MTK_IOMMU                                policy<{'arm64': 'n', 'armhf': 'n'}>
+CONFIG_MTK_IOMMU                                policy<{'arm64': 'm', 'armhf': 'n'}>
 CONFIG_MTK_IOMMU_V1                             policy<{'armhf': 'n'}>
 CONFIG_MTK_LVTS_THERMAL                         policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_MTK_LVTS_THERMAL_DEBUGFS                 policy<{'arm64': 'y', 'armhf': 'y'}>
@@ -14487,6 +14488,10 @@ CONFIG_VIDEO_M52790                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_VIDEO_MAX9271_LIB                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_VIDEO_MAX9286                            policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_VIDEO_MAX96712                           policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_VIDEO_MEDIATEK_JPEG                      policy<{'arm64': 'n'}>
+CONFIG_VIDEO_MEDIATEK_MDP                       policy<{'arm64': 'n'}>
+CONFIG_VIDEO_MEDIATEK_MDP3                      policy<{'arm64': 'n'}>
+CONFIG_VIDEO_MEDIATEK_VCODEC                    policy<{'arm64': 'n'}>
 CONFIG_VIDEO_MEDIATEK_VPU                       policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_VIDEO_MESON_GE2D                         policy<{'arm64': 'm', 'armhf': 'm'}>
-- 
2.39.2