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

Commit 604fc217 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: Use cold boot only for the GMU" into msm-4.14

parents 2b9e2695 2a093fc1
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1707,11 +1707,11 @@ int gmu_start(struct kgsl_device *device)
		gmu_irq_enable(device);

		ret = gpudev->rpmh_gpu_pwrctrl(adreno_dev, GMU_FW_START,
				GMU_WARM_BOOT, 0);
				GMU_COLD_BOOT, 0);
		if (ret)
			goto error_gmu;

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

@@ -1748,7 +1748,7 @@ int gmu_start(struct kgsl_device *device)
			if (ret)
				goto error_gmu;

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