aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2023-02-20 14:39:21 +1000
committerKarol Herbst <kherbst@redhat.com>2023-02-21 02:07:24 +0100
commit1b9b4f922f96108da3bb5d87b2d603f5dfbc5650 (patch)
tree5bd4ed1da61083e0268613481f3e55de2a4dd539 /drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
parentdrm/nouveau/kms/nv50: fix nv50_wndw_new_ prototype (diff)
downloadwireguard-linux-1b9b4f922f96108da3bb5d87b2d603f5dfbc5650.tar.xz
wireguard-linux-1b9b4f922f96108da3bb5d87b2d603f5dfbc5650.zip
drm/nouveau/fb/gp102-: cache scrubber binary on first load
During system shutdown nouveau might not be able to request firmware from Userspace, which then leads to a regression preventing the system from shutting down. Cache the scrubber binary for this case. Fixes: 0e44c21708761 ("drm/nouveau/flcn: new code to load+boot simple HS FWs (VPR scrubber)") Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Karol Herbst <kherbst@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7Uf5=K44y8YLsiy0aMnc1zvGEQdeDe7RQF=AV+fxxzuQ@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h')
-rw-r--r--drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index c5a4f49ee206..01a22a13b452 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -2,6 +2,7 @@
#ifndef __NVKM_FB_H__
#define __NVKM_FB_H__
#include <core/subdev.h>
+#include <core/falcon.h>
#include <core/mm.h>
/* memory type/access flags, do not match hardware values */
@@ -33,7 +34,7 @@ struct nvkm_fb {
const struct nvkm_fb_func *func;
struct nvkm_subdev subdev;
- struct nvkm_blob vpr_scrubber;
+ struct nvkm_falcon_fw vpr_scrubber;
struct {
struct page *flush_page;