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

Commit 7bfdac89 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "msm: kgsl: Force KGSL Per Process Page Table to be False for A310""

parents d9ebd4ba 7b14decb

drivers/gpu/msm/adreno.c

+3 −3
Original line number Diff line number Diff line
@@ -1681,9 +1681,6 @@ adreno_probe(struct platform_device *pdev) 
	if (status != 0)

		goto error;



	/* Identify the specific GPU */

	adreno_identify_gpu(adreno_dev);



	status = kgsl_device_platform_probe(device);

	if (status)

		goto error_close_rb;
@@ -1756,6 +1753,9 @@ static int adreno_init(struct kgsl_device *device) 
	/* Power up the device */

	kgsl_pwrctrl_enable(device);



	/* Identify the specific GPU */

	adreno_identify_gpu(adreno_dev);



	if (adreno_ringbuffer_read_pm4_ucode(device)) {

		KGSL_DRV_ERR(device, "Reading pm4 microcode failed %s\n",

			adreno_dev->pm4_fwfile);

drivers/gpu/msm/kgsl_iommu.c

+0 −6
Original line number Diff line number Diff line
@@ -1360,8 +1360,6 @@ static int kgsl_iommu_init(struct kgsl_mmu *mmu) 
	 */

	int status = 0;

	struct kgsl_iommu *iommu;

	struct kgsl_device *device = mmu->device;

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);



	atomic_set(&mmu->fault, 0);

	iommu = kzalloc(sizeof(struct kgsl_iommu), GFP_KERNEL);
@@ -1388,10 +1386,6 @@ static int kgsl_iommu_init(struct kgsl_mmu *mmu) 
				(msm_soc_version_supports_iommu_v0() ||

				 iommu->iommu_units[0].iommu_halt_enable);



	/* KGSL Per Process Page Table is broken for A310*/

	if (adreno_is_a310(adreno_dev))

		mmu->pt_per_process = 0;



	/*

	 * For IOMMU per-process pagetables, the allocatable range

	 * and the kernel global range must both be outside