Commit 92f673a1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/sec2/gv100-: add missing MODULE_FIRMWARE() 



ASB was failing to load on Turing GPUs when firmware is being loaded
from initramfs, leaving the GPU in an odd state and causing suspend/
resume to fail.

Add missing MODULE_FIRMWARE() lines for initramfs generators.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: <stable@vger.kernel.org> # 5.6
parent 374b5580

drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
MODULE_FIRMWARE("nvidia/gp108/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/gp108/sec2/image.bin");

MODULE_FIRMWARE("nvidia/gp108/sec2/sig.bin");

MODULE_FIRMWARE("nvidia/gv100/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/gv100/sec2/image.bin");

MODULE_FIRMWARE("nvidia/gv100/sec2/sig.bin");



static const struct nvkm_sec2_fwif

gp108_sec2_fwif[] = {

drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c

+16 −0
Original line number Diff line number Diff line
@@ -56,6 +56,22 @@ tu102_sec2_nofw(struct nvkm_sec2 *sec2, int ver, 
	return 0;

}



MODULE_FIRMWARE("nvidia/tu102/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu102/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu102/sec2/sig.bin");

MODULE_FIRMWARE("nvidia/tu104/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu104/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu104/sec2/sig.bin");

MODULE_FIRMWARE("nvidia/tu106/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu106/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu106/sec2/sig.bin");

MODULE_FIRMWARE("nvidia/tu116/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu116/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu116/sec2/sig.bin");

MODULE_FIRMWARE("nvidia/tu117/sec2/desc.bin");

MODULE_FIRMWARE("nvidia/tu117/sec2/image.bin");

MODULE_FIRMWARE("nvidia/tu117/sec2/sig.bin");



static const struct nvkm_sec2_fwif

tu102_sec2_fwif[] = {

	{  0, gp102_sec2_load, &tu102_sec2, &gp102_sec2_acr_1 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE