Merge "msm: kgsl: Declare platform_bus_type as secure for ARM driver" (20078471) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/kgsl_mmu.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -357,12 +357,20 @@ kgsl_mmu_pagetable_get_contextidr(struct kgsl_pagetable *pagetable)

		#ifdef CONFIG_MSM_IOMMU
		#include <linux/qcom_iommu.h>
		#ifndef CONFIG_ARM_SMMU
		static inline bool kgsl_mmu_bus_secured(struct device *dev)
		{
		struct bus_type *bus = msm_iommu_get_bus(dev);

		return (bus == &msm_iommu_sec_bus_type) ? true : false;
		}
		#else
		static inline bool kgsl_mmu_bus_secured(struct device *dev)
		{
		/* ARM driver contains all context banks on single bus */
		return true;
		}
		#endif /* CONFIG_ARM_SMMU */
		static inline struct bus_type kgsl_mmu_get_bus(struct device dev)
		{
		return msm_iommu_get_bus(dev);
		@@ -374,7 +382,8 @@ static inline struct device kgsl_mmu_get_ctx(const char name)
		#else
		static inline bool kgsl_mmu_bus_secured(struct device *dev)
		{
		return false;
		/ARM driver contains all context banks on single bus /
		return true;
		}

		static inline struct bus_type kgsl_mmu_get_bus(struct device dev)