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

Commit 9f945502 authored by Tarun Karra's avatar Tarun Karra
Browse files

msm: kgsl: Refactor the A6XX protection ranges 



Simplify the code that initializes the A6XX protection ranges
and fix a compile error.

Change-Id: I2f574ff21a5629e94c062b7cbf5ec338f28d7691
Signed-off-by: default avatarLynus Vaz <lvaz@codeaurora.org>
Signed-off-by: default avatarTarun Karra <tkarra@codeaurora.org>
parent 107d2896

drivers/gpu/msm/adreno_a6xx.c

+22 −24
Original line number Diff line number Diff line
@@ -116,34 +116,29 @@ static void a6xx_init(struct adreno_device *adreno_dev) 
static void a6xx_protect_init(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct kgsl_protected_registers *mmu_prot = NULL;

	int i;

	int num_sets;

	int num_sets_array;

	unsigned int mmu_base;

	unsigned int mmu_range;

	struct kgsl_protected_registers *mmu_prot =

		kgsl_mmu_get_prot_regs(&device->mmu);

	int i, num_sets;

	int req_sets = ARRAY_SIZE(a6xx_protected_regs_group);

	int max_sets = adreno_dev->gpucore->num_protected_regs;

	unsigned int mmu_base = 0, mmu_range = 0, cur_range;



	/* enable access protection to privileged registers */

	kgsl_regwrite(device, A6XX_CP_PROTECT_CNTL, 0x00000007);



	num_sets = ARRAY_SIZE(a6xx_protected_regs_group);



	mmu_prot = kgsl_mmu_get_prot_regs(&device->mmu);



	if (mmu_prot) {

		mmu_base = mmu_prot->base;

		mmu_range = 1 << mmu_prot->range;

		num_sets += DIV_ROUND_UP(mmu_range, 0x2000);

		req_sets += DIV_ROUND_UP(mmu_range, 0x2000);

	}



	if (num_sets > adreno_dev->gpucore->num_protected_regs) {

	if (req_sets > max_sets)

		WARN(1, "Size exceeds the num of protection regs available\n");

		num_sets = adreno_dev->gpucore->num_protected_regs;

	}



	num_sets_array = min_t(unsigned int,

		ARRAY_SIZE(a6xx_protected_regs_group), num_sets);

	for (i = 0; i < num_sets_array; i++) {

	/* Protect GPU registers */

	num_sets = min_t(unsigned int,

		ARRAY_SIZE(a6xx_protected_regs_group), max_sets);

	for (i = 0; i < num_sets; i++) {

		struct a6xx_protected_regs *regs =

					&a6xx_protected_regs_group[i];
@@ -152,15 +147,18 @@ static void a6xx_protect_init(struct adreno_device *adreno_dev) 
				(regs->read_protect << 31));

	}



	for (; i < num_sets; i++) {

		unsigned int cur_range = min_t(unsigned int, mmu_range,

	/* Protect MMU registers */

	if (mmu_prot) {

		while ((i < max_sets) && (mmu_range > 0)) {

			cur_range = min_t(unsigned int, mmu_range,

						0x2000);



			kgsl_regwrite(device, A6XX_CP_PROTECT_REG + i,

				mmu_base | ((cur_range - 1) << 18) | (1 << 31));



			mmu_base += cur_range;

			mmu_range -= cur_range;

			i++;

		}

	}

}