Merge "msm: kgsl: Place GMU in reset before entering slumber" (8d28f47e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/msm/adreno_a6xx_gmu.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -421,6 +421,10 @@ static int a6xx_rpmh_power_off_gpu(struct kgsl_device *device)
		if (test_bit(GMU_RSCC_SLEEP_SEQ_DONE, &device->gmu_core.flags))
		return 0;

		gmu_core_regwrite(device, A6XX_GMU_CM3_SYSRESET, 1);
		/* Make sure M3 is in reset before going on */
		wmb();

		/* RSC sleep sequence is different on v1 */
		if (adreno_is_a630v1(adreno_dev))
		gmu_core_regwrite(device, A6XX_RSCC_TIMESTAMP_UNIT1_EN_DRV0, 1);
		@@ -922,10 +926,6 @@ static int a6xx_gmu_fw_start(struct kgsl_device *device,
		int ret;
		unsigned int chipid = 0;

		gmu_core_regwrite(device, A6XX_GMU_CM3_SYSRESET, 1);
		/* Make sure M3 is in reset before going on */
		wmb();

		switch (boot_state) {
		case GMU_COLD_BOOT:
		/* Turn on TCM retention */