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

Commit b95afc42 authored by George Shen's avatar George Shen
Browse files

msm: kgsl: Recover GPU from adreno_stop failure 



In case GMU OOB request times out, if the GPU is till on,
adreno_stop function shall be fully executed to avoid
kernel panic later. The change gives chance to recover GPU
in case GMU malfunctions.

Change-Id: Ibe366e07b56dfd357f402b78913b7212c2e64c5b
Signed-off-by: default avatarGeorge Shen <sqiao@codeaurora.org>
parent 1f7554fb

drivers/gpu/msm/adreno.c

+12 −2
Original line number Diff line number Diff line
@@ -1871,10 +1871,20 @@ static int adreno_stop(struct kgsl_device *device) 
				OOB_GPU_CHECK_MASK,

				OOB_GPU_CLEAR_MASK);

		if (error) {

			struct gmu_device *gmu = &device->gmu;



			gpudev->oob_clear(adreno_dev, OOB_GPU_CLEAR_MASK);

			if (gmu->gx_gdsc &&

				regulator_is_enabled(gmu->gx_gdsc)) {

				/* GPU is on. Try recovery */

				set_bit(GMU_FAULT, &gmu->flags);

				gmu_snapshot(device);

				error = -EINVAL;

			} else {

				return error;

			}

		}

	}



	adreno_dispatcher_stop(adreno_dev);
@@ -1906,7 +1916,7 @@ static int adreno_stop(struct kgsl_device *device) 
	 * GMU to return to the lowest idle level. This is

	 * because some idle level transitions require VBIF and MMU.

	 */

	if (gpudev->wait_for_lowest_idle &&

	if (!error && gpudev->wait_for_lowest_idle &&

			gpudev->wait_for_lowest_idle(adreno_dev)) {

		struct gmu_device *gmu = &device->gmu;