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

Commit b2cdc0d7 authored by Puranam V G Tejaswi's avatar Puranam V G Tejaswi
Browse files

msm: kgsl: Don't deassert GBIF halt for non-GMU targets 



During adreno_stop, GBIF halt is asserted to halt any new transaction from
GPU before GPU power collapse, but in current code it is cleared
immediately which can allow few GPU transactions to go through before gdsc
is turned-off and can result in issues.

To avoid this situation don't deassert this halt before GPU gdsc goes off.
It will deassert automatically when gdsc goes off but in case gdsc doesn't
toggle as it is a shared resource, it is deasserted during adreno_start to
ensure wake-up doesn't fail.

Change-Id: If0a892470d04a0f3a79a1ea882ee5bfd16ad24ed
Signed-off-by: default avatarPuranam V G Tejaswi <pvgtejas@codeaurora.org>
parent ed12df75

drivers/gpu/msm/adreno_a6xx_gmu.c

+6 −4
Original line number Diff line number Diff line
@@ -1626,6 +1626,8 @@ static void a6xx_gmu_pwrctrl_suspend(struct adreno_device *adreno_dev) 
		}

		/* Halt CX traffic */

		a6xx_halt_gbif(adreno_dev);

		/* De-assert the halts */

		kgsl_regwrite(device, A6XX_GBIF_HALT, 0x0);

	}



	if (a6xx_gmu_gx_is_on(device))
@@ -2764,9 +2766,6 @@ int a6xx_halt_gbif(struct adreno_device *adreno_dev) 
	ret = adreno_wait_for_halt_ack(device,

		A6XX_GBIF_HALT_ACK, A6XX_GBIF_ARB_HALT_MASK);



	/* De-assert the halts */

	kgsl_regwrite(device, A6XX_GBIF_HALT, 0x0);



	return ret;

}
@@ -2797,8 +2796,11 @@ static int a6xx_gmu_power_off(struct adreno_device *adreno_dev) 
	a6xx_rdpm_mx_freq_update(gmu, 0);



	/* Now that we are done with GMU and GPU, Clear the GBIF */

	if (!adreno_is_a630(adreno_dev))

	if (!adreno_is_a630(adreno_dev)) {

		ret = a6xx_halt_gbif(adreno_dev);

		/* De-assert the halts */

		kgsl_regwrite(device, A6XX_GBIF_HALT, 0x0);

	}



	a6xx_gmu_irq_disable(adreno_dev);

drivers/gpu/msm/adreno_a6xx_hwsched.c

+2 −0
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ static int a6xx_hwsched_gmu_power_off(struct adreno_device *adreno_dev) 


	/* Now that we are done with GMU and GPU, Clear the GBIF */

	ret = a6xx_halt_gbif(adreno_dev);

	/* De-assert the halts */

	kgsl_regwrite(device, A6XX_GBIF_HALT, 0x0);



	a6xx_gmu_irq_disable(adreno_dev);