diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-16 17:52:54 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-16 17:52:54 -0500 |
| commit | e419322aff4d8e0a5f8c02d32f3d38d84766878a (patch) | |
| tree | 8bc7926dd277c97e1f11fc25dece7383768df7e1 | |
| parent | 0ec123e28a91637ad542f5a59cc8946107340f40 (diff) | |
| download | kernel-e419322aff4d8e0a5f8c02d32f3d38d84766878a.tar.gz kernel-e419322aff4d8e0a5f8c02d32f3d38d84766878a.tar.xz kernel-e419322aff4d8e0a5f8c02d32f3d38d84766878a.zip | |
Add missing MODULE_FIRMWARE() lines for initramfs generators
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | nouveau-add-missing-MODULE_FIRMWARE.patch | 59 |
2 files changed, 63 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 6f78aeced..3b84ddd4b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -909,6 +909,7 @@ Patch512: 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch Patch513: 0001-drm-nouveau-workaround-runpm-fail-by-disabling-PCI-p.patch # Accepted nouveau upstream https://github.com/skeggsb/nouveau/commit/41c6a13e8143af71928749ea9895d2ebc2fb4ffd Patch514: 0002-drm-nouveau-gr-gp107-gp108-implement-workaround-for-.patch +Patch515: nouveau-add-missing-MODULE_FIRMWARE.patch # END OF PATCH DEFINITIONS @@ -3005,6 +3006,9 @@ fi # # %changelog +* Thu Apr 16 2020 Justin M. Forbes <jforbes@fedoraproject.org> +- Nouveau Add missing MODULE_FIRMWARE() lines for initramfs generators + * Mon Apr 13 2020 Jeremy Cline <jcline@redhat.com> - 5.6.4-300 - Linux v5.6.4 diff --git a/nouveau-add-missing-MODULE_FIRMWARE.patch b/nouveau-add-missing-MODULE_FIRMWARE.patch new file mode 100644 index 000000000..1195b95d3 --- /dev/null +++ b/nouveau-add-missing-MODULE_FIRMWARE.patch @@ -0,0 +1,59 @@ +From 92f673a12d14b5393138d2b1cfeb41d72b47362d Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs@redhat.com> +Date: Thu, 16 Apr 2020 15:26:01 +1000 +Subject: [PATCH] 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: Ben Skeggs <bskeggs@redhat.com> +Cc: <stable@vger.kernel.org> # 5.6 +--- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c | 3 +++ + drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 16 ++++++++++++++++ + 2 files changed, 19 insertions(+) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c +index 232a9d7c51e5d..e770c9497871b 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c ++++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c +@@ -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[] = { +diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c +index b6ebd95c9ba1e..a8295653ceab1 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c ++++ b/drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c +@@ -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 }, |