6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Skeggs bskeggs@nvidia.com
[ Upstream commit 7904bcdcf6b56602a049ed2b47282db63671fa99 ]
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: Ben Skeggs bskeggs@nvidia.com Reviewed-by: Dave Airlie airlied@redhat.com Reviewed-by: Timur Tabi ttabi@nvidia.com Tested-by: Timur Tabi ttabi@nvidia.com Signed-off-by: Dave Airlie airlied@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c index db2602e880062..6a964b54f69c2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -2838,7 +2838,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; );