drm/msm/a6xx: fix gmu start on newer firmware (f5749d61) · Commits · 戴 / test

New Qualcomm firmware has changed a way it reports back the 'started' event. Support new register values. Signed-off-by:

drivers/gpu/drm/msm/adreno/a6xx_gmu.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -200,6 +200,16 @@ static int a6xx_gmu_start(struct a6xx_gmu *gmu)
		{
		int ret;
		u32 val;
		u32 mask, reset_val;

		val = gmu_read(gmu, REG_A6XX_GMU_CM3_DTCM_START + 0xff8);
		if (val <= 0x20010004) {
		mask = 0xffffffff;
		reset_val = 0xbabeface;
		} else {
		mask = 0x1ff;
		reset_val = 0x100;
		}

		gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 1);

		@@ -211,7 +221,7 @@ static int a6xx_gmu_start(struct a6xx_gmu *gmu)
		gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 0);

		ret = gmu_poll_timeout(gmu, REG_A6XX_GMU_CM3_FW_INIT_RESULT, val,
		val == 0xbabeface, 100, 10000);
		(val & mask) == reset_val, 100, 10000);

		if (ret)
		DRM_DEV_ERROR(gmu->dev, "GMU firmware initialization timed out\n");