Merge "drm/msm/sde: move dpu mapping to the upper 2GB address space" (724118f3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/msm_smmu.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -33,6 +33,10 @@
		#define SZ_4G (((size_t) SZ_1G) * 4)
		#endif

		#ifndef SZ_2G
		#define SZ_2G (((size_t) SZ_1G) * 2)
		#endif

		struct msm_smmu_client {
		struct device *dev;
		struct dma_iommu_mapping *mmu_mapping;
		@@ -300,26 +304,26 @@ static const struct msm_mmu_funcs funcs = {
		static struct msm_smmu_domain msm_smmu_domains[MSM_SMMU_DOMAIN_MAX] = {
		[MSM_SMMU_DOMAIN_UNSECURE] = {
		.label = "mdp_ns",
		.va_start = SZ_128K,
		.va_size = SZ_4G - SZ_128K,
		.va_start = SZ_2G,
		.va_size = SZ_4G - SZ_2G,
		.secure = false,
		},
		[MSM_SMMU_DOMAIN_SECURE] = {
		.label = "mdp_s",
		.va_start = SZ_128K,
		.va_size = SZ_4G - SZ_128K,
		.va_start = SZ_2G,
		.va_size = SZ_4G - SZ_2G,
		.secure = true,
		},
		[MSM_SMMU_DOMAIN_NRT_UNSECURE] = {
		.label = "rot_ns",
		.va_start = SZ_128K,
		.va_size = SZ_4G - SZ_128K,
		.va_start = SZ_2G,
		.va_size = SZ_4G - SZ_2G,
		.secure = false,
		},
		[MSM_SMMU_DOMAIN_NRT_SECURE] = {
		.label = "rot_s",
		.va_start = SZ_128K,
		.va_size = SZ_4G - SZ_128K,
		.va_start = SZ_2G,
		.va_size = SZ_4G - SZ_2G,
		.secure = true,
		},
		};