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

Commit 63d6fd32 authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nv10-nv20: Fix instability after MPLL changes. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 56ac7475

drivers/gpu/drm/nouveau/nv04_pm.c

+9 −0
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ nv04_pm_clock_set(struct drm_device *dev, void *pre_state) 
		reg += 4;



	nouveau_hw_setpll(dev, reg, &state->calc);



	if (dev_priv->card_type < NV_30 && reg == NV_PRAMDAC_MPLL_COEFF) {

		if (dev_priv->card_type == NV_20)

			nv_mask(dev, 0x1002c4, 0, 1 << 20);



		/* Reset the DLLs */

		nv_mask(dev, 0x1002c0, 0, 1 << 8);

	}



	kfree(state);

}