Merge "msm: kgsl: Set the GX rail voltage before enabling it" (d162d29b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/kgsl_pwrctrl.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -146,10 +146,7 @@ void kgsl_pwrctrl_pwrlevel_change(struct kgsl_device *device,

		kgsl_pwrctrl_buslevel_update(device, true);

		if (test_bit(KGSL_PWRFLAGS_CLK_ON, &pwr->power_flags) \|\|
		(device->state == KGSL_STATE_NAP))
		clk_set_rate(pwr->grp_clks[0],
		pwr->pwrlevels[new_level].gpu_freq);
		clk_set_rate(pwr->grp_clks[0], pwr->pwrlevels[new_level].gpu_freq);


		trace_kgsl_pwrlevel(device, pwr->active_pwrlevel, pwrlevel->gpu_freq);
		@@ -1410,8 +1407,6 @@ void kgsl_pwrctrl_enable(struct kgsl_device *device)
		{
		struct kgsl_pwrctrl *pwr = &device->pwrctrl;
		int level;
		/* Order pwrrail/clk sequence based upon platform */
		kgsl_pwrctrl_pwrrail(device, KGSL_PWRFLAGS_ON);

		if (pwr->wakeup_maxpwrlevel) {
		level = pwr->max_pwrlevel;
		@@ -1422,6 +1417,8 @@ void kgsl_pwrctrl_enable(struct kgsl_device *device)
		if (pwr->constraint.type == KGSL_CONSTRAINT_NONE)
		kgsl_pwrctrl_pwrlevel_change(device, level);

		/* Order pwrrail/clk sequence based upon platform */
		kgsl_pwrctrl_pwrrail(device, KGSL_PWRFLAGS_ON);
		kgsl_pwrctrl_clk(device, KGSL_PWRFLAGS_ON, KGSL_STATE_ACTIVE);
		kgsl_pwrctrl_axi(device, KGSL_PWRFLAGS_ON);
		}