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

Commit 1affb278 authored by Harshdeep Dhatt's avatar Harshdeep Dhatt
Browse files

msm: kgsl: Move APRIV config to a6xx start 



We need APRIV enabled for eCP as well. But eCP doesn't
call into a6xx_rb_start. Move it to a more generic function
which is called by eCP as well.

Change-Id: I3014bee48145ab5b7c54f01854fe520d9a6db0a6
Signed-off-by: default avatarHarshdeep Dhatt <hdhatt@codeaurora.org>
parent e1391978

drivers/gpu/msm/adreno_a6xx.c

+17 −17
Original line number Diff line number Diff line
@@ -324,6 +324,20 @@ static void a6xx_llc_configure_gpu_scid(struct adreno_device *adreno_dev); 
static void a6xx_llc_configure_gpuhtw_scid(struct adreno_device *adreno_dev);

static void a6xx_llc_enable_overrides(struct adreno_device *adreno_dev);



/*

 * Some targets support marking certain transactions as always privileged which

 * allows us to mark more memory as privileged without having to explicitly set

 * the APRIV bit.  For those targets, choose the following transactions to be

 * privileged by default:

 * CDWRITE     [6:6] - Crashdumper writes

 * CDREAD      [5:5] - Crashdumper reads

 * RBRPWB      [3:3] - RPTR shadow writes

 * RBPRIVLEVEL [2:2] - Memory accesses from PM4 packets in the ringbuffer

 * RBFETCH     [1:1] - Ringbuffer reads

 */

#define A6XX_APRIV_DEFAULT \

	((1 << 6) | (1 << 5) | (1 << 3) | (1 << 2) | (1 << 1))



/*

 * a6xx_start() - Device start

 * @adreno_dev: Pointer to adreno device
@@ -559,6 +573,9 @@ static void a6xx_start(struct adreno_device *adreno_dev) 


	if (adreno_is_a660v1(adreno_dev))

		kgsl_regwrite(device, A6XX_RBBM_GBIF_CLIENT_QOS_CNTL, 0x0);



	if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))

		kgsl_regwrite(device, A6XX_CP_APRIV_CNTL, A6XX_APRIV_DEFAULT);

}



/*
@@ -767,20 +784,6 @@ static int a6xx_post_start(struct adreno_device *adreno_dev) 
	return ret;

}



/*

 * Some targets support marking certain transactions as always privileged which

 * allows us to mark more memory as privileged without having to explicitly set

 * the APRIV bit.  For those targets, choose the following transactions to be

 * privileged by default:

 * CDWRITE     [6:6] - Crashdumper writes

 * CDREAD      [5:5] - Crashdumper reads

 * RBRPWB      [3:3] - RPTR shadow writes

 * RBPRIVLEVEL [2:2] - Memory accesses from PM4 packets in the ringbuffer

 * RBFETCH     [1:1] - Ringbuffer reads

 */

#define A6XX_APRIV_DEFAULT \

	((1 << 6) | (1 << 5) | (1 << 3) | (1 << 2) | (1 << 1))



/*

 * a6xx_rb_start() - Start the ringbuffer

 * @adreno_dev: Pointer to adreno device
@@ -813,9 +816,6 @@ static int a6xx_rb_start(struct adreno_device *adreno_dev) 
	if (ret)

		return ret;



	if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))

		kgsl_regwrite(device, A6XX_CP_APRIV_CNTL, A6XX_APRIV_DEFAULT);



	/* Clear the SQE_HALT to start the CP engine */

	kgsl_regwrite(device, A6XX_CP_SQE_CNTL, 1);