Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05dad218 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "msm: kgsl: Disable secure pagetable""

parents abc0e9e8 5210bda8

drivers/gpu/msm/adreno-gpulist.h

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static const struct adreno_gpu_core adreno_gpulist[] = { 
		.minor = 0,

		.patchid = 0,

		.features = ADRENO_64BIT | ADRENO_RPMH | ADRENO_GPMU |

			ADRENO_IOCOHERENT,

			ADRENO_IOCOHERENT | ADRENO_CONTENT_PROTECTION,

		.sqefw_name = "a650_sqe.fw",

		.zap_name = "a650_zap",

		.gpudev = &adreno_a6xx_gpudev,

drivers/gpu/msm/kgsl_iommu.c

+6 −9
Original line number Diff line number Diff line
@@ -1537,7 +1537,6 @@ static int _setstate_alloc(struct kgsl_device *device, 
static int kgsl_iommu_init(struct kgsl_mmu *mmu)

{

	struct kgsl_device *device = KGSL_MMU_DEVICE(mmu);

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct kgsl_iommu *iommu = _IOMMU_PRIV(mmu);

	struct kgsl_iommu_context *ctx = &iommu->ctx[KGSL_IOMMU_CONTEXT_USER];

	int status;
@@ -1595,7 +1594,6 @@ static int kgsl_iommu_init(struct kgsl_mmu *mmu) 
	if (!mmu->secured)

		goto done;



	if (!adreno_is_a650(adreno_dev)) {

	mmu->securepagetable = kgsl_mmu_getpagetable(mmu,

				KGSL_MMU_SECURE_PT);

	if (IS_ERR(mmu->securepagetable)) {
@@ -1604,7 +1602,6 @@ static int kgsl_iommu_init(struct kgsl_mmu *mmu) 
	} else if (mmu->securepagetable == NULL) {

		status = -ENOMEM;

	}

	}



done:

	if (status)