Pull media updates from Mauro Carvalho Chehab: - Legacy soc_camera driver was removed from staging - New I2C sensor related drivers: dw9768, ch7322, max9271, rdacm20 - TI vpe driver code was re-organized and had new features added - Added Xilinx MIPI CSI-2 Rx Subsystem driver - Added support for Infrared Toy and IR Droid devices - Lots of random driver fixes, new features and cleanups * tag 'media/v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (318 commits) media: camss: fix memory leaks on error handling paths in probe media: davinci: vpif_capture: fix potential double free media: radio: remove redundant assignment to variable retval media: allegro: fix potential null dereference on header media: mtk-mdp: Fix a refcounting bug on error in init media: allegro: fix an error pointer vs NULL check media: meye: fix missing pm_mchip_mode field media: cafe-driver: use generic power management media: saa7164: use generic power management media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP media: v4l2: Correct kernel-doc inconsistency media: v4l2: Correct kernel-doc inconsistency media: dvbdev.h: keep * together with the type media: v4l2-subdev.h: keep * together with the type media: videobuf2: Print videobuf2 buffer state by name media: colorspaces-details.rst: fix V4L2_COLORSPACE_JPEG description media: tw68: use generic power management media: meye: use generic power management media: cx88: use generic power management media: cx25821: use generic power management ...
Showing the changes to include/uapi (1 of 268 files). Show all
Unified · Split
| @@ -171,6 +171,8 @@ enum v4l2_buf_type { · 170 unmodified lines | ||
| 171 | 171 | || (type) == V4L2_BUF_TYPE_SDR_OUTPUT \ |
| 172 | 172 | || (type) == V4L2_BUF_TYPE_META_OUTPUT) |
| 173 | 173 | |
| 174 | +#define V4L2_TYPE_IS_CAPTURE(type) (!V4L2_TYPE_IS_OUTPUT(type)) | |
| 175 | + | |
| 174 | 176 | enum v4l2_tuner_type { |
| 175 | 177 | V4L2_TUNER_RADIO = 1, |
| 176 | 178 | V4L2_TUNER_ANALOG_TV = 2, |
| @@ -189,6 +191,8 @@ enum v4l2_memory { · 12 unmodified lines | ||
| 189 | 191 | V4L2_MEMORY_DMABUF = 4, |
| 190 | 192 | }; |
| 191 | 193 | |
| 194 | +#define V4L2_FLAG_MEMORY_NON_CONSISTENT (1 << 0) | |
| 195 | + | |
| 192 | 196 | /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ |
| 193 | 197 | enum v4l2_colorspace { |
| 194 | 198 | /* |
| @@ -792,6 +796,7 @@ struct v4l2_fmtdesc { · 597 unmodified lines | ||
| 792 | 796 | #define V4L2_FMT_FLAG_EMULATED 0x0002 |
| 793 | 797 | #define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004 |
| 794 | 798 | #define V4L2_FMT_FLAG_DYN_RESOLUTION 0x0008 |
| 799 | +#define V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL 0x0010 | |
| 795 | 800 | |
| 796 | 801 | /* Frame Size and frame rate enumeration */ |
| 797 | 802 | /* |
| @@ -944,7 +949,10 @@ struct v4l2_requestbuffers { · 146 unmodified lines | ||
| 944 | 949 | __u32 type; /* enum v4l2_buf_type */ |
| 945 | 950 | __u32 memory; /* enum v4l2_memory */ |
| 946 | 951 | __u32 capabilities; |
| 947 | − __u32 reserved[1]; | |
| 952 | + union { | |
| 953 | + __u32 flags; | |
| 954 | + __u32 reserved[1]; | |
| 955 | + }; | |
| 948 | 956 | }; |
| 949 | 957 | |
| 950 | 958 | /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */ |
| @@ -954,6 +962,7 @@ struct v4l2_requestbuffers { · 3 unmodified lines | ||
| 954 | 962 | #define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3) |
| 955 | 963 | #define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4) |
| 956 | 964 | #define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5) |
| 965 | +#define V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS (1 << 6) | |
| 957 | 966 | |
| 958 | 967 | /** |
| 959 | 968 | * struct v4l2_plane - plane info for multi-planar buffers |
| @@ -2447,6 +2456,9 @@ struct v4l2_dbg_chip_info { · 1487 unmodified lines | ||
| 2447 | 2456 | * @memory: enum v4l2_memory; buffer memory type |
| 2448 | 2457 | * @format: frame format, for which buffers are requested |
| 2449 | 2458 | * @capabilities: capabilities of this buffer type. |
| 2459 | + * @flags: additional buffer management attributes (ignored unless the | |
| 2460 | + * queue has V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS capability | |
| 2461 | + * and configured for MMAP streaming I/O). | |
| 2450 | 2462 | * @reserved: future extensions |
| 2451 | 2463 | */ |
| 2452 | 2464 | struct v4l2_create_buffers { |
| @@ -2455,7 +2467,8 @@ struct v4l2_create_buffers { · 2 unmodified lines | ||
| 2455 | 2467 | __u32 memory; |
| 2456 | 2468 | struct v4l2_format format; |
| 2457 | 2469 | __u32 capabilities; |
| 2458 | − __u32 reserved[7]; | |
| 2470 | + __u32 flags; | |
| 2471 | + __u32 reserved[6]; | |
| 2459 | 2472 | }; |
| 2460 | 2473 | |
| 2461 | 2474 | /* |