diff options
Diffstat (limited to 'drivers/gpu/msm')
| -rw-r--r-- | drivers/gpu/msm/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/gpu/msm/Makefile | 4 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_a5xx.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_iommu.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/msm/kgsl_mmu.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/msm/Kconfig b/drivers/gpu/msm/Kconfig index 399add593796..34e123fcc36c 100644 --- a/drivers/gpu/msm/Kconfig +++ b/drivers/gpu/msm/Kconfig @@ -42,6 +42,6 @@ config QCOM_ADRENO_DEFAULT_GOVERNOR default "simple_ondemand" depends on QCOM_KGSL -config MSM_KGSL_IOMMU +config QCOM_KGSL_IOMMU bool - default y if MSM_KGSL && (MSM_IOMMU || ARM_SMMU) + default y if QCOM_KGSL && (MSM_IOMMU || ARM_SMMU) diff --git a/drivers/gpu/msm/Makefile b/drivers/gpu/msm/Makefile index e77f0086dbdc..0ad87c609453 100644 --- a/drivers/gpu/msm/Makefile +++ b/drivers/gpu/msm/Makefile @@ -12,7 +12,7 @@ msm_kgsl_core-y = \ kgsl_snapshot.o \ kgsl_events.o -msm_kgsl_core-$(CONFIG_MSM_KGSL_IOMMU) += kgsl_iommu.o +msm_kgsl_core-$(CONFIG_QCOM_KGSL_IOMMU) += kgsl_iommu.o msm_kgsl_core-$(CONFIG_DEBUG_FS) += kgsl_debugfs.o msm_kgsl_core-$(CONFIG_QCOM_KGSL_CFF_DUMP) += kgsl_cffdump.o msm_kgsl_core-$(CONFIG_SYNC) += kgsl_sync.o @@ -37,7 +37,7 @@ msm_adreno-y += \ adreno_cp_parser.o \ adreno_perfcounter.o -msm_adreno-$(CONFIG_MSM_KGSL_IOMMU) += adreno_iommu.o +msm_adreno-$(CONFIG_QCOM_KGSL_IOMMU) += adreno_iommu.o msm_adreno-$(CONFIG_DEBUG_FS) += adreno_debugfs.o adreno_profile.o msm_adreno-$(CONFIG_COMPAT) += adreno_compat.o diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c index 73265dc1d532..b480a19e7065 100644 --- a/drivers/gpu/msm/adreno_a5xx.c +++ b/drivers/gpu/msm/adreno_a5xx.c @@ -208,7 +208,7 @@ static void a5xx_preemption_save(struct adreno_device *adreno_dev, PREEMPT_RECORD(rptr)); } -#ifdef CONFIG_MSM_KGSL_IOMMU +#ifdef CONFIG_QCOM_KGSL_IOMMU static int a5xx_preemption_iommu_init(struct adreno_device *adreno_dev) { struct kgsl_device *device = KGSL_DEVICE(adreno_dev); diff --git a/drivers/gpu/msm/adreno_iommu.h b/drivers/gpu/msm/adreno_iommu.h index 8e03b09c8255..c557c65bb4c9 100644 --- a/drivers/gpu/msm/adreno_iommu.h +++ b/drivers/gpu/msm/adreno_iommu.h @@ -14,7 +14,7 @@ #ifndef __ADRENO_IOMMU_H #define __ADRENO_IOMMU_H -#ifdef CONFIG_MSM_KGSL_IOMMU +#ifdef CONFIG_QCOM_KGSL_IOMMU int adreno_iommu_set_pt_ctx(struct adreno_ringbuffer *rb, struct kgsl_pagetable *new_pt, struct adreno_context *drawctxt); diff --git a/drivers/gpu/msm/kgsl_mmu.c b/drivers/gpu/msm/kgsl_mmu.c index 61947c8025d7..82150fbe9ac1 100644 --- a/drivers/gpu/msm/kgsl_mmu.c +++ b/drivers/gpu/msm/kgsl_mmu.c @@ -613,7 +613,7 @@ static struct { unsigned int type; struct kgsl_mmu_ops *ops; } kgsl_mmu_subtypes[] = { -#ifdef CONFIG_MSM_KGSL_IOMMU +#ifdef CONFIG_QCOM_KGSL_IOMMU { "iommu", KGSL_MMU_TYPE_IOMMU, &kgsl_iommu_ops }, #endif { "nommu", KGSL_MMU_TYPE_NONE, &kgsl_nommu_ops }, |