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

Commit 38bf1f01 authored by Kyle Piefer's avatar Kyle Piefer Committed by Gerrit - the friendly Code Review server
Browse files

msm: kgsl: Treat GMU stop failures as errors 



If certain steps fail when stopping the GMU, it
means that the GMU is in a bad state. Instead of
forcing it to slumber anyway, abort and do a GMU
snapshot.

CRs-Fixed: 2120475
Change-Id: Ifae7e911750ac9082c0499c7fc199cb75258424b
Signed-off-by: default avatarKyle Piefer <kpiefer@codeaurora.org>
parent 42127c5f

drivers/gpu/msm/kgsl_gmu.c

+28 −29
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ void gmu_stop(struct kgsl_device *device) 
	struct gmu_device *gmu = &device->gmu;

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	bool idle = true;

	int ret = 0;



	if (!test_bit(GMU_CLK_ON, &gmu->flags))

		return;
@@ -1475,19 +1475,16 @@ void gmu_stop(struct kgsl_device *device) 
	/* Wait for the lowest idle level we requested */

	if (gpudev->wait_for_lowest_idle &&

			gpudev->wait_for_lowest_idle(adreno_dev))

		idle = false;

		goto error;



	gpudev->rpmh_gpu_pwrctrl(adreno_dev, GMU_NOTIFY_SLUMBER, 0, 0);

	if (!idle || (gpudev->wait_for_gmu_idle &&

			gpudev->wait_for_gmu_idle(adreno_dev))) {

		dev_err(&gmu->pdev->dev, "Stopping GMU before it is idle\n");

		idle = false;

		set_bit(GMU_FAULT, &gmu->flags);

	} else {

		idle = true;

	}

	ret = gpudev->rpmh_gpu_pwrctrl(adreno_dev, GMU_NOTIFY_SLUMBER, 0, 0);

	if (ret)

		goto error;



	if (gpudev->wait_for_gmu_idle &&

			gpudev->wait_for_gmu_idle(adreno_dev))

		goto error;



	if (idle) {

	/* Pending message in all queues are abandoned */

	hfi_stop(gmu);

	clear_bit(GMU_HFI_ON, &gmu->flags);
@@ -1496,19 +1493,21 @@ void gmu_stop(struct kgsl_device *device) 
	gpudev->rpmh_gpu_pwrctrl(adreno_dev, GMU_FW_STOP, 0, 0);

	gmu_disable_clks(gmu);

	gmu_disable_gdsc(gmu);

	} else {



	msm_bus_scale_client_update_request(gmu->pcl, 0);

	return;



error:

	/*

	 * The power controller will change state to SLUMBER anyway

	 * Set GMU_FAULT flag to indicate to power contrller

	 * that hang recovery is needed to power on GPU

	 */

	set_bit(GMU_FAULT, &gmu->flags);

	dev_err(&gmu->pdev->dev, "Failed to stop GMU\n");

	gmu_snapshot(device);

}



	msm_bus_scale_client_update_request(gmu->pcl, 0);

}



void gmu_remove(struct kgsl_device *device)

{

	struct gmu_device *gmu = &device->gmu;