Snap for 12922552 from fcc641e057ac86c7584c8d7b2381dbf64d535855 to android14-gs-pixel-6.1-trunk-release

Change-Id: I11ce40977d9e3a6305920038924cf01a976dfa72
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 3a2be2d..7cb6a23 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -141,6 +141,7 @@
         "drivers/input/keydebug.ko",
         "drivers/input/misc/vl53l1/stmvl53l1.ko",
         "drivers/iommu/exynos-pcie-iommu.ko",
+        "drivers/iommu/iovad-best-fit-algo.ko",
         "drivers/iommu/samsung-iommu-group.ko",
         "drivers/iommu/samsung-secure-iova.ko",
         "drivers/iommu/samsung_iommu.ko",

dts/gs201-isp.dtsi

diff --git a/dts/gs201-isp.dtsi b/dts/gs201-isp.dtsi
index d7b8504..30c2a6b 100644
--- a/dts/gs201-isp.dtsi
+++ b/dts/gs201-isp.dtsi
@@ -377,6 +377,7 @@
 			<&sysmmu_csis1>;
 		power-domains = <&pd_pdp>;
 		samsung,iommu-group = <&iommu_group_isp>;
+		lwis,iommu-best-fit-algo;
 		samsung,tzmp = "true";
 	};
 

gs201_defconfig

diff --git a/gs201_defconfig b/gs201_defconfig
index b747b3e..392b5d6 100644
--- a/gs201_defconfig
+++ b/gs201_defconfig
@@ -62,6 +62,7 @@
 # private/google-modules/soc/gs/drivers/iommu/Kconfig
 CONFIG_SAMSUNG_IOMMU=m
 CONFIG_EXYNOS_PCIE_IOMMU=m
+CONFIG_IOVAD_BEST_FIT_ALGO=m
 
 # private/google-modules/soc/gs/drivers/media/platform/Kconfig
 CONFIG_VIDEO_EXYNOS_MFC=m