evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: kgsl: Use CONFIG_QCOM_KGSL_IOMMU

Browse source 
The rest of the driver started using CONFIG_QCOM_KGSL_IOMMU. The
replayed MMU changes didn't get the memo.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2016-03-14 13:53:25 -06:00 • committed by David Keitel
parent f98d112e4e
commit 2a69c38265
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/msm/Kconfig
View file

@ -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)

4
drivers/gpu/msm/Makefile
View file

@ -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

2
drivers/gpu/msm/adreno_a5xx.c
View file

@ -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);

2
drivers/gpu/msm/adreno_iommu.h
View file

@ -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);

2
drivers/gpu/msm/kgsl_mmu.c
View file

@ -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 },