Merge "msm: kgsl: Use GMU cold boot sequence for hard reset" (6b5e3b11) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_a6xx.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -1416,6 +1416,8 @@ static int a6xx_gmu_fw_start(struct kgsl_device *device,
		int ret, i;

		switch (boot_state) {
		case GMU_RESET:
		/* fall through */
		case GMU_COLD_BOOT:
		/* Turn on the HM and SPTP head switches */
		ret = a6xx_hm_sptprac_enable(device);
		@@ -1431,6 +1433,10 @@ static int a6xx_gmu_fw_start(struct kgsl_device *device,
		ret = a6xx_hm_sptprac_enable(device);
		if (ret)
		return ret;
		} else if (boot_state == GMU_RESET) {
		ret = a6xx_hm_sptprac_enable(device);
		if (ret)
		return ret;
		} else {
		ret = a6xx_rpmh_power_on_gpu(device);
		if (ret)
		@@ -1458,11 +1464,6 @@ static int a6xx_gmu_fw_start(struct kgsl_device *device,
		if (ret)
		return ret;
		break;
		case GMU_RESET:
		/* Turn on the HM and SPTP head switches */
		ret = a6xx_hm_sptprac_enable(device);
		if (ret)
		return ret;
		default:
		break;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1418,7 +1418,7 @@ int gmu_start(struct kgsl_device *device)

		gmu_irq_enable(device);

		ret = hfi_start(gmu, GMU_WARM_BOOT);
		ret = hfi_start(gmu, GMU_COLD_BOOT);
		if (ret)
		goto error_gpu;