tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Single nouveau firmware fix.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5uGLgDY8V8pWgEH0-YhkCEgvHE=NZ1W_m0gJaoFPuQ0g@mail.gmail.com

Dave Airlie b0dfce90 089cf7f6

+12
+12
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c
··· 190 190 MODULE_FIRMWARE("nvidia/gp102/sec2/desc.bin"); 191 191 MODULE_FIRMWARE("nvidia/gp102/sec2/image.bin"); 192 192 MODULE_FIRMWARE("nvidia/gp102/sec2/sig.bin"); 193 + MODULE_FIRMWARE("nvidia/gp102/sec2/desc-1.bin"); 194 + MODULE_FIRMWARE("nvidia/gp102/sec2/image-1.bin"); 195 + MODULE_FIRMWARE("nvidia/gp102/sec2/sig-1.bin"); 193 196 MODULE_FIRMWARE("nvidia/gp104/acr/bl.bin"); 194 197 MODULE_FIRMWARE("nvidia/gp104/acr/unload_bl.bin"); 195 198 MODULE_FIRMWARE("nvidia/gp104/acr/ucode_load.bin"); ··· 213 210 MODULE_FIRMWARE("nvidia/gp104/sec2/desc.bin"); 214 211 MODULE_FIRMWARE("nvidia/gp104/sec2/image.bin"); 215 212 MODULE_FIRMWARE("nvidia/gp104/sec2/sig.bin"); 213 + MODULE_FIRMWARE("nvidia/gp104/sec2/desc-1.bin"); 214 + MODULE_FIRMWARE("nvidia/gp104/sec2/image-1.bin"); 215 + MODULE_FIRMWARE("nvidia/gp104/sec2/sig-1.bin"); 216 216 MODULE_FIRMWARE("nvidia/gp106/acr/bl.bin"); 217 217 MODULE_FIRMWARE("nvidia/gp106/acr/unload_bl.bin"); 218 218 MODULE_FIRMWARE("nvidia/gp106/acr/ucode_load.bin"); ··· 236 230 MODULE_FIRMWARE("nvidia/gp106/sec2/desc.bin"); 237 231 MODULE_FIRMWARE("nvidia/gp106/sec2/image.bin"); 238 232 MODULE_FIRMWARE("nvidia/gp106/sec2/sig.bin"); 233 + MODULE_FIRMWARE("nvidia/gp106/sec2/desc-1.bin"); 234 + MODULE_FIRMWARE("nvidia/gp106/sec2/image-1.bin"); 235 + MODULE_FIRMWARE("nvidia/gp106/sec2/sig-1.bin"); 239 236 MODULE_FIRMWARE("nvidia/gp107/acr/bl.bin"); 240 237 MODULE_FIRMWARE("nvidia/gp107/acr/unload_bl.bin"); 241 238 MODULE_FIRMWARE("nvidia/gp107/acr/ucode_load.bin"); ··· 259 250 MODULE_FIRMWARE("nvidia/gp107/sec2/desc.bin"); 260 251 MODULE_FIRMWARE("nvidia/gp107/sec2/image.bin"); 261 252 MODULE_FIRMWARE("nvidia/gp107/sec2/sig.bin"); 253 + MODULE_FIRMWARE("nvidia/gp107/sec2/desc-1.bin"); 254 + MODULE_FIRMWARE("nvidia/gp107/sec2/image-1.bin"); 255 + MODULE_FIRMWARE("nvidia/gp107/sec2/sig-1.bin");