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

Commit d865f3c5 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/clk/gk20a: reorganize variables in gk20a_pllg_calc_mnp() 



Move some variables declarations to the scope where they are actually
used to make the code easier to follow.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent af6313d6

drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -153,11 +153,9 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate) 
	u32 target_clk_f, ref_clk_f, target_freq;

	u32 target_clk_f, ref_clk_f, target_freq;

	u32 min_vco_f, max_vco_f;

	u32 min_vco_f, max_vco_f;

	u32 low_pl, high_pl, best_pl;

	u32 low_pl, high_pl, best_pl;

	u32 target_vco_f, vco_f;

	u32 target_vco_f;

	u32 best_m, best_n;

	u32 best_m, best_n;

	u32 u_f;

	u32 best_delta = ~0;

	u32 m, n, n2;

	u32 delta, lwv, best_delta = ~0;

	u32 pl;

	u32 pl;





	target_clk_f = rate * 2 / KHZ;

	target_clk_f = rate * 2 / KHZ;
@@ -202,8 +200,12 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate) 




	/* Select lowest possible VCO */

	/* Select lowest possible VCO */

	for (pl = low_pl; pl <= high_pl; pl++) {

	for (pl = low_pl; pl <= high_pl; pl++) {

		u32 m, n, n2;



		target_vco_f = target_clk_f * pl_to_div[pl];

		target_vco_f = target_clk_f * pl_to_div[pl];

		for (m = clk->params->min_m; m <= clk->params->max_m; m++) {

		for (m = clk->params->min_m; m <= clk->params->max_m; m++) {

			u32 u_f, vco_f;



			u_f = ref_clk_f / m;

			u_f = ref_clk_f / m;





			if (u_f < clk->params->min_u)

			if (u_f < clk->params->min_u)
@@ -226,6 +228,8 @@ gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate) 
				vco_f = ref_clk_f * n / m;

				vco_f = ref_clk_f * n / m;





				if (vco_f >= min_vco_f && vco_f <= max_vco_f) {

				if (vco_f >= min_vco_f && vco_f <= max_vco_f) {

					u32 delta, lwv;



					lwv = (vco_f + (pl_to_div[pl] / 2))

					lwv = (vco_f + (pl_to_div[pl] / 2))

						/ pl_to_div[pl];

						/ pl_to_div[pl];

					delta = abs(lwv - target_clk_f);

					delta = abs(lwv - target_clk_f);