Commit b0dfce90 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.3' of git://github.com/skeggsb/linux into drm-fixes 



Single nouveau firmware fix.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5uGLgDY8V8pWgEH0-YhkCEgvHE=NZ1W_m0gJaoFPuQ0g@mail.gmail.com
parents 089cf7f6 55f7e5c3

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c

+12 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ MODULE_FIRMWARE("nvidia/gp102/nvdec/scrubber.bin"); 
MODULE_FIRMWARE("nvidia/gp102/sec2/desc.bin");

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

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

MODULE_FIRMWARE("nvidia/gp102/sec2/desc-1.bin");

MODULE_FIRMWARE("nvidia/gp102/sec2/image-1.bin");

MODULE_FIRMWARE("nvidia/gp102/sec2/sig-1.bin");

MODULE_FIRMWARE("nvidia/gp104/acr/bl.bin");

MODULE_FIRMWARE("nvidia/gp104/acr/unload_bl.bin");

MODULE_FIRMWARE("nvidia/gp104/acr/ucode_load.bin");
@@ -210,6 +213,9 @@ MODULE_FIRMWARE("nvidia/gp104/nvdec/scrubber.bin"); 
MODULE_FIRMWARE("nvidia/gp104/sec2/desc.bin");

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

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

MODULE_FIRMWARE("nvidia/gp104/sec2/desc-1.bin");

MODULE_FIRMWARE("nvidia/gp104/sec2/image-1.bin");

MODULE_FIRMWARE("nvidia/gp104/sec2/sig-1.bin");

MODULE_FIRMWARE("nvidia/gp106/acr/bl.bin");

MODULE_FIRMWARE("nvidia/gp106/acr/unload_bl.bin");

MODULE_FIRMWARE("nvidia/gp106/acr/ucode_load.bin");
@@ -230,6 +236,9 @@ MODULE_FIRMWARE("nvidia/gp106/nvdec/scrubber.bin"); 
MODULE_FIRMWARE("nvidia/gp106/sec2/desc.bin");

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

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

MODULE_FIRMWARE("nvidia/gp106/sec2/desc-1.bin");

MODULE_FIRMWARE("nvidia/gp106/sec2/image-1.bin");

MODULE_FIRMWARE("nvidia/gp106/sec2/sig-1.bin");

MODULE_FIRMWARE("nvidia/gp107/acr/bl.bin");

MODULE_FIRMWARE("nvidia/gp107/acr/unload_bl.bin");

MODULE_FIRMWARE("nvidia/gp107/acr/ucode_load.bin");
@@ -250,3 +259,6 @@ MODULE_FIRMWARE("nvidia/gp107/nvdec/scrubber.bin"); 
MODULE_FIRMWARE("nvidia/gp107/sec2/desc.bin");

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

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

MODULE_FIRMWARE("nvidia/gp107/sec2/desc-1.bin");

MODULE_FIRMWARE("nvidia/gp107/sec2/image-1.bin");

MODULE_FIRMWARE("nvidia/gp107/sec2/sig-1.bin");

CRA Git | Maintained and supported by SUSTech CRA and CCSE