Commit f6ecfdad authored by Sid Pranjale's avatar Sid Pranjale Committed by Dave Airlie
Browse files

drm/nouveau: keep DMA buffers required for suspend/resume 



Nouveau deallocates a few buffers post GPU init which are required for GPU suspend/resume to function correctly.
This is likely not as big an issue on systems where the NVGPU is the only GPU, but on multi-GPU set ups it leads to a regression where the kernel module errors and results in a system-wide rendering freeze.

This commit addresses that regression by moving the two buffers required for suspend and resume to be deallocated at driver unload instead of post init.

Fixes: 042b5f83 ("drm/nouveau: fix several DMA buffer leaks")
Signed-off-by: default avatarSid Pranjale <sidpranjale127@protonmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f7916c47

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

+2 −2
Original line number Diff line number Diff line
@@ -1054,8 +1054,6 @@ r535_gsp_postinit(struct nvkm_gsp *gsp) 
	/* Release the DMA buffers that were needed only for boot and init */

	nvkm_gsp_mem_dtor(gsp, &gsp->boot.fw);

	nvkm_gsp_mem_dtor(gsp, &gsp->libos);

	nvkm_gsp_mem_dtor(gsp, &gsp->rmargs);

	nvkm_gsp_mem_dtor(gsp, &gsp->wpr_meta);



	return ret;

}
@@ -2163,6 +2161,8 @@ r535_gsp_dtor(struct nvkm_gsp *gsp) 


	r535_gsp_dtor_fws(gsp);



	nvkm_gsp_mem_dtor(gsp, &gsp->rmargs);

	nvkm_gsp_mem_dtor(gsp, &gsp->wpr_meta);

	nvkm_gsp_mem_dtor(gsp, &gsp->shm.mem);

	nvkm_gsp_mem_dtor(gsp, &gsp->loginit);

	nvkm_gsp_mem_dtor(gsp, &gsp->logintr);