History

Merge tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab: - New driver for Mediatek MDP V3 - New driver for NXP i.MX DW100 dewarper - Zoran driver got promoted from staging - Hantro and related drivers got promoted from staging - Several VB1 drivers got moved to staging/deprecated (cpia2, fsl-viu, meye, saa7146, av7110, stkwebcam, tm6000, vpfe_capture, davinci, zr364xx) - Usual set of driver fixes, improvements and cleanups * tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (107 commits) media: destage Hantro VPU driver media: platform: mtk-mdp3: add MediaTek MDP3 driver media: dt-binding: mediatek: add bindings for MediaTek CCORR and WDMA media: dt-binding: mediatek: add bindings for MediaTek MDP3 components media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init media: xilinx: video: Add 1X12 greyscale format media: xilinx: csi2rxss: Add 1X12 greyscale format media: staging: media: imx: imx7-media-csi: Increase video mem limit media: uvcvideo: Limit power line control for Sonix Technology media: uvcvideo: Use entity get_cur in uvc_ctrl_set media: uvcvideo: Fix typo 'the the' in comment media: uvcvideo: Use indexed loops in uvc_ctrl_init_ctrl() media: uvcvideo: Fix memory leak in uvc_gpio_parse media: renesas: vsp1: Add support for RZ/G2L VSPD media: renesas: vsp1: Add VSP1_HAS_NON_ZERO_LBA feature bit media: renesas: vsp1: Add support for VSP software version media: renesas: vsp1: Add support to deassert/assert reset line media: dt-bindings: media: renesas,vsp1: Document RZ/G2L VSPD bindings media: meson: vdec: add missing clk_disable_unprepare on error in vdec_hevc_start() media: amphion: fix a bug that vpu core may not resume after suspend ...

Linus Torvalds committed 4 years ago

Commit 5d435a32 parents 4078aa6 fbb6c84380 files · +9472 −1463Browse files

Showing the changes to include/uapi/linux (3 of 380 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/dw100.h +14 −0
  2. include/uapi/linux/v4l2-controls.h +7 −1
  3. include/uapi/linux/videodev2.h +6 −1
include/uapi/linux/dw100.h+14−0
@@ -0,0 +1,14 @@
1+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2+/* Copyright 2022 NXP */
3+
4+#ifndef __UAPI_DW100_H__
5+#define __UAPI_DW100_H__
6+
7+#include <linux/v4l2-controls.h>
8+
9+/*
10+ * Check Documentation/userspace-api/media/drivers/dw100.rst for control details.
11+ */
12+#define V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP (V4L2_CID_USER_DW100_BASE + 1)
13+
14+#endif
include/uapi/linux/v4l2-controls.h+7−1
@@ -225,6 +225,12 @@ enum v4l2_colorfx { · 224 unmodified lines
225225 */
226226 #define V4L2_CID_USER_ISL7998X_BASE (V4L2_CID_USER_BASE + 0x1180)
227227
228+/*
229+ * The base for DW100 driver controls.
230+ * We reserve 16 controls for this driver.
231+ */
232+#define V4L2_CID_USER_DW100_BASE (V4L2_CID_USER_BASE + 0x1190)
233+
228234 /* MPEG-class control IDs */
229235 /* The MPEG controls are applicable to all codec controls
230236 * and the 'MPEG' part of the define is historical */
@@ -1730,7 +1736,7 @@ struct v4l2_vp8_segment { · 1499 unmodified lines
17301736 * @sharpness_level: matches sharpness_level syntax element.
17311737 * @level: matches loop_filter_level syntax element.
17321738 * @padding: padding field. Should be zeroed by applications.
1733− * @flags: see V4L2_VP8_LF_FLAG_{}.
1739+ * @flags: see V4L2_VP8_LF_{}.
17341740 *
17351741 * This structure contains loop filter related parameters.
17361742 * See the 'mb_lf_adjustments()' part of the frame header syntax,
include/uapi/linux/videodev2.h+6−1
@@ -502,7 +502,6 @@ struct v4l2_capability { · 501 unmodified lines
502502 #define V4L2_CAP_META_CAPTURE 0x00800000 /* Is a metadata capture device */
503503
504504 #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */
505−#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */
506505 #define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */
507506 #define V4L2_CAP_META_OUTPUT 0x08000000 /* Is a metadata output device */
508507
@@ -2435,6 +2434,7 @@ struct v4l2_event_vsync { · 1926 unmodified lines
24352434 #define V4L2_EVENT_CTRL_CH_VALUE (1 << 0)
24362435 #define V4L2_EVENT_CTRL_CH_FLAGS (1 << 1)
24372436 #define V4L2_EVENT_CTRL_CH_RANGE (1 << 2)
2437+#define V4L2_EVENT_CTRL_CH_DIMENSIONS (1 << 3)
24382438
24392439 struct v4l2_event_ctrl {
24402440 __u32 changes;
@@ -2682,6 +2682,11 @@ struct v4l2_create_buffers { · 241 unmodified lines
26822682 #ifndef __KERNEL__
26832683 #define V4L2_PIX_FMT_HM12 V4L2_PIX_FMT_NV12_16L16
26842684 #define V4L2_PIX_FMT_SUNXI_TILED_NV12 V4L2_PIX_FMT_NV12_32L32
2685+/*
2686+ * This capability was never implemented, anyone using this cap should drop it
2687+ * from their code.
2688+ */
2689+#define V4L2_CAP_ASYNCIO 0x02000000
26852690 #endif
26862691
26872692 #endif /* _UAPI__LINUX_VIDEODEV2_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t