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

Commit 8248a33d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Don't disable isense during recovery"

parents 5c9d486a d741de84

drivers/gpu/msm/adreno_a6xx_gmu.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -1156,31 +1156,11 @@ static int a6xx_gmu_load_firmware(struct kgsl_device *device) 




#define A6XX_VBIF_XIN_HALT_CTRL1_ACKS   (BIT(0) | BIT(1) | BIT(2) | BIT(3))

#define A6XX_VBIF_XIN_HALT_CTRL1_ACKS   (BIT(0) | BIT(1) | BIT(2) | BIT(3))





static void a6xx_isense_disable(struct kgsl_device *device)

{

	unsigned int val;

	const struct adreno_device *adreno_dev = ADRENO_DEVICE(device);



	if (!ADRENO_FEATURE(adreno_dev, ADRENO_LM) ||

		!test_bit(ADRENO_LM_CTRL, &adreno_dev->pwrctrl_flag))

		return;



	gmu_core_regread(device, A6XX_GPU_CS_ENABLE_REG, &val);

	if (val) {

		gmu_core_regwrite(device, A6XX_GPU_CS_ENABLE_REG, 0);

		gmu_core_regwrite(device, A6XX_GMU_ISENSE_CTRL, 0);

	}

}



static int a6xx_gmu_suspend(struct kgsl_device *device)

static int a6xx_gmu_suspend(struct kgsl_device *device)

{

{

	int ret = 0;

	int ret = 0;

	struct gmu_device *gmu = KGSL_GMU_DEVICE(device);

	struct gmu_device *gmu = KGSL_GMU_DEVICE(device);





	/* do it only if LM feature is enabled */

	/* Disable ISENSE if it's on */

	a6xx_isense_disable(device);



	/* If SPTP_RAC is on, turn off SPTP_RAC HS */

	/* If SPTP_RAC is on, turn off SPTP_RAC HS */

	a6xx_gmu_sptprac_disable(ADRENO_DEVICE(device));

	a6xx_gmu_sptprac_disable(ADRENO_DEVICE(device));