diff options
author | Jonathan Corbet <corbet@lwn.net> | 2017-06-23 16:00:13 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-06-26 05:07:25 -0400 |
commit | 38cb266ad1a24e037220dc563ab46364595b17b6 (patch) | |
tree | 9aea62104b98f6bf258bf4666cf2b06172d9ee41 | |
parent | e6f0acb2f0da89625aefc84b448f457b9161436b (diff) |
DRM: Fix an incorrectly formatted table
The "supported input formats" table in dw_hdmi.h was incorrectly formatted,
using "+" signs where "|" needs to be. That, in turn, causes the PDF build
to fail.
Fixes: def23aa7e982 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings")
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170623140013.0703107a@lwn.net
-rw-r--r-- | include/drm/bridge/dw_hdmi.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index 4c8d4c81a0e8..182f83283e24 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h | |||
@@ -22,56 +22,56 @@ struct dw_hdmi; | |||
22 | * 48bit bus. | 22 | * 48bit bus. |
23 | * | 23 | * |
24 | * +----------------------+----------------------------------+------------------------------+ | 24 | * +----------------------+----------------------------------+------------------------------+ |
25 | * + Format Name + Format Code + Encodings + | 25 | * | Format Name | Format Code | Encodings | |
26 | * +----------------------+----------------------------------+------------------------------+ | 26 | * +----------------------+----------------------------------+------------------------------+ |
27 | * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + | 27 | * | RGB 4:4:4 8bit | ``MEDIA_BUS_FMT_RGB888_1X24`` | ``V4L2_YCBCR_ENC_DEFAULT`` | |
28 | * +----------------------+----------------------------------+------------------------------+ | 28 | * +----------------------+----------------------------------+------------------------------+ |
29 | * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30`` + ``V4L2_YCBCR_ENC_DEFAULT`` + | 29 | * | RGB 4:4:4 10bits | ``MEDIA_BUS_FMT_RGB101010_1X30`` | ``V4L2_YCBCR_ENC_DEFAULT`` | |
30 | * +----------------------+----------------------------------+------------------------------+ | 30 | * +----------------------+----------------------------------+------------------------------+ |
31 | * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36`` + ``V4L2_YCBCR_ENC_DEFAULT`` + | 31 | * | RGB 4:4:4 12bits | ``MEDIA_BUS_FMT_RGB121212_1X36`` | ``V4L2_YCBCR_ENC_DEFAULT`` | |
32 | * +----------------------+----------------------------------+------------------------------+ | 32 | * +----------------------+----------------------------------+------------------------------+ |
33 | * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48`` + ``V4L2_YCBCR_ENC_DEFAULT`` + | 33 | * | RGB 4:4:4 16bits | ``MEDIA_BUS_FMT_RGB161616_1X48`` | ``V4L2_YCBCR_ENC_DEFAULT`` | |
34 | * +----------------------+----------------------------------+------------------------------+ | 34 | * +----------------------+----------------------------------+------------------------------+ |
35 | * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + | 35 | * | YCbCr 4:4:4 8bit | ``MEDIA_BUS_FMT_YUV8_1X24`` | ``V4L2_YCBCR_ENC_601`` | |
36 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 36 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
37 | * + + + or ``V4L2_YCBCR_ENC_XV601`` + | 37 | * | | | or ``V4L2_YCBCR_ENC_XV601`` | |
38 | * + + + or ``V4L2_YCBCR_ENC_XV709`` + | 38 | * | | | or ``V4L2_YCBCR_ENC_XV709`` | |
39 | * +----------------------+----------------------------------+------------------------------+ | 39 | * +----------------------+----------------------------------+------------------------------+ |
40 | * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + | 40 | * | YCbCr 4:4:4 10bits | ``MEDIA_BUS_FMT_YUV10_1X30`` | ``V4L2_YCBCR_ENC_601`` | |
41 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 41 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
42 | * + + + or ``V4L2_YCBCR_ENC_XV601`` + | 42 | * | | | or ``V4L2_YCBCR_ENC_XV601`` | |
43 | * + + + or ``V4L2_YCBCR_ENC_XV709`` + | 43 | * | | | or ``V4L2_YCBCR_ENC_XV709`` | |
44 | * +----------------------+----------------------------------+------------------------------+ | 44 | * +----------------------+----------------------------------+------------------------------+ |
45 | * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + | 45 | * | YCbCr 4:4:4 12bits | ``MEDIA_BUS_FMT_YUV12_1X36`` | ``V4L2_YCBCR_ENC_601`` | |
46 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 46 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
47 | * + + + or ``V4L2_YCBCR_ENC_XV601`` + | 47 | * | | | or ``V4L2_YCBCR_ENC_XV601`` | |
48 | * + + + or ``V4L2_YCBCR_ENC_XV709`` + | 48 | * | | | or ``V4L2_YCBCR_ENC_XV709`` | |
49 | * +----------------------+----------------------------------+------------------------------+ | 49 | * +----------------------+----------------------------------+------------------------------+ |
50 | * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + | 50 | * | YCbCr 4:4:4 16bits | ``MEDIA_BUS_FMT_YUV16_1X48`` | ``V4L2_YCBCR_ENC_601`` | |
51 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 51 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
52 | * + + + or ``V4L2_YCBCR_ENC_XV601`` + | 52 | * | | | or ``V4L2_YCBCR_ENC_XV601`` | |
53 | * + + + or ``V4L2_YCBCR_ENC_XV709`` + | 53 | * | | | or ``V4L2_YCBCR_ENC_XV709`` | |
54 | * +----------------------+----------------------------------+------------------------------+ | 54 | * +----------------------+----------------------------------+------------------------------+ |
55 | * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + | 55 | * | YCbCr 4:2:2 8bit | ``MEDIA_BUS_FMT_UYVY8_1X16`` | ``V4L2_YCBCR_ENC_601`` | |
56 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 56 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
57 | * +----------------------+----------------------------------+------------------------------+ | 57 | * +----------------------+----------------------------------+------------------------------+ |
58 | * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + | 58 | * | YCbCr 4:2:2 10bits | ``MEDIA_BUS_FMT_UYVY10_1X20`` | ``V4L2_YCBCR_ENC_601`` | |
59 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 59 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
60 | * +----------------------+----------------------------------+------------------------------+ | 60 | * +----------------------+----------------------------------+------------------------------+ |
61 | * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + | 61 | * | YCbCr 4:2:2 12bits | ``MEDIA_BUS_FMT_UYVY12_1X24`` | ``V4L2_YCBCR_ENC_601`` | |
62 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 62 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
63 | * +----------------------+----------------------------------+------------------------------+ | 63 | * +----------------------+----------------------------------+------------------------------+ |
64 | * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYYVYY8_0_5X24`` + ``V4L2_YCBCR_ENC_601`` + | 64 | * | YCbCr 4:2:0 8bit | ``MEDIA_BUS_FMT_UYYVYY8_0_5X24`` | ``V4L2_YCBCR_ENC_601`` | |
65 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 65 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
66 | * +----------------------+----------------------------------+------------------------------+ | 66 | * +----------------------+----------------------------------+------------------------------+ |
67 | * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYYVYY10_0_5X30``+ ``V4L2_YCBCR_ENC_601`` + | 67 | * | YCbCr 4:2:0 10bits | ``MEDIA_BUS_FMT_UYYVYY10_0_5X30``| ``V4L2_YCBCR_ENC_601`` | |
68 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 68 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
69 | * +----------------------+----------------------------------+------------------------------+ | 69 | * +----------------------+----------------------------------+------------------------------+ |
70 | * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYYVYY12_0_5X36``+ ``V4L2_YCBCR_ENC_601`` + | 70 | * | YCbCr 4:2:0 12bits | ``MEDIA_BUS_FMT_UYYVYY12_0_5X36``| ``V4L2_YCBCR_ENC_601`` | |
71 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 71 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
72 | * +----------------------+----------------------------------+------------------------------+ | 72 | * +----------------------+----------------------------------+------------------------------+ |
73 | * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYYVYY16_0_5X48``+ ``V4L2_YCBCR_ENC_601`` + | 73 | * | YCbCr 4:2:0 16bits | ``MEDIA_BUS_FMT_UYYVYY16_0_5X48``| ``V4L2_YCBCR_ENC_601`` | |
74 | * + + + or ``V4L2_YCBCR_ENC_709`` + | 74 | * | | | or ``V4L2_YCBCR_ENC_709`` | |
75 | * +----------------------+----------------------------------+------------------------------+ | 75 | * +----------------------+----------------------------------+------------------------------+ |
76 | */ | 76 | */ |
77 | 77 | ||