bcm27xx: update 6.1 patches to latest version
[openwrt/staging/dangole.git] / target / linux / bcm27xx / patches-6.1 / 950-0888-v4l2-Add-pisp-compression-format-support-to-v4l2.patch
1 From 3a419974ba02d32795a5ecfaf3c020f23173b6a1 Mon Sep 17 00:00:00 2001
2 From: Naushir Patuck <naush@raspberrypi.com>
3 Date: Tue, 14 Feb 2023 20:58:59 +0000
4 Subject: [PATCH] v4l2: Add pisp compression format support to v4l2
5
6 Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
7 ---
8 drivers/media/v4l2-core/v4l2-ioctl.c | 12 ++++++++----
9 include/uapi/linux/media-bus-format.h | 14 ++++++++++++++
10 include/uapi/linux/videodev2.h | 12 ++++++++----
11 3 files changed, 30 insertions(+), 8 deletions(-)
12
13 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
14 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
15 @@ -1507,10 +1507,14 @@ static void v4l_fill_fmtdesc(struct v4l2
16 case V4L2_PIX_FMT_QC08C: descr = "QCOM Compressed 8-bit Format"; break;
17 case V4L2_PIX_FMT_QC10C: descr = "QCOM Compressed 10-bit Format"; break;
18 case V4L2_PIX_FMT_RPI_BE: descr = "PiSP Opaque Format"; break;
19 - case V4L2_PIX_FMT_PISP_COMP_RGGB:
20 - case V4L2_PIX_FMT_PISP_COMP_GRBG:
21 - case V4L2_PIX_FMT_PISP_COMP_GBRG:
22 - case V4L2_PIX_FMT_PISP_COMP_BGGR: descr = "PiSP Bayer Compressed Format"; break;
23 + case V4L2_PIX_FMT_PISP_COMP1_RGGB:
24 + case V4L2_PIX_FMT_PISP_COMP1_GRBG:
25 + case V4L2_PIX_FMT_PISP_COMP1_GBRG:
26 + case V4L2_PIX_FMT_PISP_COMP1_BGGR: descr = "PiSP Bayer Comp 1"; break;
27 + case V4L2_PIX_FMT_PISP_COMP2_RGGB:
28 + case V4L2_PIX_FMT_PISP_COMP2_GRBG:
29 + case V4L2_PIX_FMT_PISP_COMP2_GBRG:
30 + case V4L2_PIX_FMT_PISP_COMP2_BGGR: descr = "PiSP Bayer Comp 2"; break;
31 default:
32 if (fmt->description[0])
33 return;
34 --- a/include/uapi/linux/media-bus-format.h
35 +++ b/include/uapi/linux/media-bus-format.h
36 @@ -175,4 +175,18 @@
37 /* Sensor ancillary metadata formats - next is 0x7002 */
38 #define MEDIA_BUS_FMT_SENSOR_DATA 0x7002
39
40 +/* PiSP Formats */
41 +#define MEDIA_BUS_FMT_PISP_COMP1_RGGB 0x8001
42 +#define MEDIA_BUS_FMT_PISP_COMP1_GRBG 0x8002
43 +#define MEDIA_BUS_FMT_PISP_COMP1_GBRG 0x8003
44 +#define MEDIA_BUS_FMT_PISP_COMP1_BGGR 0x8004
45 +#define MEDIA_BUS_FMT_PISP_COMP2_RGGB 0x8005
46 +#define MEDIA_BUS_FMT_PISP_COMP2_GRBG 0x8006
47 +#define MEDIA_BUS_FMT_PISP_COMP2_GBRG 0x8007
48 +#define MEDIA_BUS_FMT_PISP_COMP2_BGGR 0x8008
49 +
50 +#define MEDIA_BUS_FMT_PISP_FE_CONFIG 0x8100
51 +#define MEDIA_BUS_FMT_PISP_FE_STATS 0x8101
52 +#define MEDIA_BUS_FMT_PISP_BE_CONFIG 0x8200
53 +
54 #endif /* __LINUX_MEDIA_BUS_FORMAT_H */
55 --- a/include/uapi/linux/videodev2.h
56 +++ b/include/uapi/linux/videodev2.h
57 @@ -795,10 +795,14 @@ struct v4l2_pix_format {
58
59 /* The pixel format for all our buffers (the precise format is found in the config buffer). */
60 #define V4L2_PIX_FMT_RPI_BE v4l2_fourcc('R', 'P', 'B', 'P')
61 -#define V4L2_PIX_FMT_PISP_COMP_RGGB v4l2_fourcc('P', 'C', 'R', 'G')
62 -#define V4L2_PIX_FMT_PISP_COMP_GRBG v4l2_fourcc('P', 'C', 'G', 'R')
63 -#define V4L2_PIX_FMT_PISP_COMP_GBRG v4l2_fourcc('P', 'C', 'G', 'B')
64 -#define V4L2_PIX_FMT_PISP_COMP_BGGR v4l2_fourcc('P', 'C', 'B', 'G')
65 +#define V4L2_PIX_FMT_PISP_COMP1_RGGB v4l2_fourcc('P', 'C', '1', 'R')
66 +#define V4L2_PIX_FMT_PISP_COMP1_GRBG v4l2_fourcc('P', 'C', '1', 'G')
67 +#define V4L2_PIX_FMT_PISP_COMP1_GBRG v4l2_fourcc('P', 'C', '1', 'g')
68 +#define V4L2_PIX_FMT_PISP_COMP1_BGGR v4l2_fourcc('P', 'C', '1', 'B')
69 +#define V4L2_PIX_FMT_PISP_COMP2_RGGB v4l2_fourcc('P', 'C', '2', 'R')
70 +#define V4L2_PIX_FMT_PISP_COMP2_GRBG v4l2_fourcc('P', 'C', '2', 'G')
71 +#define V4L2_PIX_FMT_PISP_COMP2_GBRG v4l2_fourcc('P', 'C', '2', 'g')
72 +#define V4L2_PIX_FMT_PISP_COMP2_BGGR v4l2_fourcc('P', 'C', '2', 'B')
73
74 /* SDR formats - used only for Software Defined Radio devices */
75 #define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */