Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull new experimental media request API from Mauro Carvalho Chehab:
 "A new media request API

  This API is needed to support device drivers that can dynamically
  change their parameters for each new frame. The latest versions of
  Google camera and codec HAL depends on such feature.

  At this stage, it supports only stateless codecs.

  It has been discussed for a long time (at least over the last 3-4
  years), and we finally reached to something that seem to work.

  This series contain both the API and core changes required to support
  it and a new m2m decoder driver (cedrus).

  As the current API is still experimental, the only real driver using
  it (cedrus) was added at staging[1]. We intend to keep it there for a
  while, in order to test the API. Only when we're sure that this API
  works for other cases (like encoders), we'll move this driver out of
  staging and set the API into a stone.

  [1] We added support for the vivid virtual driver (used only for
  testing) to it too, as it makes easier to test the API for the ones
  that don't have the cedrus hardware"

* tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (53 commits)
  media: dt-bindings: Document the Rockchip VPU bindings
  media: platform: Add Cedrus VPU decoder driver
  media: dt-bindings: media: Document bindings for the Cedrus VPU driver
  media: v4l: Add definition for the Sunxi tiled NV12 format
  media: v4l: Add definitions for MPEG-2 slice format and metadata
  media: videobuf2-core: Rework and rename helper for request buffer count
  media: v4l2-ctrls.c: initialize an error return code with zero
  media: v4l2-compat-ioctl32.c: add missing documentation for a field
  media: media-request: update documentation
  media: media-request: EPERM -> EACCES/EBUSY
  media: v4l2-ctrls: improve media_request_(un)lock_for_update
  media: v4l2-ctrls: use media_request_(un)lock_for_access
  media: media-request: add media_request_(un)lock_for_access
  media: vb2: set reqbufs/create_bufs capabilities
  media: videodev2.h: add new capabilities for buffer types
  media: buffer.rst: only set V4L2_BUF_FLAG_REQUEST_FD for QBUF
  media: v4l2-ctrls: return -EACCES if request wasn't completed
  media: media-request: return -EINVAL for invalid request_fds
  media: vivid: add request support
  media: vivid: add mc
  ...

3 files changed, 102 insertions, 4 deletions

diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 36f76e777ef9..e5d0c5c611b5 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -369,6 +369,14 @@ struct media_v2_topology {
 #define MEDIA_IOC_ENUM_LINKS    _IOWR('|', 0x02, struct media_links_enum)
 #define MEDIA_IOC_SETUP_LINK    _IOWR('|', 0x03, struct media_link_desc)
 #define MEDIA_IOC_G_TOPOLOGY    _IOWR('|', 0x04, struct media_v2_topology)
+#define MEDIA_IOC_REQUEST_ALLOC _IOR ('|', 0x05, int)
+
+/*
+ * These ioctls are called on the request file descriptor as returned
+ * by MEDIA_IOC_REQUEST_ALLOC.
+ */
+#define MEDIA_REQUEST_IOC_QUEUE         _IO('|',  0x80)
+#define MEDIA_REQUEST_IOC_REINIT        _IO('|',  0x81)
 
 #ifndef __KERNEL__
 
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index e4ee10ee917d..51b095898f4b 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -402,6 +402,9 @@ enum v4l2_mpeg_video_multi_slice_mode {
 #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE           (V4L2_CID_MPEG_BASE+228)
 #define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME             (V4L2_CID_MPEG_BASE+229)
 
+#define V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS          (V4L2_CID_MPEG_BASE+250)
+#define V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION          (V4L2_CID_MPEG_BASE+251)
+
 #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP             (V4L2_CID_MPEG_BASE+300)
 #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP             (V4L2_CID_MPEG_BASE+301)
 #define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP             (V4L2_CID_MPEG_BASE+302)
@@ -1092,4 +1095,66 @@ enum v4l2_detect_md_mode {
 #define V4L2_CID_DETECT_MD_THRESHOLD_GRID       (V4L2_CID_DETECT_CLASS_BASE + 3)
 #define V4L2_CID_DETECT_MD_REGION_GRID          (V4L2_CID_DETECT_CLASS_BASE + 4)
 
+#define V4L2_MPEG2_PICTURE_CODING_TYPE_I        1
+#define V4L2_MPEG2_PICTURE_CODING_TYPE_P        2
+#define V4L2_MPEG2_PICTURE_CODING_TYPE_B        3
+#define V4L2_MPEG2_PICTURE_CODING_TYPE_D        4
+
+struct v4l2_mpeg2_sequence {
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence header */
+        __u16   horizontal_size;
+        __u16   vertical_size;
+        __u32   vbv_buffer_size;
+
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Sequence extension */
+        __u8    profile_and_level_indication;
+        __u8    progressive_sequence;
+        __u8    chroma_format;
+};
+
+struct v4l2_mpeg2_picture {
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture header */
+        __u8    picture_coding_type;
+
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Picture coding extension */
+        __u8    f_code[2][2];
+        __u8    intra_dc_precision;
+        __u8    picture_structure;
+        __u8    top_field_first;
+        __u8    frame_pred_frame_dct;
+        __u8    concealment_motion_vectors;
+        __u8    q_scale_type;
+        __u8    intra_vlc_format;
+        __u8    alternate_scan;
+        __u8    repeat_first_field;
+        __u8    progressive_frame;
+};
+
+struct v4l2_ctrl_mpeg2_slice_params {
+        __u32   bit_size;
+        __u32   data_bit_offset;
+
+        struct v4l2_mpeg2_sequence sequence;
+        struct v4l2_mpeg2_picture picture;
+
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Slice */
+        __u8    quantiser_scale_code;
+
+        __u8    backward_ref_index;
+        __u8    forward_ref_index;
+};
+
+struct v4l2_ctrl_mpeg2_quantization {
+        /* ISO/IEC 13818-2, ITU-T Rec. H.262: Quant matrix extension */
+        __u8    load_intra_quantiser_matrix;
+        __u8    load_non_intra_quantiser_matrix;
+        __u8    load_chroma_intra_quantiser_matrix;
+        __u8    load_chroma_non_intra_quantiser_matrix;
+
+        __u8    intra_quantiser_matrix[64];
+        __u8    non_intra_quantiser_matrix[64];
+        __u8    chroma_intra_quantiser_matrix[64];
+        __u8    chroma_non_intra_quantiser_matrix[64];
+};
+
 #endif
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 29729d580452..c8e8ff810190 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -646,6 +646,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_H263     v4l2_fourcc('H', '2', '6', '3') /* H263          */
 #define V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
 #define V4L2_PIX_FMT_MPEG2    v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES     */
+#define V4L2_PIX_FMT_MPEG2_SLICE v4l2_fourcc('M', 'G', '2', 'S') /* MPEG-2 parsed slice data */
 #define V4L2_PIX_FMT_MPEG4    v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
 #define V4L2_PIX_FMT_XVID     v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid           */
 #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
@@ -687,6 +688,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
 #define V4L2_PIX_FMT_MT21C    v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode  */
 #define V4L2_PIX_FMT_INZI     v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */
+#define V4L2_PIX_FMT_SUNXI_TILED_NV12 v4l2_fourcc('S', 'T', '1', '2') /* Sunxi Tiled NV12 Format */
 
 /* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
 #define V4L2_PIX_FMT_IPU3_SBGGR10       v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
@@ -868,9 +870,16 @@ struct v4l2_requestbuffers {
         __u32                   count;
         __u32                   type;           /* enum v4l2_buf_type */
         __u32                   memory;         /* enum v4l2_memory */
-        __u32                   reserved[2];
+        __u32                   capabilities;
+        __u32                   reserved[1];
 };
 
+/* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
+#define V4L2_BUF_CAP_SUPPORTS_MMAP      (1 << 0)
+#define V4L2_BUF_CAP_SUPPORTS_USERPTR   (1 << 1)
+#define V4L2_BUF_CAP_SUPPORTS_DMABUF    (1 << 2)
+#define V4L2_BUF_CAP_SUPPORTS_REQUESTS  (1 << 3)
+
 /**
  * struct v4l2_plane - plane info for multi-planar buffers
  * @bytesused:          number of bytes occupied by data in the plane (payload)
@@ -929,6 +938,7 @@ struct v4l2_plane {
  * @length:     size in bytes of the buffer (NOT its payload) for single-plane
  *              buffers (when type != *_MPLANE); number of elements in the
  *              planes array for multi-plane buffers
+ * @request_fd: fd of the request that this buffer should use
  *
  * Contains data exchanged by application and driver using one of the Streaming
  * I/O methods.
@@ -953,7 +963,10 @@ struct v4l2_buffer {
         } m;
         __u32                   length;
         __u32                   reserved2;
-        __u32                   reserved;
+        union {
+                __s32           request_fd;
+                __u32           reserved;
+        };
 };
 
 /*  Flags for 'flags' field */
@@ -971,6 +984,8 @@ struct v4l2_buffer {
 #define V4L2_BUF_FLAG_BFRAME                    0x00000020
 /* Buffer is ready, but the data contained within is corrupted. */
 #define V4L2_BUF_FLAG_ERROR                     0x00000040
+/* Buffer is added to an unqueued request */
+#define V4L2_BUF_FLAG_IN_REQUEST                0x00000080
 /* timecode field is valid */
 #define V4L2_BUF_FLAG_TIMECODE                  0x00000100
 /* Buffer is prepared for queuing */
@@ -989,6 +1004,8 @@ struct v4l2_buffer {
 #define V4L2_BUF_FLAG_TSTAMP_SRC_SOE            0x00010000
 /* mem2mem encoder/decoder */
 #define V4L2_BUF_FLAG_LAST                      0x00100000
+/* request_fd is valid */
+#define V4L2_BUF_FLAG_REQUEST_FD                0x00800000
 
 /**
  * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor
@@ -1605,6 +1622,8 @@ struct v4l2_ext_control {
                 __u8 __user *p_u8;
                 __u16 __user *p_u16;
                 __u32 __user *p_u32;
+                struct v4l2_ctrl_mpeg2_slice_params __user *p_mpeg2_slice_params;
+                struct v4l2_ctrl_mpeg2_quantization __user *p_mpeg2_quantization;
                 void __user *ptr;
         };
 } __attribute__ ((packed));
@@ -1618,7 +1637,8 @@ struct v4l2_ext_controls {
         };
         __u32 count;
         __u32 error_idx;
-        __u32 reserved[2];
+        __s32 request_fd;
+        __u32 reserved[1];
         struct v4l2_ext_control *controls;
 };
 
@@ -1631,6 +1651,7 @@ struct v4l2_ext_controls {
 #define V4L2_CTRL_MAX_DIMS        (4)
 #define V4L2_CTRL_WHICH_CUR_VAL   0
 #define V4L2_CTRL_WHICH_DEF_VAL   0x0f000000
+#define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000
 
 enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_INTEGER       = 1,
@@ -1648,6 +1669,8 @@ enum v4l2_ctrl_type {
         V4L2_CTRL_TYPE_U8            = 0x0100,
         V4L2_CTRL_TYPE_U16           = 0x0101,
         V4L2_CTRL_TYPE_U32           = 0x0102,
+        V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS = 0x0103,
+        V4L2_CTRL_TYPE_MPEG2_QUANTIZATION = 0x0104,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
@@ -2321,6 +2344,7 @@ struct v4l2_dbg_chip_info {
  *              return: number of created buffers
  * @memory:     enum v4l2_memory; buffer memory type
  * @format:     frame format, for which buffers are requested
+ * @capabilities: capabilities of this buffer type.
  * @reserved:   future extensions
  */
 struct v4l2_create_buffers {
@@ -2328,7 +2352,8 @@ struct v4l2_create_buffers {
         __u32                   count;
         __u32                   memory;
         struct v4l2_format      format;
-        __u32                   reserved[8];
+        __u32                   capabilities;
+        __u32                   reserved[7];
 };
 
 /*