diff options
author | Dave Airlie <airlied@redhat.com> | 2019-03-29 14:01:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-03-29 14:03:01 +1000 |
commit | b4e4538a0ab5079ae5dc401970e11f0ff2ba13a7 (patch) | |
tree | d959a87f06083c1aae626b8780cec67bb0b04836 /include/uapi/drm | |
parent | 233709186c502b48f53aa383fe78f7a9f0a74416 (diff) | |
parent | 530b28426a94b822b3c03491cde5c9a961d80e7f (diff) |
Merge tag 'drm-misc-next-2019-03-28-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.2:
UAPI Changes:
- Remove unused DRM_DISPLAY_INFO_LEN (Ville)
Cross-subsystem Changes:
- None
Core Changes:
- Fix compilation when CONFIG_FBDEV not selected (Daniel)
- fbdev: Make skip_vt_switch default (Daniel)
- Merge fb_helper_fill_fix, fb_helper_fill_var into fb_helper_fill_info (Daniel)
- Remove unused fields in connector, display_info, and edid_quirks (Ville)
Driver Changes:
- virtio: package function args in virtio_gpu_object_params (Gerd)
- vkms: Fix potential NULL-dereference bug (Kangjie)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190328183045.GA44823@art_vandelay
Diffstat (limited to 'include/uapi/drm')
-rw-r--r-- | include/uapi/drm/drm_mode.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index a439c2e67896..09d72966899a 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -33,7 +33,6 @@ extern "C" { #endif -#define DRM_DISPLAY_INFO_LEN 32 #define DRM_CONNECTOR_NAME_LEN 32 #define DRM_DISPLAY_MODE_LEN 32 #define DRM_PROP_NAME_LEN 32 |