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

Commit 411145ab authored by Oleg Perelet's avatar Oleg Perelet Committed by Jordan Crouse
Browse files

msm: kgsl: Enable GPMU firmware interrupts 



Enable GPMU firmware interrupts, reset GPMU on
watch dog timer interrupt.

Change-Id: Id009fbc235716ad29569e5b3c968de6b7f054ba9
Signed-off-by: default avatarOleg Perelet <operelet@codeaurora.org>
parent 040e1fa5

drivers/gpu/msm/adreno_a5xx.c

+18 −4
Original line number Diff line number Diff line
@@ -954,10 +954,23 @@ static int a5xx_gpmu_start(struct adreno_device *adreno_dev) 
	if (reg != 0xBABEFACE) {

		KGSL_CORE_ERR("GPMU firmware initialization timed out\n");

		ret = -ETIMEDOUT;

	}

	else

	} else {

		set_bit(ADRENO_DEVICE_GPMU_INITIALIZED, &adreno_dev->priv);



		/*

		 *  We are in AWARE state and IRQ line from GPU to host is

		 *  disabled.

		 *  Read pending GPMU interrupts and clear GPMU_RBBM_INTR_INFO.

		 */

		kgsl_regread(device, A5XX_GPMU_RBBM_INTR_INFO, &reg);

		/*

		 * Clear RBBM interrupt mask if any of GPMU interrupts

		 * are pending.

		 */

		if (reg)

			kgsl_regwrite(device,

				A5XX_RBBM_INT_CLEAR_CMD,

				1 << A5XX_INT_GPMU_FIRMWARE);

	}

	return ret;

}
@@ -2786,7 +2799,7 @@ static void a5xx_gpmu_int_callback(struct adreno_device *adreno_dev, int bit) 
			KGSL_DRV_CRIT_RATELIMIT(device,

						"GPMU: Watchdog bite\n");

		}

	} else

	} else if (!(reg & BIT(1)))

		KGSL_DRV_CRIT_RATELIMIT(device,

					"GPMU: Unknown interrupt 0x%08X\n",

					reg);
@@ -2809,6 +2822,7 @@ static void a5xx_gpmu_int_callback(struct adreno_device *adreno_dev, int bit) 
	 (1 << A5XX_INT_UCHE_OOB_ACCESS) |		\

	 (1 << A5XX_INT_UCHE_TRAP_INTR) |		\

	 (1 << A5XX_INT_CP_SW) |			\

	 (1 << A5XX_INT_GPMU_FIRMWARE) |                \

	 (1 << A5XX_INT_GPMU_VOLTAGE_DROOP))