History

Merge tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc into drm-next

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 ...

Dave Airlie committed 9 years ago

Commit df45eac2 parents b769fef c98cdff133 files · +7077 −3010Browse files

Showing the changes to include/uapi/linux (1 of 133 files). Show all

Unified · Split

include/uapi/linux/media-bus-format.h+11−2
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333
3434 #define MEDIA_BUS_FMT_FIXED 0x0001
3535
36−/* RGB - next is 0x1018 */
36+/* RGB - next is 0x101b */
3737 #define MEDIA_BUS_FMT_RGB444_1X12 0x1016
3838 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001
3939 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002
@@ -57,8 +57,11 @@ · 17 unmodified lines
5757 #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012
5858 #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d
5959 #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
6063
61−/* YUV (including grey) - next is 0x2026 */
64+/* YUV (including grey) - next is 0x202c */
6265 #define MEDIA_BUS_FMT_Y8_1X8 0x2001
6366 #define MEDIA_BUS_FMT_UV8_1X8 0x2015
6467 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002
@@ -90,12 +93,18 @@ · 25 unmodified lines
9093 #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
9194 #define MEDIA_BUS_FMT_VUY8_1X24 0x2024
9295 #define MEDIA_BUS_FMT_YUV8_1X24 0x2025
96+#define MEDIA_BUS_FMT_UYYVYY8_0_5X24 0x2026
9397 #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020
9498 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021
9599 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022
96100 #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023
97101 #define MEDIA_BUS_FMT_YUV10_1X30 0x2016
102+#define MEDIA_BUS_FMT_UYYVYY10_0_5X30 0x2027
98103 #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
99108
100109 /* Bayer - next is 0x3021 */
101110 #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001