Commit 35b36ff4 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Split PLL compute functions by device type 



Several PLL functions compute values for different device types. Split
them up to make the code more readable. No functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210714142240.21979-8-tzimmermann@suse.de
parent 2dd04094

drivers/gpu/drm/mgag200/mgag200_mode.c

+146 −110
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int mgag200_compute_pixpll_values_g200wb(struct mga_device *mdev, long cl 
{

	unsigned int vcomax, vcomin, pllreffreq;

	unsigned int delta, tmpdelta;

	unsigned int testp, testm, testn, testp2;

	unsigned int testp, testm, testn;

	unsigned int p, m, n, s;

	unsigned int computed;
@@ -357,39 +357,6 @@ static int mgag200_compute_pixpll_values_g200wb(struct mga_device *mdev, long cl 


	delta = 0xffffffff;



	if (mdev->type == G200_EW3) {

		vcomax = 800000;

		vcomin = 400000;

		pllreffreq = 25000;



		for (testp = 1; testp < 8; testp++) {

			for (testp2 = 1; testp2 < 8; testp2++) {

				if (testp < testp2)

					continue;

				if ((clock * testp * testp2) > vcomax)

					continue;

				if ((clock * testp * testp2) < vcomin)

					continue;

				for (testm = 1; testm < 26; testm++) {

					for (testn = 32; testn < 2048 ; testn++) {

						computed = (pllreffreq * testn) /

							(testm * testp * testp2);

						if (computed > clock)

							tmpdelta = computed - clock;

						else

							tmpdelta = clock - computed;

						if (tmpdelta < delta) {

							delta = tmpdelta;

							m = testm + 1;

							n = testn + 1;

							p = testp + 1;

							s = testp2;

						}

					}

				}

			}

		}

	} else {

	vcomax = 550000;

	vcomin = 150000;

	pllreffreq = 48000;
@@ -402,8 +369,7 @@ static int mgag200_compute_pixpll_values_g200wb(struct mga_device *mdev, long cl 


		for (testm = 1; testm < 17; testm++) {

			for (testn = 1; testn < 151; testn++) {

					computed = (pllreffreq * testn) /

						(testm * testp);

				computed = (pllreffreq * testn) / (testm * testp);

				if (computed > clock)

					tmpdelta = computed - clock;

				else
@@ -418,7 +384,6 @@ static int mgag200_compute_pixpll_values_g200wb(struct mga_device *mdev, long cl 
			}

		}

	}

	}



	pixpllc->m = m;

	pixpllc->n = n;
@@ -671,40 +636,6 @@ static int mgag200_compute_pixpll_values_g200eh(struct mga_device *mdev, long cl 


	m = n = p = s = 0;



	if (mdev->type == G200_EH3) {

		vcomax = 3000000;

		vcomin = 1500000;

		pllreffreq = 25000;



		delta = 0xffffffff;



		testp = 0;



		for (testm = 150; testm >= 6; testm--) {

			if (clock * testm > vcomax)

				continue;

			if (clock * testm < vcomin)

				continue;

			for (testn = 120; testn >= 60; testn--) {

				computed = (pllreffreq * testn) / testm;

				if (computed > clock)

					tmpdelta = computed - clock;

				else

					tmpdelta = clock - computed;

				if (tmpdelta < delta) {

					delta = tmpdelta;

					n = testn + 1;

					m = testm + 1;

					p = testp + 1;

				}

				if (delta == 0)

					break;

			}

			if (delta == 0)

				break;

		}

	} else {



	vcomax = 800000;

	vcomin = 400000;

	pllreffreq = 33333;
@@ -719,8 +650,7 @@ static int mgag200_compute_pixpll_values_g200eh(struct mga_device *mdev, long cl 


		for (testm = 1; testm < 33; testm++) {

			for (testn = 17; testn < 257; testn++) {

					computed = (pllreffreq * testn) /

						(testm * testp);

				computed = (pllreffreq * testn) / (testm * testp);

				if (computed > clock)

					tmpdelta = computed - clock;

				else
@@ -734,7 +664,6 @@ static int mgag200_compute_pixpll_values_g200eh(struct mga_device *mdev, long cl 
			}

		}

	}

	}



	pixpllc->m = m;

	pixpllc->n = n;
@@ -812,6 +741,57 @@ static void mgag200_set_pixpll_g200eh(struct mga_device *mdev, 
	}

}



static int mgag200_compute_pixpll_values_g200eh3(struct mga_device *mdev, long clock,

						 struct mgag200_pll_values *pixpllc)

{

	unsigned int vcomax, vcomin, pllreffreq;

	unsigned int delta, tmpdelta;

	unsigned int testp, testm, testn;

	unsigned int p, m, n, s;

	unsigned int computed;



	m = n = p = s = 0;



	vcomax = 3000000;

	vcomin = 1500000;

	pllreffreq = 25000;



	delta = 0xffffffff;



	testp = 0;



	for (testm = 150; testm >= 6; testm--) {

		if (clock * testm > vcomax)

			continue;

		if (clock * testm < vcomin)

			continue;

		for (testn = 120; testn >= 60; testn--) {

			computed = (pllreffreq * testn) / testm;

			if (computed > clock)

				tmpdelta = computed - clock;

			else

				tmpdelta = clock - computed;

			if (tmpdelta < delta) {

				delta = tmpdelta;

				n = testn + 1;

				m = testm + 1;

				p = testp + 1;

			}

			if (delta == 0)

				break;

		}

		if (delta == 0)

			break;

	}



	pixpllc->m = m;

	pixpllc->n = n;

	pixpllc->p = p;

	pixpllc->s = s;



	return 0;

}



static int mgag200_compute_pixpll_values_g200er(struct mga_device *mdev, long clock,

						struct mgag200_pll_values *pixpllc)

{
@@ -916,6 +896,58 @@ static void mgag200_set_pixpll_g200er(struct mga_device *mdev, 
	udelay(50);

}



static int mgag200_compute_pixpll_values_g200ew3(struct mga_device *mdev, long clock,

						 struct mgag200_pll_values *pixpllc)

{

	unsigned int vcomax, vcomin, pllreffreq;

	unsigned int delta, tmpdelta;

	unsigned int testp, testm, testn, testp2;

	unsigned int p, m, n, s;

	unsigned int computed;



	m = n = p = s = 0;



	delta = 0xffffffff;



	vcomax = 800000;

	vcomin = 400000;

	pllreffreq = 25000;



	for (testp = 1; testp < 8; testp++) {

		for (testp2 = 1; testp2 < 8; testp2++) {

			if (testp < testp2)

				continue;

			if ((clock * testp * testp2) > vcomax)

				continue;

			if ((clock * testp * testp2) < vcomin)

				continue;

			for (testm = 1; testm < 26; testm++) {

				for (testn = 32; testn < 2048 ; testn++) {

					computed = (pllreffreq * testn) / (testm * testp * testp2);

					if (computed > clock)

						tmpdelta = computed - clock;

					else

						tmpdelta = clock - computed;

					if (tmpdelta < delta) {

						delta = tmpdelta;

						m = testm + 1;

						n = testn + 1;

						p = testp + 1;

						s = testp2;

					}

				}

			}

		}

	}



	pixpllc->m = m;

	pixpllc->n = n;

	pixpllc->p = p;

	pixpllc->s = s;



	return 0;

}



static void mgag200_crtc_set_plls(struct mga_device *mdev, long clock)

{

	struct mgag200_pll_values pixpll;
@@ -931,19 +963,23 @@ static void mgag200_crtc_set_plls(struct mga_device *mdev, long clock) 
		ret = mgag200_compute_pixpll_values_g200se(mdev, clock, &pixpll);

		break;

	case G200_WB:

	case G200_EW3:

		ret = mgag200_compute_pixpll_values_g200wb(mdev, clock, &pixpll);

		break;

	case G200_EV:

		ret = mgag200_compute_pixpll_values_g200ev(mdev, clock, &pixpll);

		break;

	case G200_EH:

	case G200_EH3:

		ret = mgag200_compute_pixpll_values_g200eh(mdev, clock, &pixpll);

		break;

	case G200_EH3:

		ret = mgag200_compute_pixpll_values_g200eh3(mdev, clock, &pixpll);

		break;

	case G200_ER:

		ret = mgag200_compute_pixpll_values_g200er(mdev, clock, &pixpll);

		break;

	case G200_EW3:

		ret = mgag200_compute_pixpll_values_g200ew3(mdev, clock, &pixpll);

		break;

	}



	if (ret)