Commit 93e692dc authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nva3/pm: pll disabled if bit 0 of ctrl not set 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6b70e481

drivers/gpu/drm/nouveau/nva3_pm.c

+23 −19
Original line number Diff line number Diff line
@@ -72,19 +72,21 @@ static u32 
read_pll(struct drm_device *dev, int clk, u32 pll)

{

	u32 ctrl = nv_rd32(dev, pll + 0);

	u32 sclk, P = 1, N = 1, M = 1;

	u32 sclk = 0, P = 1, N = 1, M = 1;



	if (!(ctrl & 0x00000008)) {

		if (ctrl & 0x00000001) {

			u32 coef = nv_rd32(dev, pll + 4);

			M = (coef & 0x000000ff) >> 0;

			N = (coef & 0x0000ff00) >> 8;

			P = (coef & 0x003f0000) >> 16;



		/* not post-divider on these.. */

			/* no post-divider on these.. */

			if ((pll & 0x00ff00) == 0x00e800)

				P = 1;



			sclk = read_clk(dev, 0x00 + clk, false);

		}

	} else {

		sclk = read_clk(dev, 0x10 + clk, false);

	}
@@ -306,6 +308,7 @@ nva3_pm_clocks_set(struct drm_device *dev, void *pre_state) 
	prog_clk(dev, 0x20, &info->unka0);

	prog_clk(dev, 0x21, &info->vdec);



	if (info->mclk.clk || info->mclk.pll) {

		nv_wr32(dev, 0x100210, 0);

		nv_wr32(dev, 0x1002dc, 1);

		nv_wr32(dev, 0x004018, 0x00001000);
@@ -316,6 +319,7 @@ nva3_pm_clocks_set(struct drm_device *dev, void *pre_state) 
			nv_wr32(dev, 0x004018, 0x10005000);

		nv_wr32(dev, 0x1002dc, 0);

		nv_wr32(dev, 0x100210, 0x80000000);

	}



cleanup:

	/* unfreeze PFIFO */