Pull media fixes from Mauro Carvalho Chehab: - fix a regression at the CEC adapter core - two uAPI patches (one revert) for changes in this development cycle * tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: dt-bindings: media: imx274: Convert to json-schema media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag media: cec-adap.c: don't use flush_scheduled_work()
Showing the changes to include/uapi/linux (1 of 16 files). Show all
Unified · Split
| @@ -191,8 +191,6 @@ enum v4l2_memory { · 190 unmodified lines | |||
| 191 | V4L2_MEMORY_DMABUF = 4, | 191 | V4L2_MEMORY_DMABUF = 4, |
| 192 | }; | 192 | }; |
| 193 | 193 | ||
| 194 | #define V4L2_FLAG_MEMORY_NON_CONSISTENT (1 << 0) | ||
| 195 | |||
| 196 | /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ | 194 | /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ |
| 197 | enum v4l2_colorspace { | 195 | enum v4l2_colorspace { |
| 198 | /* | 196 | /* |
| @@ -949,10 +947,7 @@ struct v4l2_requestbuffers { · 750 unmodified lines | |||
| 949 | __u32 type; /* enum v4l2_buf_type */ | 947 | __u32 type; /* enum v4l2_buf_type */ |
| 950 | __u32 memory; /* enum v4l2_memory */ | 948 | __u32 memory; /* enum v4l2_memory */ |
| 951 | __u32 capabilities; | 949 | __u32 capabilities; |
| 952 | union { | 950 | __u32 reserved[1]; |
| 953 | __u32 flags; | ||
| 954 | __u32 reserved[1]; | ||
| 955 | }; | ||
| 956 | }; | 951 | }; |
| 957 | 952 | ||
| 958 | /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */ | 953 | /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */ |
| @@ -2456,9 +2451,6 @@ struct v4l2_dbg_chip_info { · 1497 unmodified lines | |||
| 2456 | * @memory: enum v4l2_memory; buffer memory type | 2451 | * @memory: enum v4l2_memory; buffer memory type |
| 2457 | * @format: frame format, for which buffers are requested | 2452 | * @format: frame format, for which buffers are requested |
| 2458 | * @capabilities: capabilities of this buffer type. | 2453 | * @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). | ||
| 2462 | * @reserved: future extensions | 2454 | * @reserved: future extensions |
| 2463 | */ | 2455 | */ |
| 2464 | struct v4l2_create_buffers { | 2456 | struct v4l2_create_buffers { |
| @@ -2467,8 +2459,7 @@ struct v4l2_create_buffers { · 2 unmodified lines | |||
| 2467 | __u32 memory; | 2459 | __u32 memory; |
| 2468 | struct v4l2_format format; | 2460 | struct v4l2_format format; |
| 2469 | __u32 capabilities; | 2461 | __u32 capabilities; |
| 2470 | __u32 flags; | 2462 | __u32 reserved[7]; |
| 2471 | __u32 reserved[6]; | ||
| 2472 | }; | 2463 | }; |
| 2473 | 2464 | ||
| 2474 | /* | 2465 | /* |