diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 16:54:52 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 17:04:00 +0300 |
| commit | 9cf26c8968b358bb14cc078f8153300a493613d4 (patch) | |
| tree | cb560226137022539f1ddaa9292f64a35ea5f736 /drivers/gpu/drm/nouveau/include/nvif/disp.h | |
| parent | d4a3e50ffd9084e3eafb318e95ca91b5895a6e62 (diff) | |
| parent | 2bc7ea71a73747a77e7f83bc085b0d2393235410 (diff) | |
| download | linux-9cf26c8968b358bb14cc078f8153300a493613d4.tar.xz | |
Merge drm/drm-next into drm-misc-next
Backmerging to pick up fixes from amdgpu.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvif/disp.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/disp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/disp.h b/drivers/gpu/drm/nouveau/include/nvif/disp.h index 07ac544f282f..742632ad3bea 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/disp.h +++ b/drivers/gpu/drm/nouveau/include/nvif/disp.h @@ -5,6 +5,8 @@ struct nvif_device; struct nvif_disp { struct nvif_object object; + unsigned long conn_mask; + unsigned long outp_mask; }; int nvif_disp_ctor(struct nvif_device *, const char *name, s32 oclass, |