summaryrefslogtreecommitdiffstats
path: root/nouveau-add-missing-MODULE_FIRMWARE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nouveau-add-missing-MODULE_FIRMWARE.patch')
-rw-r--r--nouveau-add-missing-MODULE_FIRMWARE.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/nouveau-add-missing-MODULE_FIRMWARE.patch b/nouveau-add-missing-MODULE_FIRMWARE.patch
deleted file mode 100644
index 1195b95d3..000000000
--- a/nouveau-add-missing-MODULE_FIRMWARE.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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 },