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

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

msm: kgsl: Avoid sending 0 BW and GPU freq to GMU 



Resetting GPU frequency or BW has to use PDC sleep
sequence. GMU cannot handle zero BW and GPU frequency
request. Dump GMU snapshot to help debug GMU DCVS failure.

CRs-Fixed: 2062271
Change-Id: Ibf6f4cfdfc406b4990b34cc7469c722bfc0f4879
Signed-off-by: default avatarGeorge Shen <sqiao@codeaurora.org>
parent 089d1cb5

drivers/gpu/msm/kgsl_gmu.c

+18 −9
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ struct gmu_vma { 
	unsigned int image_start;

};



static void gmu_snapshot(struct kgsl_device *device);



struct gmu_iommu_context {

	const char *name;

	struct device *dev;
@@ -436,27 +438,34 @@ int gmu_dcvs_set(struct gmu_device *gmu, 
	struct kgsl_device *device = container_of(gmu, struct kgsl_device, gmu);

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	struct kgsl_pwrctrl *pwr = &device->pwrctrl;

	int perf_idx = INVALID_DCVS_IDX, bw_idx = INVALID_DCVS_IDX;

	int ret;



	if (gpu_pwrlevel < gmu->num_gpupwrlevels)

	if (gpu_pwrlevel < gmu->num_gpupwrlevels - 1)

		perf_idx = gmu->num_gpupwrlevels - gpu_pwrlevel - 1;



	if (bus_level < gmu->num_bwlevels)

	if (bus_level < gmu->num_bwlevels && bus_level > 0)

		bw_idx = bus_level;



	if ((perf_idx == INVALID_DCVS_IDX) &&

		(bw_idx == INVALID_DCVS_IDX))

		return -EINVAL;



	if (bw_idx == INVALID_DCVS_IDX)

		/* Use default BW, algorithm changes on V2 */

		bw_idx = pwr->pwrlevels[gpu_pwrlevel].bus_freq;



	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_HFI_USE_REG))

		return gpudev->rpmh_gpu_pwrctrl(adreno_dev,

	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_HFI_USE_REG)) {

		ret = gpudev->rpmh_gpu_pwrctrl(adreno_dev,

			GMU_DCVS_NOHFI, perf_idx, bw_idx);



		if (ret) {

			dev_err(&gmu->pdev->dev,

				"Failed to set GPU perf idx %d, bw idx %d\n",

				perf_idx, bw_idx);



			gmu_snapshot(device);

		}



		return ret;

	}



	return hfi_send_dcvs_vote(gmu, perf_idx, bw_idx, ACK_NONBLOCK);

}

drivers/gpu/msm/kgsl_pwrctrl.c

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ static int kgsl_bus_scale_request(struct kgsl_device *device, 


	/* GMU scales BW */

	if (kgsl_gmu_isenabled(device)) {

		if (!(gmu->flags & GMU_HFI_ON))

		if (!(gmu->flags & GMU_HFI_ON) || !buslevel)

			/* Zero bus level is invalid for GMU to vote */

			return 0;



		ret = gmu_dcvs_set(gmu, INVALID_DCVS_IDX, buslevel);