Merge "msm: kgsl: Program SMMU aperture only if tz support" (522f6889) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl_iommu.c

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -35,6 +35,7 @@
		#include "kgsl_pwrctrl.h"

		#define CP_APERTURE_REG 0
		#define CP_SMMU_APERTURE_ID 0x1B

		#define _IOMMU_PRIV(_mmu) (&((_mmu)->priv.iommu))

		@@ -1166,7 +1167,7 @@ static int program_smmu_aperture(unsigned int cb, unsigned int aperture_reg)
		desc.args[3] = 0xFFFFFFFF;
		desc.arginfo = SCM_ARGS(4);

		return scm_call2(SCM_SIP_FNID(SCM_SVC_MP, 0x1B), &desc);
		return scm_call2(SCM_SIP_FNID(SCM_SVC_MP, CP_SMMU_APERTURE_ID), &desc);
		}

		static int _init_global_pt(struct kgsl_mmu mmu, struct kgsl_pagetable pt)
		@@ -1209,7 +1210,8 @@ static int _init_global_pt(struct kgsl_mmu mmu, struct kgsl_pagetable pt)
		goto done;
		}

		if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE)) {
		if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) &&
		scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) {
		ret = program_smmu_aperture(cb_num, CP_APERTURE_REG);
		if (ret) {
		pr_err("SMMU aperture programming call failed with error %d\n",