| Message ID | 20221221092448.741294-3-tomi.valkeinen+renesas@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series | media/drm: renesas: Add new pixel formats | expand |
Hi Tomi, Thank you for the patch. On Wed, Dec 21, 2022 at 11:24:43AM +0200, Tomi Valkeinen wrote: > Add Y210, Y212 and Y216 formats. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > .../media/v4l/pixfmt-packed-yuv.rst | 49 ++++++++++++++++++- > drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++ > include/uapi/linux/videodev2.h | 8 +++ > 3 files changed, 58 insertions(+), 2 deletions(-) > > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > index bf283a1b5581..24a771542059 100644 > --- a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > +++ b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > @@ -262,7 +262,12 @@ the second byte and Y'\ :sub:`7-0` in the third byte. > ================= > > These formats, commonly referred to as YUYV or YUY2, subsample the chroma > -components horizontally by 2, storing 2 pixels in 4 bytes. > +components horizontally by 2, storing 2 pixels in a container. The container > +is 32-bits for 8-bit formats, and 64-bits for 10+-bit formats. > + > +The packed YUYV formats with more than 8 bits per component are stored as four > +16-bit little-endian words. Each word's most significant bits contain one > +component, and the least significant bits are zero padding. > > .. raw:: latex > > @@ -270,7 +275,7 @@ components horizontally by 2, storing 2 pixels in 4 bytes. > > .. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| > > -.. flat-table:: Packed YUV 4:2:2 Formats > +.. flat-table:: Packed YUV 4:2:2 Formats in 32-bit container > :header-rows: 1 > :stub-columns: 0 > > @@ -337,6 +342,46 @@ components horizontally by 2, storing 2 pixels in 4 bytes. > - Y'\ :sub:`3` > - Cb\ :sub:`2` > > +.. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| > + > +.. flat-table:: Packed YUV 4:2:2 Formats in 64-bit container > + :header-rows: 1 > + :stub-columns: 0 > + > + * - Identifier > + - Code > + - Word 0 > + - Word 1 > + - Word 2 > + - Word 3 > + * .. _V4L2-PIX-FMT-Y210: > + > + - ``V4L2_PIX_FMT_Y210`` > + - 'Y210' > + > + - Y'\ :sub:`0` (bits 15-6) > + - Cb\ :sub:`0` (bits 15-6) > + - Y'\ :sub:`1` (bits 15-6) > + - Cr\ :sub:`0` (bits 15-6) > + * .. _V4L2-PIX-FMT-Y212: > + > + - ``V4L2_PIX_FMT_Y212`` > + - 'Y212' > + > + - Y'\ :sub:`0` (bits 15-4) > + - Cb\ :sub:`0` (bits 15-4) > + - Y'\ :sub:`1` (bits 15-4) > + - Cr\ :sub:`0` (bits 15-4) > + * .. _V4L2-PIX-FMT-Y216: > + > + - ``V4L2_PIX_FMT_Y216`` > + - 'Y216' > + > + - Y'\ :sub:`0` (bits 15-0) > + - Cb\ :sub:`0` (bits 15-0) > + - Y'\ :sub:`1` (bits 15-0) > + - Cr\ :sub:`0` (bits 15-0) > + > .. raw:: latex > > \normalsize > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index 875b9a95e3c8..a244d5181120 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -1449,6 +1449,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) > case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A Statistics"; break; > case V4L2_PIX_FMT_NV12M_8L128: descr = "NV12M (8x128 Linear)"; break; > case V4L2_PIX_FMT_NV12M_10BE_8L128: descr = "10-bit NV12M (8x128 Linear, BE)"; break; > + case V4L2_PIX_FMT_Y210: descr = "10-bit YUYV Packed"; break; > + case V4L2_PIX_FMT_Y212: descr = "12-bit YUYV Packed"; break; > + case V4L2_PIX_FMT_Y216: descr = "16-bit YUYV Packed"; break; > > default: > /* Compressed formats */ > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index 51d6a8aa4e17..403db3fb5cfa 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -621,6 +621,14 @@ struct v4l2_pix_format { > #define V4L2_PIX_FMT_YUVX32 v4l2_fourcc('Y', 'U', 'V', 'X') /* 32 YUVX-8-8-8-8 */ > #define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */ > > +/* > + * YCbCr packed format. For each Y2xx format, xx bits of valid data occupy the MSBs > + * of the 16 bit components, and 16-xx bits of zero padding occupy the LSBs. > + */ > +#define V4L2_PIX_FMT_Y210 v4l2_fourcc('Y', '2', '1', '0') /* 32 YUYV 4:2:2 */ > +#define V4L2_PIX_FMT_Y212 v4l2_fourcc('Y', '2', '1', '2') /* 32 YUYV 4:2:2 */ > +#define V4L2_PIX_FMT_Y216 v4l2_fourcc('Y', '2', '1', '6') /* 32 YUYV 4:2:2 */ > + > /* two planes -- one Y, one Cr + Cb interleaved */ > #define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ > #define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb 4:2:0 */
Hi Tomi, Le mercredi 21 décembre 2022 à 11:24 +0200, Tomi Valkeinen a écrit : > Add Y210, Y212 and Y216 formats. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> > --- > .../media/v4l/pixfmt-packed-yuv.rst | 49 ++++++++++++++++++- > drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++ > include/uapi/linux/videodev2.h | 8 +++ > 3 files changed, 58 insertions(+), 2 deletions(-) It seems you omitted to update v4l2-common.c, Ming Qian had made a suplicated commit for this, I'll ask him if he can keep the -common changes you forgot. > > diff --git a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > index bf283a1b5581..24a771542059 100644 > --- a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > +++ b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst > @@ -262,7 +262,12 @@ the second byte and Y'\ :sub:`7-0` in the third byte. > ================= > > These formats, commonly referred to as YUYV or YUY2, subsample the chroma > -components horizontally by 2, storing 2 pixels in 4 bytes. > +components horizontally by 2, storing 2 pixels in a container. The container > +is 32-bits for 8-bit formats, and 64-bits for 10+-bit formats. > + > +The packed YUYV formats with more than 8 bits per component are stored as four > +16-bit little-endian words. Each word's most significant bits contain one > +component, and the least significant bits are zero padding. > > .. raw:: latex > > @@ -270,7 +275,7 @@ components horizontally by 2, storing 2 pixels in 4 bytes. > > .. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| > > -.. flat-table:: Packed YUV 4:2:2 Formats > +.. flat-table:: Packed YUV 4:2:2 Formats in 32-bit container > :header-rows: 1 > :stub-columns: 0 > > @@ -337,6 +342,46 @@ components horizontally by 2, storing 2 pixels in 4 bytes. > - Y'\ :sub:`3` > - Cb\ :sub:`2` > > +.. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| > + > +.. flat-table:: Packed YUV 4:2:2 Formats in 64-bit container > + :header-rows: 1 > + :stub-columns: 0 > + > + * - Identifier > + - Code > + - Word 0 > + - Word 1 > + - Word 2 > + - Word 3 > + * .. _V4L2-PIX-FMT-Y210: > + > + - ``V4L2_PIX_FMT_Y210`` > + - 'Y210' > + > + - Y'\ :sub:`0` (bits 15-6) > + - Cb\ :sub:`0` (bits 15-6) > + - Y'\ :sub:`1` (bits 15-6) > + - Cr\ :sub:`0` (bits 15-6) > + * .. _V4L2-PIX-FMT-Y212: > + > + - ``V4L2_PIX_FMT_Y212`` > + - 'Y212' > + > + - Y'\ :sub:`0` (bits 15-4) > + - Cb\ :sub:`0` (bits 15-4) > + - Y'\ :sub:`1` (bits 15-4) > + - Cr\ :sub:`0` (bits 15-4) > + * .. _V4L2-PIX-FMT-Y216: > + > + - ``V4L2_PIX_FMT_Y216`` > + - 'Y216' > + > + - Y'\ :sub:`0` (bits 15-0) > + - Cb\ :sub:`0` (bits 15-0) > + - Y'\ :sub:`1` (bits 15-0) > + - Cr\ :sub:`0` (bits 15-0) > + > .. raw:: latex > > \normalsize > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index 875b9a95e3c8..a244d5181120 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -1449,6 +1449,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) > case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A Statistics"; break; > case V4L2_PIX_FMT_NV12M_8L128: descr = "NV12M (8x128 Linear)"; break; > case V4L2_PIX_FMT_NV12M_10BE_8L128: descr = "10-bit NV12M (8x128 Linear, BE)"; break; > + case V4L2_PIX_FMT_Y210: descr = "10-bit YUYV Packed"; break; > + case V4L2_PIX_FMT_Y212: descr = "12-bit YUYV Packed"; break; > + case V4L2_PIX_FMT_Y216: descr = "16-bit YUYV Packed"; break; > > default: > /* Compressed formats */ > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index 51d6a8aa4e17..403db3fb5cfa 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -621,6 +621,14 @@ struct v4l2_pix_format { > #define V4L2_PIX_FMT_YUVX32 v4l2_fourcc('Y', 'U', 'V', 'X') /* 32 YUVX-8-8-8-8 */ > #define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */ > > +/* > + * YCbCr packed format. For each Y2xx format, xx bits of valid data occupy the MSBs > + * of the 16 bit components, and 16-xx bits of zero padding occupy the LSBs. > + */ > +#define V4L2_PIX_FMT_Y210 v4l2_fourcc('Y', '2', '1', '0') /* 32 YUYV 4:2:2 */ > +#define V4L2_PIX_FMT_Y212 v4l2_fourcc('Y', '2', '1', '2') /* 32 YUYV 4:2:2 */ > +#define V4L2_PIX_FMT_Y216 v4l2_fourcc('Y', '2', '1', '6') /* 32 YUYV 4:2:2 */ > + > /* two planes -- one Y, one Cr + Cb interleaved */ > #define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ > #define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb 4:2:0 */
Hi, On 22/02/2023 17:28, Nicolas Dufresne wrote: > Hi Tomi, > > Le mercredi 21 décembre 2022 à 11:24 +0200, Tomi Valkeinen a écrit : >> Add Y210, Y212 and Y216 formats. >> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> >> --- >> .../media/v4l/pixfmt-packed-yuv.rst | 49 ++++++++++++++++++- >> drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++ >> include/uapi/linux/videodev2.h | 8 +++ >> 3 files changed, 58 insertions(+), 2 deletions(-) > > It seems you omitted to update v4l2-common.c, Ming Qian had made a suplicated > commit for this, I'll ask him if he can keep the -common changes you forgot. Ah, I wasn't aware of the format list in that file. I think you refer to the "media: imx-jpeg: Add support for 12 bit extended jpeg" series. Yes, I'm fine if he can add the -common changes there, but I can also send a separate patch. In fact, maybe a separate fix patch is better, so that we can have it merged in the early 6.3 rcs. Tomi
Le jeudi 23 février 2023 à 15:10 +0200, Tomi Valkeinen a écrit : > Hi, > > On 22/02/2023 17:28, Nicolas Dufresne wrote: > > Hi Tomi, > > > > Le mercredi 21 décembre 2022 à 11:24 +0200, Tomi Valkeinen a écrit : > > > Add Y210, Y212 and Y216 formats. > > > > > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> > > > --- > > > .../media/v4l/pixfmt-packed-yuv.rst | 49 ++++++++++++++++++- > > > drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++ > > > include/uapi/linux/videodev2.h | 8 +++ > > > 3 files changed, 58 insertions(+), 2 deletions(-) > > > > It seems you omitted to update v4l2-common.c, Ming Qian had made a suplicated > > commit for this, I'll ask him if he can keep the -common changes you forgot. > > Ah, I wasn't aware of the format list in that file. > > I think you refer to the "media: imx-jpeg: Add support for 12 bit > extended jpeg" series. Yes, I'm fine if he can add the -common changes > there, but I can also send a separate patch. In fact, maybe a separate > fix patch is better, so that we can have it merged in the early 6.3 rcs. I don't think we need to worry about backporting this though. I simply care that we keep updating -common and encourage using it. The goal of this lib is to provide a common set of helpers to do calculate format related information. You don't have to use it at any cost. Allocation is often the cause of memory corruption issues, and is a very recurrent thing we have to debug and fix. This was also discussed on IRC yesterday, for Renesas driver, "just porting it" to use that could mean duplicating the lookup, as Renesas driver also needs its own map to get the HW specific formats and other information. This looks like a valid use case to me, and is definitely something -common could improve on. Nicolas
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst index bf283a1b5581..24a771542059 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-packed-yuv.rst @@ -262,7 +262,12 @@ the second byte and Y'\ :sub:`7-0` in the third byte. ================= These formats, commonly referred to as YUYV or YUY2, subsample the chroma -components horizontally by 2, storing 2 pixels in 4 bytes. +components horizontally by 2, storing 2 pixels in a container. The container +is 32-bits for 8-bit formats, and 64-bits for 10+-bit formats. + +The packed YUYV formats with more than 8 bits per component are stored as four +16-bit little-endian words. Each word's most significant bits contain one +component, and the least significant bits are zero padding. .. raw:: latex @@ -270,7 +275,7 @@ components horizontally by 2, storing 2 pixels in 4 bytes. .. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| -.. flat-table:: Packed YUV 4:2:2 Formats +.. flat-table:: Packed YUV 4:2:2 Formats in 32-bit container :header-rows: 1 :stub-columns: 0 @@ -337,6 +342,46 @@ components horizontally by 2, storing 2 pixels in 4 bytes. - Y'\ :sub:`3` - Cb\ :sub:`2` +.. tabularcolumns:: |p{3.4cm}|p{1.2cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}|p{0.8cm}| + +.. flat-table:: Packed YUV 4:2:2 Formats in 64-bit container + :header-rows: 1 + :stub-columns: 0 + + * - Identifier + - Code + - Word 0 + - Word 1 + - Word 2 + - Word 3 + * .. _V4L2-PIX-FMT-Y210: + + - ``V4L2_PIX_FMT_Y210`` + - 'Y210' + + - Y'\ :sub:`0` (bits 15-6) + - Cb\ :sub:`0` (bits 15-6) + - Y'\ :sub:`1` (bits 15-6) + - Cr\ :sub:`0` (bits 15-6) + * .. _V4L2-PIX-FMT-Y212: + + - ``V4L2_PIX_FMT_Y212`` + - 'Y212' + + - Y'\ :sub:`0` (bits 15-4) + - Cb\ :sub:`0` (bits 15-4) + - Y'\ :sub:`1` (bits 15-4) + - Cr\ :sub:`0` (bits 15-4) + * .. _V4L2-PIX-FMT-Y216: + + - ``V4L2_PIX_FMT_Y216`` + - 'Y216' + + - Y'\ :sub:`0` (bits 15-0) + - Cb\ :sub:`0` (bits 15-0) + - Y'\ :sub:`1` (bits 15-0) + - Cr\ :sub:`0` (bits 15-0) + .. raw:: latex \normalsize diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 875b9a95e3c8..a244d5181120 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1449,6 +1449,9 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A Statistics"; break; case V4L2_PIX_FMT_NV12M_8L128: descr = "NV12M (8x128 Linear)"; break; case V4L2_PIX_FMT_NV12M_10BE_8L128: descr = "10-bit NV12M (8x128 Linear, BE)"; break; + case V4L2_PIX_FMT_Y210: descr = "10-bit YUYV Packed"; break; + case V4L2_PIX_FMT_Y212: descr = "12-bit YUYV Packed"; break; + case V4L2_PIX_FMT_Y216: descr = "16-bit YUYV Packed"; break; default: /* Compressed formats */ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 51d6a8aa4e17..403db3fb5cfa 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -621,6 +621,14 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_YUVX32 v4l2_fourcc('Y', 'U', 'V', 'X') /* 32 YUVX-8-8-8-8 */ #define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */ +/* + * YCbCr packed format. For each Y2xx format, xx bits of valid data occupy the MSBs + * of the 16 bit components, and 16-xx bits of zero padding occupy the LSBs. + */ +#define V4L2_PIX_FMT_Y210 v4l2_fourcc('Y', '2', '1', '0') /* 32 YUYV 4:2:2 */ +#define V4L2_PIX_FMT_Y212 v4l2_fourcc('Y', '2', '1', '2') /* 32 YUYV 4:2:2 */ +#define V4L2_PIX_FMT_Y216 v4l2_fourcc('Y', '2', '1', '6') /* 32 YUYV 4:2:2 */ + /* two planes -- one Y, one Cr + Cb interleaved */ #define V4L2_PIX_FMT_NV12 v4l2_fourcc('N', 'V', '1', '2') /* 12 Y/CbCr 4:2:0 */ #define V4L2_PIX_FMT_NV21 v4l2_fourcc('N', 'V', '2', '1') /* 12 Y/CrCb 4:2:0 */
Add Y210, Y212 and Y216 formats. Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> --- .../media/v4l/pixfmt-packed-yuv.rst | 49 ++++++++++++++++++- drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++ include/uapi/linux/videodev2.h | 8 +++ 3 files changed, 58 insertions(+), 2 deletions(-)