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

Commit c57ebf5e authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nv50/pm: wait for all fifo-connected engines to idle before reclocking 



Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 496a73bb

drivers/gpu/drm/nouveau/nv50_pm.c

+2 −0
Original line number Diff line number Diff line
@@ -798,6 +798,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) 
	nv_mask(dev, 0x002504, 0x00000001, 0x00000001);

	if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010))

		goto resume;

	if (!nv_wait(dev, 0x00251c, 0x0000003f, 0x0000003f))

		goto resume;



	/* program memory clock, if necessary - must come before engine clock

	 * reprogramming due to how we construct the hwsq scripts in pre()