Merge "msm: kgsl: Make sure the bus is on to consider power enabled" (6e7e32a7) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/gpu/msm/kgsl_pwrctrl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1324,7 +1324,8 @@ void kgsl_timer(unsigned long data)
		bool kgsl_pwrctrl_isenabled(struct kgsl_device *device)
		{
		struct kgsl_pwrctrl *pwr = &device->pwrctrl;
		return (test_bit(KGSL_PWRFLAGS_CLK_ON, &pwr->power_flags) != 0);
		return ((test_bit(KGSL_PWRFLAGS_CLK_ON, &pwr->power_flags) != 0) &&
		(test_bit(KGSL_PWRFLAGS_AXI_ON, &pwr->power_flags) != 0));
		}

		/**