Last drm-misc-next pull req for 4.12 Core changes: - fb_helper checkpatch cleanup and simplified _add_one_connector() (Thierry) - drm_ioctl and drm_sysfs improved/gained documentation (Daniel) - [ABI] Repurpose reserved field in drm_event_vblank for crtc_id (Ander) - Plumb acquire ctx through legacy paths to avoid lock_all and legacy_backoff (Daniel) - Add connector_atomic_check to check conn constraints on modeset (Maarten) - Add drm_of_find_panel_or_bridge to remove boilerplate in drivers (Rob) Driver changes: - meson moved to drm-misc (Neil) - Added support for Amlogic GX SoCs in dw-hdmi (Neil) - Rockchip unbind actually cleans up the things bind initializes (Jeffy) - A couple misc fixes in virtio, dw-hdmi NOTE: this also includes a backmerge of drm-next as well rc5 (we needed vmwgfx as well as the new synopsys media formats) * tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc: (77 commits) Revert "drm: Don't allow interruptions when opening debugfs/crc" drm: Only take cursor locks when the cursor plane exists drm/vmwgfx: Fix fbdev emulation using legacy functions drm/rockchip: Shutdown all crtcs when unbinding drm drm/rockchip: Reorder drm bind/unbind sequence drm/rockchip: analogix_dp: Disable clock when unbinding drm/rockchip: vop: Unprepare clocks when unbinding drm/rockchip: vop: Enable pm domain before vop_initial drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding drm/rockchip: cdn-dp: Don't try to release firmware when not loaded drm: bridge: analogix: Destroy connector & encoder when unbinding drm: bridge: analogix: Disable clock when unbinding drm: bridge: analogix: Unregister dp aux when unbinding drm: bridge: analogix: Detach panel when unbinding analogix dp drm: Don't allow interruptions when opening debugfs/crc drm/virtio: don't leak bo on drm_gem_object_init failure drm: bridge: dw-hdmi: fix input format/encoding from plat_data drm: omap: use common OF graph helpers drm: convert drivers to use drm_of_find_panel_or_bridge drm: convert drivers to use of_graph_get_remote_node ...
Showing the changes to include/uapi (2 of 133 files). Show all
Unified · Split
| @@ -647,6 +647,7 @@ struct drm_gem_open { · 646 unmodified lines | ||
| 647 | 647 | #define DRM_CAP_CURSOR_HEIGHT 0x9 |
| 648 | 648 | #define DRM_CAP_ADDFB2_MODIFIERS 0x10 |
| 649 | 649 | #define DRM_CAP_PAGE_FLIP_TARGET 0x11 |
| 650 | +#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12 | |
| 650 | 651 | |
| 651 | 652 | /** DRM_IOCTL_GET_CAP ioctl argument type */ |
| 652 | 653 | struct drm_get_cap { |
| @@ -851,7 +852,7 @@ struct drm_event_vblank { · 198 unmodified lines | ||
| 851 | 852 | __u32 tv_sec; |
| 852 | 853 | __u32 tv_usec; |
| 853 | 854 | __u32 sequence; |
| 854 | − __u32 reserved; | |
| 855 | + __u32 crtc_id; /* 0 on older kernels that do not support this */ | |
| 855 | 856 | }; |
| 856 | 857 | |
| 857 | 858 | /* typedef area */ |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | |
| 34 | 34 | #define MEDIA_BUS_FMT_FIXED 0x0001 |
| 35 | 35 | |
| 36 | −/* RGB - next is 0x1018 */ | |
| 36 | +/* RGB - next is 0x101b */ | |
| 37 | 37 | #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 |
| 38 | 38 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 |
| 39 | 39 | #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 |
| @@ -57,8 +57,11 @@ · 17 unmodified lines | ||
| 57 | 57 | #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 |
| 58 | 58 | #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d |
| 59 | 59 | #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f |
| 60 | +#define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 | |
| 61 | +#define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 | |
| 62 | +#define MEDIA_BUS_FMT_RGB161616_1X48 0x101a | |
| 60 | 63 | |
| 61 | −/* YUV (including grey) - next is 0x2026 */ | |
| 64 | +/* YUV (including grey) - next is 0x202c */ | |
| 62 | 65 | #define MEDIA_BUS_FMT_Y8_1X8 0x2001 |
| 63 | 66 | #define MEDIA_BUS_FMT_UV8_1X8 0x2015 |
| 64 | 67 | #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 |
| @@ -90,12 +93,18 @@ · 25 unmodified lines | ||
| 90 | 93 | #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e |
| 91 | 94 | #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 |
| 92 | 95 | #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 |
| 96 | +#define MEDIA_BUS_FMT_UYYVYY8_0_5X24 0x2026 | |
| 93 | 97 | #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 |
| 94 | 98 | #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 |
| 95 | 99 | #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 |
| 96 | 100 | #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 |
| 97 | 101 | #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 |
| 102 | +#define MEDIA_BUS_FMT_UYYVYY10_0_5X30 0x2027 | |
| 98 | 103 | #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 |
| 104 | +#define MEDIA_BUS_FMT_UYYVYY12_0_5X36 0x2028 | |
| 105 | +#define MEDIA_BUS_FMT_YUV12_1X36 0x2029 | |
| 106 | +#define MEDIA_BUS_FMT_YUV16_1X48 0x202a | |
| 107 | +#define MEDIA_BUS_FMT_UYYVYY16_0_5X48 0x202b | |
| 99 | 108 | |
| 100 | 109 | /* Bayer - next is 0x3021 */ |
| 101 | 110 | #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 |