* [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video
@ 2022-10-25 9:01 Jammy Huang
2022-10-25 9:01 ` [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format Jammy Huang
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Jammy Huang @ 2022-10-25 9:01 UTC (permalink / raw)
To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart,
xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne,
sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc,
linux-arm-kernel, linux-aspeed, linux-kernel
The aim of this series is to add aspeed-jpeg support for aspeed-video
driver. aspeed-jpeg is a per-frame differential jpeg format which only
compress the parts which are different from the previous frame. In this
way, it reduces both the amount of data to be transferred by network and
those to be decoded on the client side.
In the last, debugfs information is also updated per this change.
Changes in v10:
- Add document, aspeed-video.rst, for new V4L2 CID
- Fix warnings reported by kernel test robot
Changes in v9:
- Rebase on new kernel
Changes in v8:
- Add information of decoder's implementation
Changes in v7:
- Separate other patches alone from aspeed-jpeg series
- for Aspeed-jpeg, generate an I frame every 8 frames
- rename compression_mode as compression_scheme
- Add more reference for aspeed-jpeg
- Update debugfs message
Changes in v6:
- Update description for new format, aspeed-jpeg, in Documentation.
Changes in v5:
- Use model data to tell different soc
Changes in v4:
- Add definition for the Aspeed JPEG format
- Reserve controls for ASPEED
- Use s_fmt to update format rather than new control
- Update aspeed hq quality range, 1 ~ 12
Jammy Huang (5):
media: v4l: Add definition for the Aspeed JPEG format
media: v4l2-ctrls: Reserve controls for ASPEED
media: Documentation: aspeed-video: Add user documentation for the
aspeed-video driver
media: aspeed: Support aspeed mode to reduce compressed data
media: aspeed: Extend debug message
.../media/drivers/aspeed-video.rst | 61 ++++
.../userspace-api/media/drivers/index.rst | 1 +
.../media/v4l/pixfmt-reserved.rst | 17 +
drivers/media/platform/aspeed/aspeed-video.c | 317 +++++++++++++++---
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
include/uapi/linux/aspeed-video.h | 14 +
include/uapi/linux/v4l2-controls.h | 6 +
include/uapi/linux/videodev2.h | 1 +
8 files changed, 366 insertions(+), 52 deletions(-)
create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst
create mode 100644 include/uapi/linux/aspeed-video.h
--
2.25.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang @ 2022-10-25 9:01 ` Jammy Huang 2022-10-25 9:02 ` [PATCH v10 2/5] media: v4l2-ctrls: Reserve controls for ASPEED Jammy Huang ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Jammy Huang @ 2022-10-25 9:01 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel This introduces support for the Aspeed JPEG format, where the new frame can refer to previous frame to reduce the amount of compressed data. The concept is similar to I/P frame of video compression. It will compare the new frame with previous one to decide which macroblock's data is changed, and only the changed macroblocks will be compressed. This Aspeed JPEG format is used by the video engine on Aspeed platforms, which is generally adapted for remote KVM. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- v10: - no update v9: - Rebase on new kernel v8: - Add decoder information for aspeed-jpeg v7: - Add more information for aspeed-jpeg v6: - Update description for new format, aspeed-jpeg, in Documentation. v5: - no update v4: - new --- .../userspace-api/media/v4l/pixfmt-reserved.rst | 17 +++++++++++++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 3 files changed, 19 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst index 0ff68cd8cf62..73cd99828010 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-reserved.rst @@ -258,6 +258,23 @@ please make a proposal on the linux-media mailing list. and it is used by various multimedia hardware blocks like GPU, display controllers, ISP and video accelerators. It contains four planes for progressive video. + * .. _V4L2-PIX-FMT-AJPG: + + - ``V4L2_PIX_FMT_AJPG`` + - 'AJPG' + - ASPEED JPEG format used by the aspeed-video driver on Aspeed platforms, + which is generally adapted for remote KVM. + On each frame compression, I will compare the new frame with previous + one to decide which macroblock's data is changed, and only the changed + macroblocks will be compressed. + + The implementation is based on AST2600 A3 datasheet, revision 0.9, which + is not publicly available. Or you can reference Video stream data format + – ASPEED mode compression of SDK_User_Guide which available on + AspeedTech-BMC/openbmc/releases. + + Decoder's implementation can be found here, + `aspeed_codec <https://github.com/AspeedTech-BMC/aspeed_codec/>`__ .. raw:: latex \normalsize diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index fddba75d9074..8cb4b976064e 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1497,6 +1497,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_PIX_FMT_MT21C: descr = "Mediatek Compressed Format"; break; case V4L2_PIX_FMT_QC08C: descr = "QCOM Compressed 8-bit Format"; break; case V4L2_PIX_FMT_QC10C: descr = "QCOM Compressed 10-bit Format"; break; + case V4L2_PIX_FMT_AJPG: descr = "Aspeed JPEG"; break; default: if (fmt->description[0]) return; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 86cae23cc446..870a7e5ef8ca 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -775,6 +775,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */ #define V4L2_PIX_FMT_QC08C v4l2_fourcc('Q', '0', '8', 'C') /* Qualcomm 8-bit compressed */ #define V4L2_PIX_FMT_QC10C v4l2_fourcc('Q', '1', '0', 'C') /* Qualcomm 10-bit compressed */ +#define V4L2_PIX_FMT_AJPG v4l2_fourcc('A', 'J', 'P', 'G') /* Aspeed JPEG */ /* 10bit raw packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */ #define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v10 2/5] media: v4l2-ctrls: Reserve controls for ASPEED 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang 2022-10-25 9:01 ` [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format Jammy Huang @ 2022-10-25 9:02 ` Jammy Huang 2022-10-25 9:02 ` [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver Jammy Huang ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Jammy Huang @ 2022-10-25 9:02 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Reserve controls for ASPEED video family. Aspeed video engine contains a few features which improve video quality, reduce amount of compressed data, and etc. Hence, 16 controls are reserved for these aspeed proprietary features. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- v10: - no update v9: - Rebase on new kernel v8: - no update v7: - no update v6: - no update v5: - no update v4: - new --- include/uapi/linux/v4l2-controls.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index b5e7d082b8ad..60a6bed21c56 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -231,6 +231,12 @@ enum v4l2_colorfx { */ #define V4L2_CID_USER_DW100_BASE (V4L2_CID_USER_BASE + 0x1190) +/* + * The base for Aspeed driver controls. + * We reserve 16 controls for this driver. + */ +#define V4L2_CID_USER_ASPEED_BASE (V4L2_CID_USER_BASE + 0x11A0) + /* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang 2022-10-25 9:01 ` [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format Jammy Huang 2022-10-25 9:02 ` [PATCH v10 2/5] media: v4l2-ctrls: Reserve controls for ASPEED Jammy Huang @ 2022-10-25 9:02 ` Jammy Huang 2022-10-25 13:18 ` Nicolas Dufresne 2022-10-25 9:02 ` [PATCH v10 4/5] media: aspeed: Support aspeed mode to reduce compressed data Jammy Huang 2022-10-25 9:02 ` [PATCH v10 5/5] media: aspeed: Extend debug message Jammy Huang 4 siblings, 1 reply; 10+ messages in thread From: Jammy Huang @ 2022-10-25 9:02 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Add user documentation for the aspeed-video driver. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- v10: - new --- .../media/drivers/aspeed-video.rst | 61 +++++++++++++++++++ .../userspace-api/media/drivers/index.rst | 1 + 2 files changed, 62 insertions(+) create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst diff --git a/Documentation/userspace-api/media/drivers/aspeed-video.rst b/Documentation/userspace-api/media/drivers/aspeed-video.rst new file mode 100644 index 000000000000..798a2588b175 --- /dev/null +++ b/Documentation/userspace-api/media/drivers/aspeed-video.rst @@ -0,0 +1,61 @@ +.. SPDX-License-Identifier: GPL-2.0 + +.. include:: <isonum.txt> + +ASPEED video driver +=================== + +ASPEED Video Engine found on AST2400/2500/2600 SoC supports high performance +video compressions with a wide range of video quality and compression ratio +options. The adopted compressing algorithm is a modified JPEG algorithm. + +There are 2 types of compressions in this IP. + +* JPEG JFIF standard mode: for single frame and management compression +* ASPEED proprietary mode: for multi-frame and differential compression. + Support 2-pass (high quality) video compression scheme (Patent pending by + ASPEED). Provide visually lossless video compression quality or to reduce + the network average loading under intranet KVM applications. + +More details on the ASPEED video hardware operations can be found in +*chapter 6.2.16 KVM Video Driver* of SDK_User_Guide which available on +AspeedTech-BMC/openbmc/releases. + +The ASPEED video driver implements the following driver-specific control: + +``V4L2_CID_ASPEED_HQ_MODE`` +------------------------------- + Enable/Disable ASPEED's High quality mode. This is a private control + that can be used to enable high quality for aspeed proprietary mode. + +.. flat-table:: + :header-rows: 0 + :stub-columns: 0 + :widths: 1 4 + + * - ``(0)`` + - ASPEED HQ mode is disabled. + * - ``(1)`` + - ASPEED HQ mode is enabled. + +``V4L2_CID_ASPEED_HQ_JPEG_QUALITY`` +------------------------------- + Define the quality of ASPEED's High quality mode. This is a private control + that can be used to decide compression quality if High quality mode enabled + . Higher the value, better the quality and bigger the size. + +.. flat-table:: + :header-rows: 0 + :stub-columns: 0 + :widths: 1 4 + + * - ``(1)`` + - minimum + * - ``(12)`` + - maximum + * - ``(1)`` + - step + * - ``(1)`` + - default + +**Copyright** |copy| 2022 ASPEED Technology Inc. diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst index 32f82aed47d9..46a494e00b72 100644 --- a/Documentation/userspace-api/media/drivers/index.rst +++ b/Documentation/userspace-api/media/drivers/index.rst @@ -31,6 +31,7 @@ For more details see the file COPYING in the source distribution of Linux. :maxdepth: 5 :numbered: + aspeed-video ccs cx2341x-uapi dw100 -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver 2022-10-25 9:02 ` [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver Jammy Huang @ 2022-10-25 13:18 ` Nicolas Dufresne 2022-10-26 2:42 ` Jammy Huang 0 siblings, 1 reply; 10+ messages in thread From: Nicolas Dufresne @ 2022-10-25 13:18 UTC (permalink / raw) To: Jammy Huang, eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hi Jammy, thanks for the addition. Le mardi 25 octobre 2022 à 17:02 +0800, Jammy Huang a écrit : > Add user documentation for the aspeed-video driver. > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > --- > v10: > - new > --- > .../media/drivers/aspeed-video.rst | 61 +++++++++++++++++++ > .../userspace-api/media/drivers/index.rst | 1 + > 2 files changed, 62 insertions(+) > create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst > > diff --git a/Documentation/userspace-api/media/drivers/aspeed-video.rst b/Documentation/userspace-api/media/drivers/aspeed-video.rst > new file mode 100644 > index 000000000000..798a2588b175 > --- /dev/null > +++ b/Documentation/userspace-api/media/drivers/aspeed-video.rst > @@ -0,0 +1,61 @@ > +.. SPDX-License-Identifier: GPL-2.0 > + > +.. include:: <isonum.txt> > + > +ASPEED video driver > +=================== > + > +ASPEED Video Engine found on AST2400/2500/2600 SoC supports high performance > +video compressions with a wide range of video quality and compression ratio > +options. The adopted compressing algorithm is a modified JPEG algorithm. > + > +There are 2 types of compressions in this IP. > + > +* JPEG JFIF standard mode: for single frame and management compression > +* ASPEED proprietary mode: for multi-frame and differential compression. > + Support 2-pass (high quality) video compression scheme (Patent pending by > + ASPEED). Provide visually lossless video compression quality or to reduce > + the network average loading under intranet KVM applications. I think some of the information disclosed in the following quote could be summarized. Notably the part about the extra buffers. Aspeed JPEG Format requires an additional buffer, called bcd, to store the information about which macro block in the new frame is different from the previous one. To have bcd correctly working, we need to swap the buffers for src0/1 to make src1 refer to previous frame and src0 to the coming new frame. But before I push you this route, have you considered using a dedicated pixel format instead ? Here's my thinking, the output of the JPEG encoder is no longer "compatible" (or at least won't yield the expected images) if used with a normal JPEG decoder. By differentiating these two as dedicated formats, you will only need 1 vendor control, and you avoid the potential risk of software bugs mixing them up. Also note that there is other JPEG based vendor formats that exist in V4L2. Let me know what do you think ? Nicolas > + > +More details on the ASPEED video hardware operations can be found in > +*chapter 6.2.16 KVM Video Driver* of SDK_User_Guide which available on > +AspeedTech-BMC/openbmc/releases. > + > +The ASPEED video driver implements the following driver-specific control: > + > +``V4L2_CID_ASPEED_HQ_MODE`` > +------------------------------- > + Enable/Disable ASPEED's High quality mode. This is a private control > + that can be used to enable high quality for aspeed proprietary mode. > + > +.. flat-table:: > + :header-rows: 0 > + :stub-columns: 0 > + :widths: 1 4 > + > + * - ``(0)`` > + - ASPEED HQ mode is disabled. > + * - ``(1)`` > + - ASPEED HQ mode is enabled. > + > +``V4L2_CID_ASPEED_HQ_JPEG_QUALITY`` > +------------------------------- > + Define the quality of ASPEED's High quality mode. This is a private control > + that can be used to decide compression quality if High quality mode enabled > + . Higher the value, better the quality and bigger the size. > + > +.. flat-table:: > + :header-rows: 0 > + :stub-columns: 0 > + :widths: 1 4 > + > + * - ``(1)`` > + - minimum > + * - ``(12)`` > + - maximum > + * - ``(1)`` > + - step > + * - ``(1)`` > + - default > + > +**Copyright** |copy| 2022 ASPEED Technology Inc. > diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst > index 32f82aed47d9..46a494e00b72 100644 > --- a/Documentation/userspace-api/media/drivers/index.rst > +++ b/Documentation/userspace-api/media/drivers/index.rst > @@ -31,6 +31,7 @@ For more details see the file COPYING in the source distribution of Linux. > :maxdepth: 5 > :numbered: > > + aspeed-video > ccs > cx2341x-uapi > dw100 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver 2022-10-25 13:18 ` Nicolas Dufresne @ 2022-10-26 2:42 ` Jammy Huang 2022-10-26 19:02 ` Nicolas Dufresne 0 siblings, 1 reply; 10+ messages in thread From: Jammy Huang @ 2022-10-26 2:42 UTC (permalink / raw) To: Nicolas Dufresne, eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hi Nicolas, Thanks for your comments. On 2022/10/25 下午 09:18, Nicolas Dufresne wrote: > Hi Jammy, > > thanks for the addition. > > Le mardi 25 octobre 2022 à 17:02 +0800, Jammy Huang a écrit : >> Add user documentation for the aspeed-video driver. >> >> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >> --- >> v10: >> - new >> --- >> .../media/drivers/aspeed-video.rst | 61 +++++++++++++++++++ >> .../userspace-api/media/drivers/index.rst | 1 + >> 2 files changed, 62 insertions(+) >> create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst >> >> diff --git a/Documentation/userspace-api/media/drivers/aspeed-video.rst b/Documentation/userspace-api/media/drivers/aspeed-video.rst >> new file mode 100644 >> index 000000000000..798a2588b175 >> --- /dev/null >> +++ b/Documentation/userspace-api/media/drivers/aspeed-video.rst >> @@ -0,0 +1,61 @@ >> +.. SPDX-License-Identifier: GPL-2.0 >> + >> +.. include:: <isonum.txt> >> + >> +ASPEED video driver >> +=================== >> + >> +ASPEED Video Engine found on AST2400/2500/2600 SoC supports high performance >> +video compressions with a wide range of video quality and compression ratio >> +options. The adopted compressing algorithm is a modified JPEG algorithm. >> + >> +There are 2 types of compressions in this IP. >> + >> +* JPEG JFIF standard mode: for single frame and management compression >> +* ASPEED proprietary mode: for multi-frame and differential compression. >> + Support 2-pass (high quality) video compression scheme (Patent pending by >> + ASPEED). Provide visually lossless video compression quality or to reduce >> + the network average loading under intranet KVM applications. > I think some of the information disclosed in the following quote could be > summarized. Notably the part about the extra buffers. > > Aspeed JPEG Format requires an additional buffer, called bcd, to store > the information about which macro block in the new frame is different > from the previous one. > > To have bcd correctly working, we need to swap the buffers for src0/1 to > make src1 refer to previous frame and src0 to the coming new frame. > > But before I push you this route, have you considered using a dedicated pixel > format instead ? Here's my thinking, the output of the JPEG encoder is no longer > "compatible" (or at least won't yield the expected images) if used with a normal > JPEG decoder. By differentiating these two as dedicated formats, you will only need > 1 vendor control, and you avoid the potential risk of software bugs mixing them up. > Also note that there is other JPEG based vendor formats that exist in V4L2. > > Let me know what do you think ? Yes, I also add a dedicated formats, V4L2_PIX_FMT_AJPG, in this series. In [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format, I add the description in pixfmt-reserved.rst. After this series applied, the users can choose either of these two formats by VIDIOC_S_FMT as per their preference. > > Nicolas > >> + >> +More details on the ASPEED video hardware operations can be found in >> +*chapter 6.2.16 KVM Video Driver* of SDK_User_Guide which available on >> +AspeedTech-BMC/openbmc/releases. >> + >> +The ASPEED video driver implements the following driver-specific control: >> + >> +``V4L2_CID_ASPEED_HQ_MODE`` >> +------------------------------- >> + Enable/Disable ASPEED's High quality mode. This is a private control >> + that can be used to enable high quality for aspeed proprietary mode. >> + >> +.. flat-table:: >> + :header-rows: 0 >> + :stub-columns: 0 >> + :widths: 1 4 >> + >> + * - ``(0)`` >> + - ASPEED HQ mode is disabled. >> + * - ``(1)`` >> + - ASPEED HQ mode is enabled. >> + >> +``V4L2_CID_ASPEED_HQ_JPEG_QUALITY`` >> +------------------------------- >> + Define the quality of ASPEED's High quality mode. This is a private control >> + that can be used to decide compression quality if High quality mode enabled >> + . Higher the value, better the quality and bigger the size. >> + >> +.. flat-table:: >> + :header-rows: 0 >> + :stub-columns: 0 >> + :widths: 1 4 >> + >> + * - ``(1)`` >> + - minimum >> + * - ``(12)`` >> + - maximum >> + * - ``(1)`` >> + - step >> + * - ``(1)`` >> + - default >> + >> +**Copyright** |copy| 2022 ASPEED Technology Inc. >> diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst >> index 32f82aed47d9..46a494e00b72 100644 >> --- a/Documentation/userspace-api/media/drivers/index.rst >> +++ b/Documentation/userspace-api/media/drivers/index.rst >> @@ -31,6 +31,7 @@ For more details see the file COPYING in the source distribution of Linux. >> :maxdepth: 5 >> :numbered: >> >> + aspeed-video >> ccs >> cx2341x-uapi >> dw100 -- Best Regards Jammy ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver 2022-10-26 2:42 ` Jammy Huang @ 2022-10-26 19:02 ` Nicolas Dufresne 2022-10-27 2:11 ` Jammy Huang 0 siblings, 1 reply; 10+ messages in thread From: Nicolas Dufresne @ 2022-10-26 19:02 UTC (permalink / raw) To: Jammy Huang, eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Le mercredi 26 octobre 2022 à 10:42 +0800, Jammy Huang a écrit : > Hi Nicolas, > > Thanks for your comments. > > On 2022/10/25 下午 09:18, Nicolas Dufresne wrote: > > Hi Jammy, > > > > thanks for the addition. > > > > Le mardi 25 octobre 2022 à 17:02 +0800, Jammy Huang a écrit : > > > Add user documentation for the aspeed-video driver. > > > > > > Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> > > > --- > > > v10: > > > - new > > > --- > > > .../media/drivers/aspeed-video.rst | 61 +++++++++++++++++++ > > > .../userspace-api/media/drivers/index.rst | 1 + > > > 2 files changed, 62 insertions(+) > > > create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst > > > > > > diff --git a/Documentation/userspace-api/media/drivers/aspeed-video.rst b/Documentation/userspace-api/media/drivers/aspeed-video.rst > > > new file mode 100644 > > > index 000000000000..798a2588b175 > > > --- /dev/null > > > +++ b/Documentation/userspace-api/media/drivers/aspeed-video.rst > > > @@ -0,0 +1,61 @@ > > > +.. SPDX-License-Identifier: GPL-2.0 > > > + > > > +.. include:: <isonum.txt> > > > + > > > +ASPEED video driver > > > +=================== > > > + > > > +ASPEED Video Engine found on AST2400/2500/2600 SoC supports high performance > > > +video compressions with a wide range of video quality and compression ratio > > > +options. The adopted compressing algorithm is a modified JPEG algorithm. > > > + > > > +There are 2 types of compressions in this IP. > > > + > > > +* JPEG JFIF standard mode: for single frame and management compression > > > +* ASPEED proprietary mode: for multi-frame and differential compression. > > > + Support 2-pass (high quality) video compression scheme (Patent pending by > > > + ASPEED). Provide visually lossless video compression quality or to reduce > > > + the network average loading under intranet KVM applications. > > I think some of the information disclosed in the following quote could be > > summarized. Notably the part about the extra buffers. > > > > Aspeed JPEG Format requires an additional buffer, called bcd, to store > > the information about which macro block in the new frame is different > > from the previous one. > > > > To have bcd correctly working, we need to swap the buffers for src0/1 to > > make src1 refer to previous frame and src0 to the coming new frame. > > > > But before I push you this route, have you considered using a dedicated pixel > > format instead ? Here's my thinking, the output of the JPEG encoder is no longer > > "compatible" (or at least won't yield the expected images) if used with a normal > > JPEG decoder. By differentiating these two as dedicated formats, you will only need > > 1 vendor control, and you avoid the potential risk of software bugs mixing them up. > > Also note that there is other JPEG based vendor formats that exist in V4L2. > > > > Let me know what do you think ? > > Yes, I also add a dedicated formats, V4L2_PIX_FMT_AJPG, in this series. > In [PATCH v10 1/5] > > media: v4l: Add definition for the Aspeed JPEG format, I add the > description in pixfmt-reserved.rst. > > After this series applied, the users can choose either of these two > formats by VIDIOC_S_FMT as > > per their preference. Sorry about that, I have skipped too much. The approach seems fair then, can you state in the doc that these control applies to V4L2_PIX_FMT_AJPG in some way ? (just a little cross-reference can help). The confusion with normal JPEG is easy. thanks for you patience, Nicolas > > > > > Nicolas > > > > > + > > > +More details on the ASPEED video hardware operations can be found in > > > +*chapter 6.2.16 KVM Video Driver* of SDK_User_Guide which available on > > > +AspeedTech-BMC/openbmc/releases. > > > + > > > +The ASPEED video driver implements the following driver-specific control: > > > + > > > +``V4L2_CID_ASPEED_HQ_MODE`` > > > +------------------------------- > > > + Enable/Disable ASPEED's High quality mode. This is a private control > > > + that can be used to enable high quality for aspeed proprietary mode. > > > + > > > +.. flat-table:: > > > + :header-rows: 0 > > > + :stub-columns: 0 > > > + :widths: 1 4 > > > + > > > + * - ``(0)`` > > > + - ASPEED HQ mode is disabled. > > > + * - ``(1)`` > > > + - ASPEED HQ mode is enabled. > > > + > > > +``V4L2_CID_ASPEED_HQ_JPEG_QUALITY`` > > > +------------------------------- > > > + Define the quality of ASPEED's High quality mode. This is a private control > > > + that can be used to decide compression quality if High quality mode enabled > > > + . Higher the value, better the quality and bigger the size. > > > + > > > +.. flat-table:: > > > + :header-rows: 0 > > > + :stub-columns: 0 > > > + :widths: 1 4 > > > + > > > + * - ``(1)`` > > > + - minimum > > > + * - ``(12)`` > > > + - maximum > > > + * - ``(1)`` > > > + - step > > > + * - ``(1)`` > > > + - default > > > + > > > +**Copyright** |copy| 2022 ASPEED Technology Inc. > > > diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst > > > index 32f82aed47d9..46a494e00b72 100644 > > > --- a/Documentation/userspace-api/media/drivers/index.rst > > > +++ b/Documentation/userspace-api/media/drivers/index.rst > > > @@ -31,6 +31,7 @@ For more details see the file COPYING in the source distribution of Linux. > > > :maxdepth: 5 > > > :numbered: > > > > > > + aspeed-video > > > ccs > > > cx2341x-uapi > > > dw100 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver 2022-10-26 19:02 ` Nicolas Dufresne @ 2022-10-27 2:11 ` Jammy Huang 0 siblings, 0 replies; 10+ messages in thread From: Jammy Huang @ 2022-10-27 2:11 UTC (permalink / raw) To: Nicolas Dufresne, eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel On 2022/10/27 上午 03:02, Nicolas Dufresne wrote: > Le mercredi 26 octobre 2022 à 10:42 +0800, Jammy Huang a écrit : >> Hi Nicolas, >> >> Thanks for your comments. >> >> On 2022/10/25 下午 09:18, Nicolas Dufresne wrote: >>> Hi Jammy, >>> >>> thanks for the addition. >>> >>> Le mardi 25 octobre 2022 à 17:02 +0800, Jammy Huang a écrit : >>>> Add user documentation for the aspeed-video driver. >>>> >>>> Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> >>>> --- >>>> v10: >>>> - new >>>> --- >>>> .../media/drivers/aspeed-video.rst | 61 +++++++++++++++++++ >>>> .../userspace-api/media/drivers/index.rst | 1 + >>>> 2 files changed, 62 insertions(+) >>>> create mode 100644 Documentation/userspace-api/media/drivers/aspeed-video.rst >>>> >>>> diff --git a/Documentation/userspace-api/media/drivers/aspeed-video.rst b/Documentation/userspace-api/media/drivers/aspeed-video.rst >>>> new file mode 100644 >>>> index 000000000000..798a2588b175 >>>> --- /dev/null >>>> +++ b/Documentation/userspace-api/media/drivers/aspeed-video.rst >>>> @@ -0,0 +1,61 @@ >>>> +.. SPDX-License-Identifier: GPL-2.0 >>>> + >>>> +.. include:: <isonum.txt> >>>> + >>>> +ASPEED video driver >>>> +=================== >>>> + >>>> +ASPEED Video Engine found on AST2400/2500/2600 SoC supports high performance >>>> +video compressions with a wide range of video quality and compression ratio >>>> +options. The adopted compressing algorithm is a modified JPEG algorithm. >>>> + >>>> +There are 2 types of compressions in this IP. >>>> + >>>> +* JPEG JFIF standard mode: for single frame and management compression >>>> +* ASPEED proprietary mode: for multi-frame and differential compression. >>>> + Support 2-pass (high quality) video compression scheme (Patent pending by >>>> + ASPEED). Provide visually lossless video compression quality or to reduce >>>> + the network average loading under intranet KVM applications. >>> I think some of the information disclosed in the following quote could be >>> summarized. Notably the part about the extra buffers. >>> >>> Aspeed JPEG Format requires an additional buffer, called bcd, to store >>> the information about which macro block in the new frame is different >>> from the previous one. >>> >>> To have bcd correctly working, we need to swap the buffers for src0/1 to >>> make src1 refer to previous frame and src0 to the coming new frame. >>> >>> But before I push you this route, have you considered using a dedicated pixel >>> format instead ? Here's my thinking, the output of the JPEG encoder is no longer >>> "compatible" (or at least won't yield the expected images) if used with a normal >>> JPEG decoder. By differentiating these two as dedicated formats, you will only need >>> 1 vendor control, and you avoid the potential risk of software bugs mixing them up. >>> Also note that there is other JPEG based vendor formats that exist in V4L2. >>> >>> Let me know what do you think ? >> Yes, I also add a dedicated formats, V4L2_PIX_FMT_AJPG, in this series. >> In [PATCH v10 1/5] >> >> media: v4l: Add definition for the Aspeed JPEG format, I add the >> description in pixfmt-reserved.rst. >> >> After this series applied, the users can choose either of these two >> formats by VIDIOC_S_FMT as >> >> per their preference. > Sorry about that, I have skipped too much. The approach seems fair then, can you > state in the doc that these control applies to V4L2_PIX_FMT_AJPG in some way ? > (just a little cross-reference can help). The confusion with normal JPEG is > easy. > > thanks for you patience, > Nicolas Sure, I will add the words below in next patch. "VIDIOC_S_FMT can be used to choose which format you want. V4L2_PIX_FMT_JPEG stands for JPEG JFIF standard mode; V4L2_PIX_FMT_AJPG stands for ASPEED proprietary mode." Thanks for your help. >>> Nicolas >>> >>>> + >>>> +More details on the ASPEED video hardware operations can be found in >>>> +*chapter 6.2.16 KVM Video Driver* of SDK_User_Guide which available on >>>> +AspeedTech-BMC/openbmc/releases. >>>> + >>>> +The ASPEED video driver implements the following driver-specific control: >>>> + >>>> +``V4L2_CID_ASPEED_HQ_MODE`` >>>> +------------------------------- >>>> + Enable/Disable ASPEED's High quality mode. This is a private control >>>> + that can be used to enable high quality for aspeed proprietary mode. >>>> + >>>> +.. flat-table:: >>>> + :header-rows: 0 >>>> + :stub-columns: 0 >>>> + :widths: 1 4 >>>> + >>>> + * - ``(0)`` >>>> + - ASPEED HQ mode is disabled. >>>> + * - ``(1)`` >>>> + - ASPEED HQ mode is enabled. >>>> + >>>> +``V4L2_CID_ASPEED_HQ_JPEG_QUALITY`` >>>> +------------------------------- >>>> + Define the quality of ASPEED's High quality mode. This is a private control >>>> + that can be used to decide compression quality if High quality mode enabled >>>> + . Higher the value, better the quality and bigger the size. >>>> + >>>> +.. flat-table:: >>>> + :header-rows: 0 >>>> + :stub-columns: 0 >>>> + :widths: 1 4 >>>> + >>>> + * - ``(1)`` >>>> + - minimum >>>> + * - ``(12)`` >>>> + - maximum >>>> + * - ``(1)`` >>>> + - step >>>> + * - ``(1)`` >>>> + - default >>>> + >>>> +**Copyright** |copy| 2022 ASPEED Technology Inc. >>>> diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst >>>> index 32f82aed47d9..46a494e00b72 100644 >>>> --- a/Documentation/userspace-api/media/drivers/index.rst >>>> +++ b/Documentation/userspace-api/media/drivers/index.rst >>>> @@ -31,6 +31,7 @@ For more details see the file COPYING in the source distribution of Linux. >>>> :maxdepth: 5 >>>> :numbered: >>>> >>>> + aspeed-video >>>> ccs >>>> cx2341x-uapi >>>> dw100 -- Best Regards Jammy ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v10 4/5] media: aspeed: Support aspeed mode to reduce compressed data 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang ` (2 preceding siblings ...) 2022-10-25 9:02 ` [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver Jammy Huang @ 2022-10-25 9:02 ` Jammy Huang 2022-10-25 9:02 ` [PATCH v10 5/5] media: aspeed: Extend debug message Jammy Huang 4 siblings, 0 replies; 10+ messages in thread From: Jammy Huang @ 2022-10-25 9:02 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Cc: kernel test robot aspeed supports differential jpeg format which only compress the parts which are changed. In this way, it reduces both the amount of data to be transferred by network and those to be decoded on the client side. 2 new ctrls are added: * Aspeed HQ Mode: to control aspeed's high quality(2-pass) compression mode This only works with yuv444 subsampling. * Aspeed HQ Quality: to control the quality of aspeed's HQ mode only useful if Aspeed HQ mode is enabled Aspeed JPEG Format requires an additional buffer, called bcd, to store the information about which macro block in the new frame is different from the previous one. To have bcd correctly working, we need to swap the buffers for src0/1 to make src1 refer to previous frame and src0 to the coming new frame. Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> Reported-by: kernel test robot <lkp@intel.com> --- v10: - Fix warnings reported by kernel test robot. v9: - Rebase on new kernel v8: - no update v7: - rename compression_mode as compression_scheme - add reset bcd buffer every 8 frames to generate an I frame - update commit message v6: - no update v5: - use runtime configuration to handle differences between soc - add aspeed_video_swap_src_buf(). v4 - add include/uapi/linux/aspeed-video.h for V4L2_CID_ASPEED_XXX - add aspeed_video_set_format - remove aspeed_ctrl_format - add variable, format, to replace partial_jpeg - modify aspeed_ctrl_HQ_jpeg_quality's range - reduce bcd buffer size - update commit message v3: - 'compression mode' only available for G4 v2: - update commit message - use v4l2_xxx log rather than self-defined macro --- drivers/media/platform/aspeed/aspeed-video.c | 279 +++++++++++++++---- include/uapi/linux/aspeed-video.h | 14 + 2 files changed, 242 insertions(+), 51 deletions(-) create mode 100644 include/uapi/linux/aspeed-video.h diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c index 20f795ccc11b..0b3605ebefc3 100644 --- a/drivers/media/platform/aspeed/aspeed-video.c +++ b/drivers/media/platform/aspeed/aspeed-video.c @@ -33,6 +33,7 @@ #include <media/v4l2-event.h> #include <media/v4l2-ioctl.h> #include <media/videobuf2-dma-contig.h> +#include <uapi/linux/aspeed-video.h> #define ASPEED_VIDEO_V4L2_MIN_BUF_REQ 3 @@ -59,6 +60,7 @@ #define VE_MAX_SRC_BUFFER_SIZE 0x8ca000 /* 1920 * 1200, 32bpp */ #define VE_JPEG_HEADER_SIZE 0x006000 /* 512 * 12 * 4 */ +#define VE_BCD_BUFF_SIZE 0x9000 /* (1920/8) * (1200/8) */ #define VE_PROTECTION_KEY 0x000 #define VE_PROTECTION_KEY_UNLOCK 0x1a038aa8 @@ -107,6 +109,13 @@ #define VE_SCALING_FILTER2 0x020 #define VE_SCALING_FILTER3 0x024 +#define VE_BCD_CTRL 0x02C +#define VE_BCD_CTRL_EN_BCD BIT(0) +#define VE_BCD_CTRL_EN_ABCD BIT(1) +#define VE_BCD_CTRL_EN_CB BIT(2) +#define VE_BCD_CTRL_THR GENMASK(23, 16) +#define VE_BCD_CTRL_ABCD_THR GENMASK(31, 24) + #define VE_CAP_WINDOW 0x030 #define VE_COMP_WINDOW 0x034 #define VE_COMP_PROC_OFFSET 0x038 @@ -115,6 +124,7 @@ #define VE_SRC0_ADDR 0x044 #define VE_SRC_SCANLINE_OFFSET 0x048 #define VE_SRC1_ADDR 0x04c +#define VE_BCD_ADDR 0x050 #define VE_COMP_ADDR 0x054 #define VE_STREAM_BUF_SIZE 0x058 @@ -135,6 +145,8 @@ #define VE_COMP_CTRL_HQ_DCT_CHR GENMASK(26, 22) #define VE_COMP_CTRL_HQ_DCT_LUM GENMASK(31, 27) +#define VE_CB_ADDR 0x06C + #define AST2400_VE_COMP_SIZE_READ_BACK 0x078 #define AST2600_VE_COMP_SIZE_READ_BACK 0x084 @@ -211,6 +223,12 @@ enum { VIDEO_CLOCKS_ON, }; +enum aspeed_video_format { + VIDEO_FMT_STANDARD = 0, + VIDEO_FMT_ASPEED, + VIDEO_FMT_MAX = VIDEO_FMT_ASPEED +}; + // for VE_CTRL_CAPTURE_FMT enum aspeed_video_capture_format { VIDEO_CAP_FMT_YUV_STUDIO_SWING = 0, @@ -245,16 +263,20 @@ struct aspeed_video_perf { /* * struct aspeed_video - driver data * - * res_work: holds the delayed_work for res-detection if unlock - * buffers: holds the list of buffer queued from user + * res_work: holds the delayed_work for res-detection if unlock + * buffers: holds the list of buffer queued from user * flags: holds the state of video * sequence: holds the last number of frame completed * max_compressed_size: holds max compressed stream's size * srcs: holds the buffer information for srcs * jpeg: holds the buffer information for jpeg header + * bcd: holds the buffer information for bcd work * yuv420: a flag raised if JPEG subsampling is 420 + * format: holds the video format + * hq_mode: a flag raised if HQ is enabled. Only for VIDEO_FMT_ASPEED * frame_rate: holds the frame_rate * jpeg_quality: holds jpeq's quality (0~11) + * jpeg_hq_quality: holds hq's quality (1~12) only if hq_mode enabled * frame_bottom: end position of video data in vertical direction * frame_left: start position of video data in horizontal direction * frame_right: end position of video data in horizontal direction @@ -290,10 +312,14 @@ struct aspeed_video { unsigned int max_compressed_size; struct aspeed_video_addr srcs[2]; struct aspeed_video_addr jpeg; + struct aspeed_video_addr bcd; bool yuv420; + enum aspeed_video_format format; + bool hq_mode; unsigned int frame_rate; unsigned int jpeg_quality; + unsigned int jpeg_hq_quality; unsigned int frame_bottom; unsigned int frame_left; @@ -458,8 +484,18 @@ static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = { }, }; +static const char * const format_str[] = {"Standard JPEG", + "Aspeed JPEG"}; + static unsigned int debug; +static bool aspeed_video_alloc_buf(struct aspeed_video *video, + struct aspeed_video_addr *addr, + unsigned int size); + +static void aspeed_video_free_buf(struct aspeed_video *video, + struct aspeed_video_addr *addr); + static void aspeed_video_init_jpeg_table(u32 *table, bool yuv420) { int i; @@ -547,6 +583,7 @@ static int aspeed_video_start_frame(struct aspeed_video *video) unsigned long flags; struct aspeed_video_buffer *buf; u32 seq_ctrl = aspeed_video_read(video, VE_SEQ_CTRL); + bool bcd_buf_need = (video->format != VIDEO_FMT_STANDARD); if (video->v4l2_input_status) { v4l2_warn(&video->v4l2_dev, "No signal; don't start frame\n"); @@ -559,6 +596,20 @@ static int aspeed_video_start_frame(struct aspeed_video *video) return -EBUSY; } + if (bcd_buf_need && !video->bcd.size) { + if (!aspeed_video_alloc_buf(video, &video->bcd, + VE_BCD_BUFF_SIZE)) { + dev_err(video->dev, "Failed to allocate BCD buffer\n"); + dev_err(video->dev, "don't start frame\n"); + return -ENOMEM; + } + aspeed_video_write(video, VE_BCD_ADDR, video->bcd.dma); + v4l2_dbg(1, debug, &video->v4l2_dev, "bcd addr(%#x) size(%d)\n", + video->bcd.dma, video->bcd.size); + } else if (!bcd_buf_need && video->bcd.size) { + aspeed_video_free_buf(video, &video->bcd); + } + spin_lock_irqsave(&video->lock, flags); buf = list_first_entry_or_null(&video->buffers, struct aspeed_video_buffer, link); @@ -657,6 +708,24 @@ static void aspeed_video_irq_res_change(struct aspeed_video *video, ulong delay) schedule_delayed_work(&video->res_work, delay); } +static void aspeed_video_swap_src_buf(struct aspeed_video *v) +{ + if (v->format == VIDEO_FMT_STANDARD) + return; + + /* Reset bcd buffer to have a full frame update every 8 frames. */ + if (IS_ALIGNED(v->sequence, 8)) + memset((u8 *)v->bcd.virt, 0x00, VE_BCD_BUFF_SIZE); + + if (v->sequence & 0x01) { + aspeed_video_write(v, VE_SRC0_ADDR, v->srcs[1].dma); + aspeed_video_write(v, VE_SRC1_ADDR, v->srcs[0].dma); + } else { + aspeed_video_write(v, VE_SRC0_ADDR, v->srcs[0].dma); + aspeed_video_write(v, VE_SRC1_ADDR, v->srcs[1].dma); + } +} + static irqreturn_t aspeed_video_irq(int irq, void *arg) { struct aspeed_video *video = arg; @@ -705,6 +774,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) if (sts & VE_INTERRUPT_COMP_COMPLETE) { struct aspeed_video_buffer *buf; + bool empty = true; u32 frame_size = aspeed_video_read(video, video->comp_size_read); @@ -718,13 +788,23 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) if (buf) { vb2_set_plane_payload(&buf->vb.vb2_buf, 0, frame_size); - if (!list_is_last(&buf->link, &video->buffers)) { + /* + * aspeed_jpeg requires continuous update. + * On the contrary, standard jpeg can keep last buffer + * to always have the latest result. + */ + if (video->format == VIDEO_FMT_STANDARD && + list_is_last(&buf->link, &video->buffers)) { + empty = false; + v4l2_warn(&video->v4l2_dev, "skip to keep last frame updated\n"); + } else { buf->vb.vb2_buf.timestamp = ktime_get_ns(); buf->vb.sequence = video->sequence++; buf->vb.field = V4L2_FIELD_NONE; vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE); list_del(&buf->link); + empty = list_empty(&video->buffers); } } spin_unlock(&video->lock); @@ -738,7 +818,10 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) aspeed_video_write(video, VE_INTERRUPT_STATUS, VE_INTERRUPT_COMP_COMPLETE); sts &= ~VE_INTERRUPT_COMP_COMPLETE; - if (test_bit(VIDEO_STREAMING, &video->flags) && buf) + + aspeed_video_swap_src_buf(video); + + if (test_bit(VIDEO_STREAMING, &video->flags) && !empty) aspeed_video_start_frame(video); } @@ -1085,10 +1168,14 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) FIELD_PREP(VE_TGS_FIRST, video->frame_top) | FIELD_PREP(VE_TGS_LAST, video->frame_bottom + 1)); - aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_INT_DE); + aspeed_video_update(video, VE_CTRL, + VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH, + VE_CTRL_INT_DE); } else { v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct Mode\n"); - aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_DIRECT_FETCH); + aspeed_video_update(video, VE_CTRL, + VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH, + VE_CTRL_DIRECT_FETCH); } size *= 4; @@ -1121,21 +1208,66 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) aspeed_video_free_buf(video, &video->srcs[0]); } -static void aspeed_video_init_regs(struct aspeed_video *video) +static void aspeed_video_update_regs(struct aspeed_video *video) { - u32 comp_ctrl = VE_COMP_CTRL_RSVD | - FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | - FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); - u32 ctrl = VE_CTRL_AUTO_OR_CURSOR | - FIELD_PREP(VE_CTRL_CAPTURE_FMT, VIDEO_CAP_FMT_YUV_FULL_SWING); - u32 seq_ctrl = video->jpeg_mode; + u8 jpeg_hq_quality = clamp((int)video->jpeg_hq_quality - 1, 0, + ASPEED_VIDEO_JPEG_NUM_QUALITIES - 1); + u32 comp_ctrl = FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | + FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10) | + FIELD_PREP(VE_COMP_CTRL_EN_HQ, video->hq_mode) | + FIELD_PREP(VE_COMP_CTRL_HQ_DCT_LUM, jpeg_hq_quality) | + FIELD_PREP(VE_COMP_CTRL_HQ_DCT_CHR, jpeg_hq_quality | 0x10); + u32 ctrl = 0; + u32 seq_ctrl = 0; + + v4l2_dbg(1, debug, &video->v4l2_dev, "framerate(%d)\n", + video->frame_rate); + v4l2_dbg(1, debug, &video->v4l2_dev, "jpeg format(%s) subsample(%s)\n", + format_str[video->format], + video->yuv420 ? "420" : "444"); + v4l2_dbg(1, debug, &video->v4l2_dev, "compression quality(%d)\n", + video->jpeg_quality); + v4l2_dbg(1, debug, &video->v4l2_dev, "hq_mode(%s) hq_quality(%d)\n", + video->hq_mode ? "on" : "off", video->jpeg_hq_quality); + + if (video->format == VIDEO_FMT_ASPEED) + aspeed_video_update(video, VE_BCD_CTRL, 0, VE_BCD_CTRL_EN_BCD); + else + aspeed_video_update(video, VE_BCD_CTRL, VE_BCD_CTRL_EN_BCD, 0); if (video->frame_rate) ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); + if (video->format == VIDEO_FMT_STANDARD) { + comp_ctrl &= ~FIELD_PREP(VE_COMP_CTRL_EN_HQ, video->hq_mode); + seq_ctrl |= video->jpeg_mode; + } + if (video->yuv420) seq_ctrl |= VE_SEQ_CTRL_YUV420; + if (video->jpeg.virt) + aspeed_video_update_jpeg_table(video->jpeg.virt, video->yuv420); + + + /* Set control registers */ + aspeed_video_update(video, VE_SEQ_CTRL, + video->jpeg_mode | VE_SEQ_CTRL_YUV420, + seq_ctrl); + aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, ctrl); + aspeed_video_update(video, VE_COMP_CTRL, + VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR | + VE_COMP_CTRL_EN_HQ | VE_COMP_CTRL_HQ_DCT_LUM | + VE_COMP_CTRL_HQ_DCT_CHR | VE_COMP_CTRL_VQ_4COLOR | + VE_COMP_CTRL_VQ_DCT_ONLY, + comp_ctrl); +} + +static void aspeed_video_init_regs(struct aspeed_video *video) +{ + u32 ctrl = VE_CTRL_AUTO_OR_CURSOR | + FIELD_PREP(VE_CTRL_CAPTURE_FMT, VIDEO_CAP_FMT_YUV_FULL_SWING); + /* Unlock VE registers */ aspeed_video_write(video, VE_PROTECTION_KEY, VE_PROTECTION_KEY_UNLOCK); @@ -1150,9 +1282,8 @@ static void aspeed_video_init_regs(struct aspeed_video *video) aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma); /* Set control registers */ - aspeed_video_write(video, VE_SEQ_CTRL, seq_ctrl); aspeed_video_write(video, VE_CTRL, ctrl); - aspeed_video_write(video, VE_COMP_CTRL, comp_ctrl); + aspeed_video_write(video, VE_COMP_CTRL, VE_COMP_CTRL_RSVD); /* Don't downscale */ aspeed_video_write(video, VE_SCALING_FACTOR, 0x10001000); @@ -1168,6 +1299,8 @@ static void aspeed_video_init_regs(struct aspeed_video *video) FIELD_PREP(VE_MODE_DT_HOR_STABLE, 6) | FIELD_PREP(VE_MODE_DT_VER_STABLE, 6) | FIELD_PREP(VE_MODE_DT_EDG_THROD, 0x65)); + + aspeed_video_write(video, VE_BCD_CTRL, 0); } static void aspeed_video_start(struct aspeed_video *video) @@ -1201,6 +1334,9 @@ static void aspeed_video_stop(struct aspeed_video *video) if (video->srcs[1].size) aspeed_video_free_buf(video, &video->srcs[1]); + if (video->bcd.size) + aspeed_video_free_buf(video, &video->bcd); + video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; video->flags = 0; } @@ -1219,10 +1355,12 @@ static int aspeed_video_querycap(struct file *file, void *fh, static int aspeed_video_enum_format(struct file *file, void *fh, struct v4l2_fmtdesc *f) { + struct aspeed_video *video = video_drvdata(file); + if (f->index) return -EINVAL; - f->pixelformat = V4L2_PIX_FMT_JPEG; + f->pixelformat = video->pix_fmt.pixelformat; return 0; } @@ -1237,6 +1375,29 @@ static int aspeed_video_get_format(struct file *file, void *fh, return 0; } +static int aspeed_video_set_format(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct aspeed_video *video = video_drvdata(file); + + if (vb2_is_busy(&video->queue)) + return -EBUSY; + + switch (f->fmt.pix.pixelformat) { + case V4L2_PIX_FMT_JPEG: + video->format = VIDEO_FMT_STANDARD; + break; + case V4L2_PIX_FMT_AJPG: + video->format = VIDEO_FMT_ASPEED; + break; + default: + return -EINVAL; + } + video->pix_fmt.pixelformat = f->fmt.pix.pixelformat; + + return 0; +} + static int aspeed_video_enum_input(struct file *file, void *fh, struct v4l2_input *inp) { @@ -1454,7 +1615,7 @@ static const struct v4l2_ioctl_ops aspeed_video_ioctl_ops = { .vidioc_enum_fmt_vid_cap = aspeed_video_enum_format, .vidioc_g_fmt_vid_cap = aspeed_video_get_format, - .vidioc_s_fmt_vid_cap = aspeed_video_get_format, + .vidioc_s_fmt_vid_cap = aspeed_video_set_format, .vidioc_try_fmt_vid_cap = aspeed_video_get_format, .vidioc_reqbufs = vb2_ioctl_reqbufs, @@ -1486,27 +1647,6 @@ static const struct v4l2_ioctl_ops aspeed_video_ioctl_ops = { .vidioc_unsubscribe_event = v4l2_event_unsubscribe, }; -static void aspeed_video_update_jpeg_quality(struct aspeed_video *video) -{ - u32 comp_ctrl = FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | - FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); - - aspeed_video_update(video, VE_COMP_CTRL, - VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR, - comp_ctrl); -} - -static void aspeed_video_update_subsampling(struct aspeed_video *video) -{ - if (video->jpeg.virt) - aspeed_video_update_jpeg_table(video->jpeg.virt, video->yuv420); - - if (video->yuv420) - aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_YUV420); - else - aspeed_video_update(video, VE_SEQ_CTRL, VE_SEQ_CTRL_YUV420, 0); -} - static int aspeed_video_set_ctrl(struct v4l2_ctrl *ctrl) { struct aspeed_video *video = container_of(ctrl->handler, @@ -1516,16 +1656,23 @@ static int aspeed_video_set_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_JPEG_COMPRESSION_QUALITY: video->jpeg_quality = ctrl->val; - aspeed_video_update_jpeg_quality(video); + if (test_bit(VIDEO_STREAMING, &video->flags)) + aspeed_video_update_regs(video); break; case V4L2_CID_JPEG_CHROMA_SUBSAMPLING: - if (ctrl->val == V4L2_JPEG_CHROMA_SUBSAMPLING_420) { - video->yuv420 = true; - aspeed_video_update_subsampling(video); - } else { - video->yuv420 = false; - aspeed_video_update_subsampling(video); - } + video->yuv420 = (ctrl->val == V4L2_JPEG_CHROMA_SUBSAMPLING_420); + if (test_bit(VIDEO_STREAMING, &video->flags)) + aspeed_video_update_regs(video); + break; + case V4L2_CID_ASPEED_HQ_MODE: + video->hq_mode = ctrl->val; + if (test_bit(VIDEO_STREAMING, &video->flags)) + aspeed_video_update_regs(video); + break; + case V4L2_CID_ASPEED_HQ_JPEG_QUALITY: + video->jpeg_hq_quality = ctrl->val; + if (test_bit(VIDEO_STREAMING, &video->flags)) + aspeed_video_update_regs(video); break; default: return -EINVAL; @@ -1538,6 +1685,28 @@ static const struct v4l2_ctrl_ops aspeed_video_ctrl_ops = { .s_ctrl = aspeed_video_set_ctrl, }; +static const struct v4l2_ctrl_config aspeed_ctrl_HQ_mode = { + .ops = &aspeed_video_ctrl_ops, + .id = V4L2_CID_ASPEED_HQ_MODE, + .name = "Aspeed HQ Mode", + .type = V4L2_CTRL_TYPE_BOOLEAN, + .min = false, + .max = true, + .step = 1, + .def = false, +}; + +static const struct v4l2_ctrl_config aspeed_ctrl_HQ_jpeg_quality = { + .ops = &aspeed_video_ctrl_ops, + .id = V4L2_CID_ASPEED_HQ_JPEG_QUALITY, + .name = "Aspeed HQ Quality", + .type = V4L2_CTRL_TYPE_INTEGER, + .min = 1, + .max = ASPEED_VIDEO_JPEG_NUM_QUALITIES, + .step = 1, + .def = 1, +}; + static void aspeed_video_resolution_work(struct work_struct *work) { struct delayed_work *dwork = to_delayed_work(work); @@ -1552,6 +1721,8 @@ static void aspeed_video_resolution_work(struct work_struct *work) aspeed_video_init_regs(video); + aspeed_video_update_regs(video); + aspeed_video_get_resolution(video); if (video->detected_timings.width != video->active_timings.width || @@ -1662,6 +1833,8 @@ static int aspeed_video_start_streaming(struct vb2_queue *q, video->perf.duration_max = 0; video->perf.duration_min = 0xffffffff; + aspeed_video_update_regs(video); + rc = aspeed_video_start_frame(video); if (rc) { aspeed_video_bufs_done(video, VB2_BUF_STATE_QUEUED); @@ -1800,6 +1973,7 @@ static int aspeed_video_setup_video(struct aspeed_video *video) struct v4l2_device *v4l2_dev = &video->v4l2_dev; struct vb2_queue *vbq = &video->queue; struct video_device *vdev = &video->vdev; + struct v4l2_ctrl_handler *hdl = &video->ctrl_handler; int rc; video->pix_fmt.pixelformat = V4L2_PIX_FMT_JPEG; @@ -1814,16 +1988,18 @@ static int aspeed_video_setup_video(struct aspeed_video *video) return rc; } - v4l2_ctrl_handler_init(&video->ctrl_handler, 2); - v4l2_ctrl_new_std(&video->ctrl_handler, &aspeed_video_ctrl_ops, + v4l2_ctrl_handler_init(hdl, 4); + v4l2_ctrl_new_std(hdl, &aspeed_video_ctrl_ops, V4L2_CID_JPEG_COMPRESSION_QUALITY, 0, ASPEED_VIDEO_JPEG_NUM_QUALITIES - 1, 1, 0); - v4l2_ctrl_new_std_menu(&video->ctrl_handler, &aspeed_video_ctrl_ops, + v4l2_ctrl_new_std_menu(hdl, &aspeed_video_ctrl_ops, V4L2_CID_JPEG_CHROMA_SUBSAMPLING, V4L2_JPEG_CHROMA_SUBSAMPLING_420, mask, V4L2_JPEG_CHROMA_SUBSAMPLING_444); + v4l2_ctrl_new_custom(hdl, &aspeed_ctrl_HQ_mode, NULL); + v4l2_ctrl_new_custom(hdl, &aspeed_ctrl_HQ_jpeg_quality, NULL); - rc = video->ctrl_handler.error; + rc = hdl->error; if (rc) { v4l2_ctrl_handler_free(&video->ctrl_handler); v4l2_device_unregister(v4l2_dev); @@ -1832,7 +2008,7 @@ static int aspeed_video_setup_video(struct aspeed_video *video) return rc; } - v4l2_dev->ctrl_handler = &video->ctrl_handler; + v4l2_dev->ctrl_handler = hdl; vbq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; vbq->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF; @@ -1980,6 +2156,7 @@ static int aspeed_video_probe(struct platform_device *pdev) video->comp_size_read = config->comp_size_read; video->frame_rate = 30; + video->jpeg_hq_quality = 1; video->dev = &pdev->dev; spin_lock_init(&video->lock); mutex_init(&video->video_lock); diff --git a/include/uapi/linux/aspeed-video.h b/include/uapi/linux/aspeed-video.h new file mode 100644 index 000000000000..6586a65548c4 --- /dev/null +++ b/include/uapi/linux/aspeed-video.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* + * Copyright (C) 2021 ASPEED Technology Inc. + */ + +#ifndef _UAPI_LINUX_ASPEED_VIDEO_H +#define _UAPI_LINUX_ASPEED_VIDEO_H + +#include <linux/v4l2-controls.h> + +#define V4L2_CID_ASPEED_HQ_MODE (V4L2_CID_USER_ASPEED_BASE + 1) +#define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (V4L2_CID_USER_ASPEED_BASE + 2) + +#endif /* _UAPI_LINUX_ASPEED_VIDEO_H */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v10 5/5] media: aspeed: Extend debug message 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang ` (3 preceding siblings ...) 2022-10-25 9:02 ` [PATCH v10 4/5] media: aspeed: Support aspeed mode to reduce compressed data Jammy Huang @ 2022-10-25 9:02 ` Jammy Huang 4 siblings, 0 replies; 10+ messages in thread From: Jammy Huang @ 2022-10-25 9:02 UTC (permalink / raw) To: eajames, mchehab, joel, andrew, hverkuil-cisco, laurent.pinchart, xavier.roumegue, ezequiel, stanimir.varbanov, nicolas.dufresne, sakari.ailus, ming.qian, andrzej.p, linux-media, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel updated as below: Capture: Mode : Direct fetch VGA bpp mode : 32 Signal : lock Width : 1920 Height : 1080 FRC : 0 Compression: Format : JPEG Subsampling : 444 Quality : 4 Performance: Frame# : 4 Frame Duration(ms) : Now : 22 Min : 21 Max : 22 FPS : 45 Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com> --- v10: - no update v9: - no update v8: - no update v7: - update debugfs message. Aspeed-jpeg's compression parameters only shown if it's aspeed jpeg now v6: - no update v5: - no update v4: - update debugfs log v3: - no update v2: - update commit message --- drivers/media/platform/aspeed/aspeed-video.c | 38 +++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c index 0b3605ebefc3..cf76aeee8cb6 100644 --- a/drivers/media/platform/aspeed/aspeed-video.c +++ b/drivers/media/platform/aspeed/aspeed-video.c @@ -1905,9 +1905,29 @@ static const struct vb2_ops aspeed_video_vb2_ops = { static int aspeed_video_debugfs_show(struct seq_file *s, void *data) { struct aspeed_video *v = s->private; + u32 val08; seq_puts(s, "\n"); + seq_puts(s, "Capture:\n"); + val08 = aspeed_video_read(v, VE_CTRL); + if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) { + seq_printf(s, " %-20s:\tDirect fetch\n", "Mode"); + seq_printf(s, " %-20s:\t%s\n", "VGA bpp mode", + FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32"); + } else { + seq_printf(s, " %-20s:\tSync\n", "Mode"); + seq_printf(s, " %-20s:\t%s\n", "Video source", + FIELD_GET(VE_CTRL_SOURCE, val08) ? + "external" : "internal"); + seq_printf(s, " %-20s:\t%s\n", "DE source", + FIELD_GET(VE_CTRL_INT_DE, val08) ? + "internal" : "external"); + seq_printf(s, " %-20s:\t%s\n", "Cursor overlay", + FIELD_GET(VE_CTRL_AUTO_OR_CURSOR, val08) ? + "Without" : "With"); + } + seq_printf(s, " %-20s:\t%s\n", "Signal", v->v4l2_input_status ? "Unlock" : "Lock"); seq_printf(s, " %-20s:\t%d\n", "Width", v->pix_fmt.width); @@ -1916,13 +1936,29 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data) seq_puts(s, "\n"); + seq_puts(s, "Compression:\n"); + seq_printf(s, " %-20s:\t%s\n", "Format", format_str[v->format]); + seq_printf(s, " %-20s:\t%s\n", "Subsampling", + v->yuv420 ? "420" : "444"); + seq_printf(s, " %-20s:\t%d\n", "Quality", v->jpeg_quality); + if (v->format == VIDEO_FMT_ASPEED) { + seq_printf(s, " %-20s:\t%s\n", "HQ Mode", + v->hq_mode ? "on" : "off"); + seq_printf(s, " %-20s:\t%d\n", "HQ Quality", + v->hq_mode ? v->jpeg_hq_quality : 0); + } + + seq_puts(s, "\n"); + seq_puts(s, "Performance:\n"); seq_printf(s, " %-20s:\t%d\n", "Frame#", v->sequence); seq_printf(s, " %-20s:\n", "Frame Duration(ms)"); seq_printf(s, " %-18s:\t%d\n", "Now", v->perf.duration); seq_printf(s, " %-18s:\t%d\n", "Min", v->perf.duration_min); seq_printf(s, " %-18s:\t%d\n", "Max", v->perf.duration_max); - seq_printf(s, " %-20s:\t%d\n", "FPS", 1000 / (v->perf.totaltime / v->sequence)); + seq_printf(s, " %-20s:\t%d\n", "FPS", + (v->perf.totaltime && v->sequence) ? + 1000/(v->perf.totaltime/v->sequence) : 0); return 0; } -- 2.25.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-10-27 2:13 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-10-25 9:01 [PATCH v10 0/5] add aspeed-jpeg support for aspeed-video Jammy Huang 2022-10-25 9:01 ` [PATCH v10 1/5] media: v4l: Add definition for the Aspeed JPEG format Jammy Huang 2022-10-25 9:02 ` [PATCH v10 2/5] media: v4l2-ctrls: Reserve controls for ASPEED Jammy Huang 2022-10-25 9:02 ` [PATCH v10 3/5] media: Documentation: aspeed-video: Add user documentation for the aspeed-video driver Jammy Huang 2022-10-25 13:18 ` Nicolas Dufresne 2022-10-26 2:42 ` Jammy Huang 2022-10-26 19:02 ` Nicolas Dufresne 2022-10-27 2:11 ` Jammy Huang 2022-10-25 9:02 ` [PATCH v10 4/5] media: aspeed: Support aspeed mode to reduce compressed data Jammy Huang 2022-10-25 9:02 ` [PATCH v10 5/5] media: aspeed: Extend debug message Jammy Huang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).