Merge "msm: kgsl: Profile scm call on a640v1" (065fca18) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/msm/adreno.c

+16 −7

Original line number	Diff line number	Diff line
		@@ -1874,15 +1874,24 @@ static int _adreno_start(struct adreno_device *adreno_dev)
		if (regulator_left_on)
		_soft_reset(adreno_dev);

		if ((adreno_is_a640v1(adreno_dev)) &&
		scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) {

		if (adreno_is_a640v1(adreno_dev)) {
		unsigned long start = jiffies;

		if (scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) {
		ret = kgsl_program_smmu_aperture();
		/* Log it if it takes more than 2 seconds */
		if (((jiffies - start) / HZ) > 2)
		dev_err(device->dev, "scm call took too long to finish on a640v1: %lu seconds\n",
		((jiffies - start) / HZ));
		if (ret) {
		pr_err("SMMU aperture programming call failed with error %d\n",
		dev_err(device->dev, "SMMU aperture programming call failed with error %d\n",
		ret);
		goto error_pwr_off;
		}
		}
		}

		adreno_ringbuffer_set_global(adreno_dev, 0);

		status = kgsl_mmu_start(device);