History

Merge tag 'imx-drm-next-2015-03-31' of git://git.pengutronix.de/git/pza/linux into drm-next

imx-drm changes to use media bus formats and LDB drm_panel support - Add media bus formats needed by imx-drm - Switch to use media bus formats to describe the pixel format on the internal parallel bus between display interface and encoders - Some preparations for TV Output via TVEv2 on i.MX5 - Add drm_panel support to the i.MX LVDS driver, allow to determine the bus pixel format from the panel descriptor. * tag 'imx-drm-next-2015-03-31' of git://git.pengutronix.de/git/pza/linux: drm/imx: imx-ldb: allow to determine bus format from the connected panel drm/imx: imx-ldb: reset display clock input when disabling LVDS drm/imx: imx-ldb: add drm_panel support drm/imx: consolidate bus format variable names drm/imx: switch to use media bus formats Add RGB666_1X24_CPADHI media bus format Add YUV8_1X24 media bus format Add BGR888_1X24 and GBR888_1X24 media bus formats Add LVDS RGB media bus formats Add RGB444_1X12 and RGB565_1X16 media bus formats drm/imx: ipuv3-crtc: Allow to divide DI clock from TVEv2 drm/imx: Add support for interlaced scanout

Dave Airlie committed 11 years ago

Commit 1d2add22 parents bb1dc08 5e501ed15 files · +668 −128Browse files

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

Unified · Split

include/uapi/linux/media-bus-format.h+11−2
@@ -33,22 +33,30 @@ · 32 unmodified lines
3333
3434 #define MEDIA_BUS_FMT_FIXED 0x0001
3535
36−/* RGB - next is 0x100e */
36+/* RGB - next is 0x1016 */
37+#define MEDIA_BUS_FMT_RGB444_1X12 0x100e
3738 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001
3839 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002
3940 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE 0x1003
4041 #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE 0x1004
42+#define MEDIA_BUS_FMT_RGB565_1X16 0x100f
4143 #define MEDIA_BUS_FMT_BGR565_2X8_BE 0x1005
4244 #define MEDIA_BUS_FMT_BGR565_2X8_LE 0x1006
4345 #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007
4446 #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008
4547 #define MEDIA_BUS_FMT_RGB666_1X18 0x1009
48+#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015
49+#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010
50+#define MEDIA_BUS_FMT_BGR888_1X24 0x1013
51+#define MEDIA_BUS_FMT_GBR888_1X24 0x1014
4652 #define MEDIA_BUS_FMT_RGB888_1X24 0x100a
4753 #define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b
4854 #define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c
55+#define MEDIA_BUS_FMT_RGB888_1X7X4_SPWG 0x1011
56+#define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012
4957 #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d
5058
51−/* YUV (including grey) - next is 0x2024 */
59+/* YUV (including grey) - next is 0x2025 */
5260 #define MEDIA_BUS_FMT_Y8_1X8 0x2001
5361 #define MEDIA_BUS_FMT_UV8_1X8 0x2015
5462 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002
@@ -74,6 +82,7 @@ · 19 unmodified lines
7482 #define MEDIA_BUS_FMT_VYUY10_1X20 0x201b
7583 #define MEDIA_BUS_FMT_YUYV10_1X20 0x200d
7684 #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e
85+#define MEDIA_BUS_FMT_YUV8_1X24 0x2024
7786 #define MEDIA_BUS_FMT_YUV10_1X30 0x2016
7887 #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
7988 #define MEDIA_BUS_FMT_UYVY12_2X12 0x201c