Merge "msm: kgsl: Add a check for valid frequency of RBBM timer clock" (70c87fc4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl_pwrctrl.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -2222,7 +2222,7 @@ static void kgsl_pwrctrl_disable_unused_opp(struct kgsl_device *device)

		int kgsl_pwrctrl_init(struct kgsl_device *device)
		{
		int i, k, m, n = 0, result;
		int i, k, m, n = 0, result, freq;
		struct platform_device *pdev = device->pdev;
		struct kgsl_pwrctrl *pwr = &device->pwrctrl;
		struct device_node *ocmem_bus_node;
		@@ -2269,7 +2269,7 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
		pwr->wakeup_maxpwrlevel = 0;

		for (i = 0; i < pwr->num_pwrlevels; i++) {
		unsigned int freq = pwr->pwrlevels[i].gpu_freq;
		freq = pwr->pwrlevels[i].gpu_freq;

		if (freq > 0)
		freq = clk_round_rate(pwr->grp_clks[0], freq);
		@@ -2282,11 +2282,10 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)

		kgsl_clk_set_rate(device, pwr->num_pwrlevels - 1);

		if (pwr->grp_clks[6] != NULL)
		freq = clk_round_rate(pwr->grp_clks[6], KGSL_RBBMTIMER_CLK_FREQ);
		if (freq > 0)
		kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[6],
		clk_round_rate(pwr->grp_clks[6],
		KGSL_RBBMTIMER_CLK_FREQ),
		clocks[6]);
		freq, clocks[6]);

		_isense_clk_set_rate(pwr, pwr->num_pwrlevels - 1);