mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
From e4ccc9e3855dacef323c42ee86ea0a7dfd3a5421 Mon Sep 17 00:00:00 2001
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
|
Date: Mon, 7 Feb 2022 09:20:49 +0000
|
|
Subject: [PATCH 0522/1085] V4L2: Add PiSP opaque formats to V4L2
|
|
|
|
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
|
---
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 4 +++-
|
|
include/uapi/linux/videodev2.h | 7 +++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
@@ -1458,7 +1458,9 @@ static void v4l_fill_fmtdesc(struct v4l2
|
|
case V4L2_PIX_FMT_Y216: descr = "16-bit YUYV Packed"; break;
|
|
case V4L2_META_FMT_SENSOR_DATA: descr = "Sensor Ancillary Metadata"; break;
|
|
case V4L2_META_FMT_BCM2835_ISP_STATS: descr = "BCM2835 ISP Image Statistics"; break;
|
|
- case V4L2_META_FMT_RPI_BE_CFG: descr = "PiSP Config format"; break;
|
|
+ case V4L2_META_FMT_RPI_BE_CFG: descr = "PiSP BE Config format"; break;
|
|
+ case V4L2_META_FMT_RPI_FE_CFG: descr = "PiSP FE Config format"; break;
|
|
+ case V4L2_META_FMT_RPI_FE_STATS: descr = "PiSP FE Statistics format"; break;
|
|
|
|
default:
|
|
/* Compressed formats */
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -855,8 +855,15 @@ struct v4l2_pix_format {
|
|
#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */
|
|
|
|
/* The metadata format identifier for our configuration buffers. */
|
|
+/* The metadata format identifier for BE configuration buffers. */
|
|
#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C')
|
|
|
|
+/* The metadata format identifier for FE configuration buffers. */
|
|
+#define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C')
|
|
+
|
|
+/* The metadata format identifier for FE configuration buffers. */
|
|
+#define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S')
|
|
+
|
|
/* priv field value to indicates that subsequent fields are valid. */
|
|
#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
|
|
|