Merge "msm: kgsl: Use adreno_read_gmureg to read GMU registers" into msm-4.9 (641a68b3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_ringbuffer.c

+15 −4

Original line number	Original line	Diff line number	Diff line
	@@ -54,10 +54,21 @@ static void adreno_get_submit_time(struct adreno_device *adreno_dev,

	/* Read always on registers */		/* Read always on registers */
	if (!adreno_is_a3xx(adreno_dev)) {		if (!adreno_is_a3xx(adreno_dev)) {
			if (kgsl_gmu_isenabled(KGSL_DEVICE(adreno_dev))) {
			uint32_t val_lo, val_hi;

			adreno_read_gmureg(adreno_dev,
			ADRENO_REG_RBBM_ALWAYSON_COUNTER_LO, &val_lo);
			adreno_read_gmureg(adreno_dev,
			ADRENO_REG_RBBM_ALWAYSON_COUNTER_HI, &val_hi);

			time->ticks = (val_lo \| ((uint64_t)val_hi << 32));
			} else {
	adreno_readreg64(adreno_dev,		adreno_readreg64(adreno_dev,
	ADRENO_REG_RBBM_ALWAYSON_COUNTER_LO,		ADRENO_REG_RBBM_ALWAYSON_COUNTER_LO,
	ADRENO_REG_RBBM_ALWAYSON_COUNTER_HI,		ADRENO_REG_RBBM_ALWAYSON_COUNTER_HI,
	&time->ticks);		&time->ticks);
			}

	/* Mask hi bits as they may be incorrect on some targets */		/* Mask hi bits as they may be incorrect on some targets */
	if (ADRENO_GPUREV(adreno_dev) >= 400 &&		if (ADRENO_GPUREV(adreno_dev) >= 400 &&