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

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

Merge "msm: kgsl: Correct the iommu protection ranges"

parents 6dc3ffd5 607a42d9

drivers/gpu/msm/adreno_a3xx.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -1332,7 +1332,7 @@ static void a3xx_protect_init(struct adreno_device *adreno_dev) 
	iommu_regs = kgsl_mmu_get_prot_regs(&device->mmu);

	if (iommu_regs)

		adreno_set_protected_registers(adreno_dev, &index,

				iommu_regs->base, iommu_regs->range);

				iommu_regs->base, ilog2(iommu_regs->range));

}



static void a3xx_start(struct adreno_device *adreno_dev)

drivers/gpu/msm/adreno_a4xx.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-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
@@ -524,7 +524,7 @@ static void a4xx_protect_init(struct adreno_device *adreno_dev) 
	iommu_regs = kgsl_mmu_get_prot_regs(&device->mmu);

	if (iommu_regs)

		adreno_set_protected_registers(adreno_dev, &index,

				iommu_regs->base, iommu_regs->range);

				iommu_regs->base, ilog2(iommu_regs->range));

}



static struct adreno_snapshot_sizes a4xx_snap_sizes = {

drivers/gpu/msm/adreno_a5xx.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static void a5xx_protect_init(struct adreno_device *adreno_dev) 
	iommu_regs = kgsl_mmu_get_prot_regs(&device->mmu);

	if (iommu_regs)

		adreno_set_protected_registers(adreno_dev, &index,

				iommu_regs->base, iommu_regs->range);

				iommu_regs->base, ilog2(iommu_regs->range));

}



/*

drivers/gpu/msm/adreno_a6xx.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static void a6xx_protect_init(struct adreno_device *adreno_dev) 


	if (mmu_prot) {

		mmu_base = mmu_prot->base;

		mmu_range = 1 << mmu_prot->range;

		mmu_range = mmu_prot->range;

		req_sets += DIV_ROUND_UP(mmu_range, 0x2000);

	}

drivers/gpu/msm/kgsl_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -2630,7 +2630,7 @@ static int _kgsl_iommu_probe(struct kgsl_device *device, 
		return -EINVAL;

	}

	iommu->protect.base = reg_val[0] / sizeof(u32);

	iommu->protect.range = ilog2(reg_val[1] / sizeof(u32));

	iommu->protect.range = reg_val[1] / sizeof(u32);



	of_property_for_each_string(node, "clock-names", prop, cname) {

		struct clk *c = devm_clk_get(&pdev->dev, cname);