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

Commit 0c54cc67 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: Directly enable the regulator after a soft reset"

parents 9bfd3339 0bdded6f

drivers/gpu/msm/adreno.c

+4 −3
Original line number Diff line number Diff line
@@ -361,7 +361,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;

	struct adreno_gpudev *gpudev  = ADRENO_GPU_DEVICE(adreno_dev);

	unsigned int reg;



	adreno_writereg(adreno_dev, ADRENO_REG_RBBM_SW_RESET_CMD, 1);
@@ -373,8 +373,9 @@ void _soft_reset(struct adreno_device *adreno_dev) 
	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);



	if (gpudev->regulator_enable)

		gpudev->regulator_enable(adreno_dev);

}