diff options
author | Daniel Vetter | 2016-03-30 08:39:12 -0500 |
---|---|---|
committer | Daniel Vetter | 2016-04-12 06:15:49 -0500 |
commit | 268ae7cae5afd76462c3ef14ed9021a2d40c2e57 (patch) | |
tree | 448c5bfb3ce1309f988f2eadb36753e85464591f /include | |
parent | f37b9a8edded6f3ceb973eb05d184125b5c6297d (diff) | |
download | external-libdrm-268ae7cae5afd76462c3ef14ed9021a2d40c2e57.tar.gz external-libdrm-268ae7cae5afd76462c3ef14ed9021a2d40c2e57.tar.xz external-libdrm-268ae7cae5afd76462c3ef14ed9021a2d40c2e57.zip |
headers: Update drm_fourcc.h
Only real difference is switching to kernel types for fixed-width
integers, like we should.
Generated fromd drm-misc commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_fourcc.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h index e741b09a..4d8da699 100644 --- a/include/drm/drm_fourcc.h +++ b/include/drm/drm_fourcc.h | |||
@@ -24,16 +24,23 @@ | |||
24 | #ifndef DRM_FOURCC_H | 24 | #ifndef DRM_FOURCC_H |
25 | #define DRM_FOURCC_H | 25 | #define DRM_FOURCC_H |
26 | 26 | ||
27 | #include <inttypes.h> | 27 | #include "drm.h" |
28 | 28 | ||
29 | #define fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \ | 29 | #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ |
30 | ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24)) | 30 | ((__u32)(c) << 16) | ((__u32)(d) << 24)) |
31 | 31 | ||
32 | #define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ | 32 | #define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ |
33 | 33 | ||
34 | /* color index */ | 34 | /* color index */ |
35 | #define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ | 35 | #define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ |
36 | 36 | ||
37 | /* 8 bpp Red */ | ||
38 | #define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */ | ||
39 | |||
40 | /* 16 bpp RG */ | ||
41 | #define DRM_FORMAT_RG88 fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */ | ||
42 | #define DRM_FORMAT_GR88 fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */ | ||
43 | |||
37 | /* 8 bpp RGB */ | 44 | /* 8 bpp RGB */ |
38 | #define DRM_FORMAT_RGB332 fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */ | 45 | #define DRM_FORMAT_RGB332 fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */ |
39 | #define DRM_FORMAT_BGR233 fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */ | 46 | #define DRM_FORMAT_BGR233 fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */ |
@@ -106,6 +113,8 @@ | |||
106 | #define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ | 113 | #define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ |
107 | #define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ | 114 | #define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ |
108 | #define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ | 115 | #define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ |
116 | #define DRM_FORMAT_NV24 fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */ | ||
117 | #define DRM_FORMAT_NV42 fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */ | ||
109 | 118 | ||
110 | /* | 119 | /* |
111 | * 3 plane YCbCr | 120 | * 3 plane YCbCr |
@@ -216,7 +225,7 @@ | |||
216 | * - multiple of 128 pixels for the width | 225 | * - multiple of 128 pixels for the width |
217 | * - multiple of 32 pixels for the height | 226 | * - multiple of 32 pixels for the height |
218 | * | 227 | * |
219 | * For more information: see http://linuxtv.org/downloads/v4l-dvb-apis/re32.html | 228 | * For more information: see https://linuxtv.org/downloads/v4l-dvb-apis/re32.html |
220 | */ | 229 | */ |
221 | #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) | 230 | #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) |
222 | 231 | ||