diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-03-01 14:02:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-01 14:02:32 +1000 |
| commit | 2679b96ae4c055b8cfc27da8c9f703de08ce5c4b (patch) | |
| tree | fdbb872bf211f06719ee91abe33e1c52d2350b18 /include | |
| parent | 4757d972d9667bc6dbdc2859ce3f1721dbcc3dd6 (diff) | |
| parent | 9a191b114906457c4b2494c474f58ae4142d4e67 (diff) | |
| download | linux-2679b96ae4c055b8cfc27da8c9f703de08ce5c4b.tar.gz linux-2679b96ae4c055b8cfc27da8c9f703de08ce5c4b.tar.bz2 linux-2679b96ae4c055b8cfc27da8c9f703de08ce5c4b.zip | |
Merge tag 'drm-misc-fixes-2018-02-28' of git://people.freedesktop.org/drm-misc into drm-fixes
Two regression fixes here: a fb format regression on nouveau and a 4.16-rc1
regression with on LVDS with one sun4i device. Plus a sun4i and a virtio-gpu
fixes.
* tag 'drm-misc-fixes-2018-02-28' of git://people.freedesktop.org/drm-misc:
virtio-gpu: fix ioctl and expose the fixed status to userspace.
drm/sun4i: Protect the TCON pixel clocks
drm/sun4i: Enable the output on the pins (tcon0)
drm/nouveau: prefer XBGR2101010 for addfb ioctl
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_drv.h | 1 | ||||
| -rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index d32b688eb346..d23dcdd1bd95 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -56,6 +56,7 @@ struct drm_printer; #define DRIVER_ATOMIC 0x10000 #define DRIVER_KMS_LEGACY_CONTEXT 0x20000 #define DRIVER_SYNCOBJ 0x40000 +#define DRIVER_PREFER_XBGR_30BPP 0x80000 /** * struct drm_driver - DRM driver structure diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index 91a31ffed828..9a781f0611df 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -63,6 +63,7 @@ struct drm_virtgpu_execbuffer { }; #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */ +#define VIRTGPU_PARAM_CAPSET_QUERY_FIX 2 /* do we have the capset fix */ struct drm_virtgpu_getparam { __u64 param; |