Pull media updates from Mauro Carvalho Chehab: - New driver for SK Hynix Hi-846 8M pixel camera - New driver for the ov13b10 camera - New driver for Renesas R-Car ISP - mtk-vcodec gained support for version 2 of decoder firmware ABI - The legacy sir_ir driver got removed - videobuf2: the vb2_mem_ops kAPI had some improvements - lots of cleanups, fixes and new features at device drivers * tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (328 commits) media: venus: core: Add sdm660 DT compatible and resource struct media: dt-bindings: media: venus: Add sdm660 dt schema media: venus: vdec: decoded picture buffer handling during reconfig sequence media: venus: Handle fatal errors during encoding and decoding media: venus: helpers: Add helper to mark fatal vb2 error media: venus: hfi: Check for sys error on session hfi functions media: venus: Make sys_error flag an atomic bitops media: venus: venc: Use pmruntime autosuspend media: allegro: write vui parameters for HEVC media: allegro: nal-hevc: implement generator for vui media: allegro: write correct colorspace into SPS media: allegro: extract nal value lookup functions to header media: allegro: correctly scale the bit rate in SPS media: allegro: remove external QP table media: allegro: fix row and column in response message media: allegro: add control to disable encoder buffer media: allegro: add encoder buffer support media: allegro: add pm_runtime support media: allegro: lookup VCU settings media: allegro: fix module removal if initialization failed ...
Showing the changes to include/uapi/linux (2 of 341 files). Show all
Unified · Split
| @@ -211,6 +211,11 @@ enum v4l2_colorfx { · 210 unmodified lines | ||
| 211 | 211 | * We reserve 128 controls for this driver. |
| 212 | 212 | */ |
| 213 | 213 | #define V4L2_CID_USER_CCS_BASE (V4L2_CID_USER_BASE + 0x10f0) |
| 214 | +/* | |
| 215 | + * The base for Allegro driver controls. | |
| 216 | + * We reserve 16 controls for this driver. | |
| 217 | + */ | |
| 218 | +#define V4L2_CID_USER_ALLEGRO_BASE (V4L2_CID_USER_BASE + 0x1170) | |
| 214 | 219 | |
| 215 | 220 | /* MPEG-class control IDs */ |
| 216 | 221 | /* The MPEG controls are applicable to all codec controls |
| @@ -1118,6 +1123,7 @@ enum v4l2_jpeg_chroma_subsampling { · 901 unmodified lines | ||
| 1118 | 1123 | #define V4L2_CID_TEST_PATTERN_BLUE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6) |
| 1119 | 1124 | #define V4L2_CID_TEST_PATTERN_GREENB (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7) |
| 1120 | 1125 | #define V4L2_CID_UNIT_CELL_SIZE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 8) |
| 1126 | +#define V4L2_CID_NOTIFY_GAINS (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 9) | |
| 1121 | 1127 | |
| 1122 | 1128 | |
| 1123 | 1129 | /* Image processing controls */ |
| @@ -601,15 +601,12 @@ struct v4l2_pix_format { · 600 unmodified lines | ||
| 601 | 601 | #define V4L2_PIX_FMT_NV61 v4l2_fourcc('N', 'V', '6', '1') /* 16 Y/CrCb 4:2:2 */ |
| 602 | 602 | #define V4L2_PIX_FMT_NV24 v4l2_fourcc('N', 'V', '2', '4') /* 24 Y/CbCr 4:4:4 */ |
| 603 | 603 | #define V4L2_PIX_FMT_NV42 v4l2_fourcc('N', 'V', '4', '2') /* 24 Y/CrCb 4:4:4 */ |
| 604 | −#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */ | |
| 605 | 604 | |
| 606 | 605 | /* two non contiguous planes - one Y, one Cr + Cb interleaved */ |
| 607 | 606 | #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ |
| 608 | 607 | #define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ |
| 609 | 608 | #define V4L2_PIX_FMT_NV16M v4l2_fourcc('N', 'M', '1', '6') /* 16 Y/CbCr 4:2:2 */ |
| 610 | 609 | #define V4L2_PIX_FMT_NV61M v4l2_fourcc('N', 'M', '6', '1') /* 16 Y/CrCb 4:2:2 */ |
| 611 | −#define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ | |
| 612 | −#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 macroblocks */ | |
| 613 | 610 | |
| 614 | 611 | /* three planes - Y Cb, Cr */ |
| 615 | 612 | #define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0 */ |
| @@ -627,6 +624,15 @@ struct v4l2_pix_format { · 11 unmodified lines | ||
| 627 | 624 | #define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24 YUV444 planar */ |
| 628 | 625 | #define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24 YVU444 planar */ |
| 629 | 626 | |
| 627 | +/* Tiled YUV formats */ | |
| 628 | +#define V4L2_PIX_FMT_NV12_4L4 v4l2_fourcc('V', 'T', '1', '2') /* 12 Y/CbCr 4:2:0 4x4 tiles */ | |
| 629 | +#define V4L2_PIX_FMT_NV12_16L16 v4l2_fourcc('H', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 tiles */ | |
| 630 | +#define V4L2_PIX_FMT_NV12_32L32 v4l2_fourcc('S', 'T', '1', '2') /* 12 Y/CbCr 4:2:0 32x32 tiles */ | |
| 631 | + | |
| 632 | +/* Tiled YUV formats, non contiguous planes */ | |
| 633 | +#define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 tiles */ | |
| 634 | +#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 tiles */ | |
| 635 | + | |
| 630 | 636 | /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */ |
| 631 | 637 | #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ |
| 632 | 638 | #define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ |
| @@ -733,8 +739,8 @@ struct v4l2_pix_format { · 100 unmodified lines | ||
| 733 | 739 | #define V4L2_PIX_FMT_Y12I v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */ |
| 734 | 740 | #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */ |
| 735 | 741 | #define V4L2_PIX_FMT_MT21C v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode */ |
| 742 | +#define V4L2_PIX_FMT_MM21 v4l2_fourcc('M', 'M', '2', '1') /* Mediatek 8-bit block mode, two non-contiguous planes */ | |
| 736 | 743 | #define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */ |
| 737 | −#define V4L2_PIX_FMT_SUNXI_TILED_NV12 v4l2_fourcc('S', 'T', '1', '2') /* Sunxi Tiled NV12 Format */ | |
| 738 | 744 | #define V4L2_PIX_FMT_CNF4 v4l2_fourcc('C', 'N', 'F', '4') /* Intel 4-bit packed depth confidence information */ |
| 739 | 745 | #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */ |
| 740 | 746 | |
| @@ -953,9 +959,12 @@ struct v4l2_requestbuffers { · 212 unmodified lines | ||
| 953 | 959 | __u32 type; /* enum v4l2_buf_type */ |
| 954 | 960 | __u32 memory; /* enum v4l2_memory */ |
| 955 | 961 | __u32 capabilities; |
| 956 | − __u32 reserved[1]; | |
| 962 | + __u8 flags; | |
| 963 | + __u8 reserved[3]; | |
| 957 | 964 | }; |
| 958 | 965 | |
| 966 | +#define V4L2_MEMORY_FLAG_NON_COHERENT (1 << 0) | |
| 967 | + | |
| 959 | 968 | /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */ |
| 960 | 969 | #define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0) |
| 961 | 970 | #define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1) |
| @@ -2499,6 +2508,9 @@ struct v4l2_dbg_chip_info { · 1537 unmodified lines | ||
| 2499 | 2508 | * @memory: enum v4l2_memory; buffer memory type |
| 2500 | 2509 | * @format: frame format, for which buffers are requested |
| 2501 | 2510 | * @capabilities: capabilities of this buffer type. |
| 2511 | + * @flags: additional buffer management attributes (ignored unless the | |
| 2512 | + * queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability | |
| 2513 | + * and configured for MMAP streaming I/O). | |
| 2502 | 2514 | * @reserved: future extensions |
| 2503 | 2515 | */ |
| 2504 | 2516 | struct v4l2_create_buffers { |
| @@ -2507,7 +2519,8 @@ struct v4l2_create_buffers { · 2 unmodified lines | ||
| 2507 | 2519 | __u32 memory; |
| 2508 | 2520 | struct v4l2_format format; |
| 2509 | 2521 | __u32 capabilities; |
| 2510 | − __u32 reserved[7]; | |
| 2522 | + __u32 flags; | |
| 2523 | + __u32 reserved[6]; | |
| 2511 | 2524 | }; |
| 2512 | 2525 | |
| 2513 | 2526 | /* |
| @@ -2615,4 +2628,10 @@ struct v4l2_create_buffers { · 101 unmodified lines | ||
| 2615 | 2628 | |
| 2616 | 2629 | #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */ |
| 2617 | 2630 | |
| 2631 | +/* Deprecated definitions kept for backwards compatibility */ | |
| 2632 | +#ifndef __KERNEL__ | |
| 2633 | +#define V4L2_PIX_FMT_HM12 V4L2_PIX_FMT_NV12_16L16 | |
| 2634 | +#define V4L2_PIX_FMT_SUNXI_TILED_NV12 V4L2_PIX_FMT_NV12_32L32 | |
| 2635 | +#endif | |
| 2636 | + | |
| 2618 | 2637 | #endif /* _UAPI__LINUX_VIDEODEV2_H */ |