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

Commit 7c44f251 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: Update idle checks to match GMU FW 0.6" into msm-4.9

parents 38cefce1 c96ad959

drivers/gpu/msm/adreno_a6xx.c

+2 −4
Original line number Diff line number Diff line
@@ -1237,7 +1237,8 @@ static int a6xx_notify_slumber(struct kgsl_device *device) 
			A6XX_GPU_GMU_CX_GMU_RPMH_POWER_STATE, &state);

		if (state != GPU_HW_SLUMBER) {

			dev_err(&gmu->pdev->dev,

					"Failed to prepare for slumber\n");

					"Failed to prepare for slumber: 0x%x\n",

					state);

			ret = -EINVAL;

		}

	}
@@ -1513,9 +1514,6 @@ static int a6xx_wait_for_gmu_idle(struct adreno_device *adreno_dev) 
	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct gmu_device *gmu = &device->gmu;



	/* TODO: Remove this register write when firmware is updated */

	kgsl_gmu_regwrite(device, A6XX_GMU_CM3_FW_BUSY, 0);



	if (timed_poll_check(device, A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS,

			0, GMU_START_TIMEOUT, CXGXCPUBUSYIGNAHB)) {

		dev_err(&gmu->pdev->dev, "GMU is not idling\n");

drivers/gpu/msm/kgsl_gmu.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ enum gpu_idle_level { 
	GPU_HW_NAP = 0x4,

	GPU_HW_MIN_VOLT = 0x5,

	GPU_HW_MIN_DDR = 0x6,

	GPU_HW_SLUMBER = 0x7

	GPU_HW_SLUMBER = 0xF

};



/**