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

Commit 6fc83f7d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ief87e6c7,I874da734 into msm-4.14 

* changes:
  msm: kgsl: Sync up gmu idle timeout XO clock
  msm: kgsl: Enable preemption for A615 gpu
parents 689f0672 598a08f5

drivers/gpu/msm/adreno-gpulist.h

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static const struct adreno_gpu_core adreno_gpulist[] = { 
		.major = 1,

		.minor = 5,

		.patchid = ANY_ID,

		.features = ADRENO_64BIT | ADRENO_RPMH |

		.features = ADRENO_64BIT | ADRENO_RPMH | ADRENO_PREEMPTION |

			ADRENO_GPMU | ADRENO_CONTENT_PROTECTION | ADRENO_IFPC,

		.sqefw_name = "a630_sqe.fw",

		.zap_name = "a615_zap",

drivers/gpu/msm/adreno_a6xx.c

+5 −5
Original line number Diff line number Diff line
@@ -2154,17 +2154,17 @@ 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;

	unsigned int status, status2;

	unsigned int status2;

	uint64_t ts1;



	ts1 = read_AO_counter(device);

	if (timed_poll_check(device, A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS,

			0, GMU_START_TIMEOUT, CXGXCPUBUSYIGNAHB)) {

		kgsl_gmu_regread(device,

				A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS, &status);

		kgsl_gmu_regread(device,

				A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS2, &status2);

		dev_err(&gmu->pdev->dev,

				"GMU not idling: status=0x%x, status2=0x%x\n",

				status, status2);

				"GMU not idling: status2=0x%x %llx %llx\n",

				status2, ts1, read_AO_counter(device));

		return -ETIMEDOUT;

	}