Commit 7904bcdc authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: fix rm shutdown wait condition 



Though the initial upstreamed GSP-RM version in nouveau was 535.113.01,
the code was developed against earlier versions.

535.42.02 modified the mailbox value used by GSP-RM to signal shutdown
has completed, which was missed at the time.

I'm not aware of any issues caused by this, but noticed the bug while
working on GB20x support.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7cf346fc

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

+1 −1
Original line number Diff line number Diff line
@@ -2844,7 +2844,7 @@ r535_gsp_fini(struct nvkm_gsp *gsp, bool suspend) 
		return ret;



	nvkm_msec(gsp->subdev.device, 2000,

		if (nvkm_falcon_rd32(&gsp->falcon, 0x040) & 0x80000000)

		if (nvkm_falcon_rd32(&gsp->falcon, 0x040) == 0x80000000)

			break;

	);