Commit 275dd6f4 authored by Roy Spliet's avatar Roy Spliet Committed by Ben Skeggs
Browse files

drm/nva3/clk: Abort when PLL doesn't lock 



Signed-off-by: default avatarRoy Spliet <rspliet@eclipso.eu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 70c7995d

drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c

+5 −1
Original line number Diff line number Diff line
@@ -311,7 +311,11 @@ prog_pll(struct nva3_clock_priv *priv, int clk, u32 pll, int idx) 
		nv_wr32(priv, coef, info->pll);

		nv_mask(priv, ctrl, 0x00000015, 0x00000015);

		nv_mask(priv, ctrl, 0x00000010, 0x00000000);

		nv_wait(priv, ctrl, 0x00020000, 0x00020000);

		if (!nv_wait(priv, ctrl, 0x00020000, 0x00020000)) {

			nv_mask(priv, ctrl, 0x00000010, 0x00000010);

			nv_mask(priv, src0, 0x00000101, 0x00000000);

			return;

		}

		nv_mask(priv, ctrl, 0x00000010, 0x00000010);

		nv_mask(priv, ctrl, 0x00000008, 0x00000000);

		disable_clk_src(priv, src1);