summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-01-15 16:45:58 +1000
committerDave Airlie <airlied@redhat.com>2020-01-15 16:46:57 +1000
commitdd22dfa62c9cb2669ed4b181e359645108c69578 (patch)
treefddec0cd96fd3f9fa15e40cd5e3ad4415cc122a5 /drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
parent6fc376f026a04135b0a84d6f2dcf393bc5ec660d (diff)
parentafa3b96b058d87c2c44d1c83dadb2ba6998d03ce (diff)
downloadlinux-dd22dfa62c9cb2669ed4b181e359645108c69578.tar.bz2
Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next
- Rewrite of the ACR (formerly "secure boot") code, both to support Turing, support multiple FW revisions, and to make life easier when having to debug HW/FW bring-up in the future - Support for TU10x graphics engine, TU11x not available yet as FW isn't ready - Proper page 'kind' mappings for Turing - 10-bit LUT support - GP10B (Tegra) fixes - Misc other fixes Signed-off-by: Dave Airlie <airlied@redhat.com> From: Ben Skeggs <skeggsb@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv5GKasg9-hEUwp9+aHVJg+nbQ0LukXyudgj6=YKu96jWQ@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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index 239ad222b95a..34b56b10218a 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -33,6 +33,8 @@ struct nvkm_fb {
const struct nvkm_fb_func *func;
struct nvkm_subdev subdev;
+ struct nvkm_blob vpr_scrubber;
+
struct nvkm_ram *ram;
struct nvkm_mm tags;