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

Commit 61a55379 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: devfreq_target requests can happen during SLUMBER"

parents 797f4804 b6194941

drivers/gpu/msm/kgsl_pwrctrl.c

+4 −2
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ void kgsl_pwrctrl_buslevel_update(struct kgsl_device *device, 
	int buslevel = 0;

	if (!pwr->pcl)

		return;

	/* the bus should be ON to update the active frequency */

	if (on && !(test_bit(KGSL_PWRFLAGS_AXI_ON, &pwr->power_flags)))

		return;

	/*

	 * If the bus should remain on calculate our request and submit it,

	 * otherwise request bus level 0, off.
@@ -173,7 +176,6 @@ void kgsl_pwrctrl_pwrlevel_change(struct kgsl_device *device, 
	pwr->bus_mod = 0;

	pwrlevel = &pwr->pwrlevels[pwr->active_pwrlevel];



	if (test_bit(KGSL_PWRFLAGS_AXI_ON, &pwr->power_flags))

	kgsl_pwrctrl_buslevel_update(device, true);



	if (test_bit(KGSL_PWRFLAGS_CLK_ON, &pwr->power_flags) ||