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

Commit fa0da970 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: Turn back on the SP/TP regulator after a soft reset"

parents 4855bd18 a316a2a6

drivers/gpu/msm/adreno.c

+5 −2
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int adreno_soft_reset(struct kgsl_device *device); 
 */

void _soft_reset(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = &adreno_dev->dev;

	unsigned int reg;



	adreno_writereg(adreno_dev, ADRENO_REG_RBBM_SW_RESET_CMD, 1);
@@ -366,6 +367,10 @@ void _soft_reset(struct adreno_device *adreno_dev) 
	 */

	adreno_readreg(adreno_dev, ADRENO_REG_RBBM_SW_RESET_CMD, &reg);

	adreno_writereg(adreno_dev, ADRENO_REG_RBBM_SW_RESET_CMD, 0);



	/* The SP/TP regulator gets turned off after a soft reset */

	if (device->ftbl->regulator_enable)

		device->ftbl->regulator_enable(device);

}
@@ -2220,8 +2225,6 @@ static int adreno_soft_reset(struct kgsl_device *device) 
	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	int ret;



	_soft_reset(adreno_dev);



	adreno_set_active_ctx_null(adreno_dev);



	if (kgsl_pwrctrl_isenabled(device))