Support Nuvoton NPCM Video Capture/Encode Engine
Subsystems (4)
v15 cover Support Nuvoton NPCM Video Capture/Encode Engine
This patch series add DTS node, dt-bindings document and drivers for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs.
As described in the datasheet NPCM750D_DS_Rev_1.0, the VCD can capture a frame from digital video input and compare two frames in memory, and then the ECE can compress the frame data into HEXTILE format which is defined in Remote Framebuffer Protocol (RFC 6143, chapter 7.7.4. Hextile Encoding).
The output of v4l2-compliance:
v4l2-compliance 1.23.0-4996, 64 bits, 64-bit time_t v4l2-compliance SHA: 9431e4b26b48 2023-02-13 14:51:47
Compliance test for npcm-video device /dev/video0:
Driver Info:
Driver name : npcm-video
Card type : NPCM Video Engine
Bus info : platform:npcm-video
Driver version : 6.1.12
Capabilities : 0x84200001 Video Capture
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04200001
Video Capture
Streaming
Extended Pix Format
Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 1 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK test VIDIOC_DV_TIMINGS_CAP: OK
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls (Input 0):
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
warn: v4l2-test-controls.cpp(1139): V4L2_CID_DV_RX_POWER_PRESENT not found for input 0
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 1 Private Controls: 2
Format ioctls (Input 0):
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported)
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls (Input 0):
test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls (Input 0):
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for npcm-video device /dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 1
Changes in v15:
- Drop VOLATILE flag from V4L2_CID_NPCM_RECT_COUNT control and update value by v4l2_ctrl_s_ctrl.
- Add more explanations in comment/document for V4L2_CID_NPCM_RECT_COUNT.
Changes in v14:
- Modify the flow of setting resolution and queue setup
- Correct the control type (TYPE_MENU) of selecting between two modes.
- Let ECE could be optional (only supports PIX_FMT_RGB565 if ECE is not enabled in DT).
Changes in v13:
- Modify the flow for capturing next frame
- Modify the behavior of resolution change interrupt
- Move GFXI dt-bindings document to Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml
Changes in v12:
- Modify the flow for detecting resolution change and raise V4L2_EVENT_SOURCE_CHANGE event.
- Add V4L2_PIX_FMT_RGB565 format support.
Changes in v11:
- Replace "u8/u16/u32" with "unsigned int" for generic local variables.
- Correct subsystem prefixes, drop redundant words in commit subject, and add more information in commit message.
Changes in v10:
- drivers/media/platform/nuvoton/npcm-video.c
* Let short functions to be inline function.
* Correct return type of some functions, and properly handle return value by callers.
* Correct the timing of removing rect_list and the flow of FIFO overrun case in irq.
* Adjust line breaks, indentations, and style of variable declarations.
Changes in v9:
- Change ECE node name to "video-codec".
- Drop redundant "bindings for" in commit subject of patch 2/7.
- Refine the format of VCD/ECE dt-binding document.
Changes in v8:
- Let VCD/ECE to be 2 separate nodes and update dt-binding documents.
- Move register definitions out to a local header file.
- Driver refinements (add error handling for memory allocation, remove unnecessary condition check and introduce "goto"s to handle similar error recovery paths).
- Correct properties and typo in GFXI dt-binding document.
Changes in v7:
- Add uapi documents for driver-specific controls.
- Implement driver-specific controls for switching capture mode and getting the count of compressed HEXTILE rectangles.
- Drop unnecessary "enum_framesizes" and "enum_frameintervals" functions.
- Include the output of v4l2-compliance in cover letter.
Changes in v6:
- Support NPCM845 and add compatible "nuvoton,npcm845-video".
- Correct pixel format to V4L2_PIX_FMT_HEXTILE which is newly added in this patch series.
Changes in v5:
- Simplify function prefix "nuvoton_" to "npcm_".
- Increase VCD_BUSY_TIMEOUT_US and ECE_POLL_TIMEOUT_US to 300ms to prevent polling timeout when ECC is enabled or system is busy.
Changes in v4:
- Fix compile warning reported by kernel test robot.
Changes in v3:
- Add video driver entry in MAINTAINERS.
- Change config name to CONFIG_VIDEO_NPCM_VCD_ECE.
- Reduce the waiting time after resetting the VCD/ECE module.
- Correct data types of some variables.
Changes in v2:
- Add Hextile document and locate with vendor formats.
Marvin Lin (7):
ARM: dts: nuvoton: Add node for NPCM VCD and ECE engine
media: dt-bindings: nuvoton: Add NPCM VCD and ECE engine
dt-bindings: soc: nuvoton: Add NPCM GFXI
media: v4l: Add HEXTILE compressed format
media: v4l2-ctrls: Add user control base for Nuvoton NPCM controls
media: uapi: Add controls for NPCM video driver
media: nuvoton: Add driver for NPCM video capture and encoding engine
.../bindings/media/nuvoton,npcm-ece.yaml | 43 + .../bindings/media/nuvoton,npcm-vcd.yaml | 72 + .../bindings/soc/nuvoton/nuvoton,gfxi.yaml | 39 + .../userspace-api/media/drivers/index.rst | 1 + .../media/drivers/npcm-video.rst | 66 + .../media/v4l/pixfmt-reserved.rst | 7 + MAINTAINERS | 12 + .../dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 23 + drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 1 + drivers/media/platform/nuvoton/Kconfig | 15 + drivers/media/platform/nuvoton/Makefile | 2 + drivers/media/platform/nuvoton/npcm-regs.h | 152 ++ drivers/media/platform/nuvoton/npcm-video.c | 1830 +++++++++++++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/npcm-video.h | 41 + include/uapi/linux/v4l2-controls.h | 6 + include/uapi/linux/videodev2.h | 1 + 18 files changed, 2313 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml create mode 100644 Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml create mode 100644 Documentation/userspace-api/media/drivers/npcm-video.rst create mode 100644 drivers/media/platform/nuvoton/Kconfig create mode 100644 drivers/media/platform/nuvoton/Makefile create mode 100644 drivers/media/platform/nuvoton/npcm-regs.h create mode 100644 drivers/media/platform/nuvoton/npcm-video.c create mode 100644 include/uapi/linux/npcm-video.h
Signature · 1 line
2.34.1
PATCH v15 1/7 ARM: dts: nuvoton: Add node for NPCM VCD and ECE engine
Add node for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. Tested with Nuvoton NPCM750 evaluation board.
--- .../dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+)
arch/arm/boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi +23 -0
@@ -179,6 +179,24 @@ fiux: spi@fb001000 { status = "disabled"; }; + vcd: vcd@f0810000 { + compatible = "nuvoton,npcm750-vcd"; + reg = <0xf0810000 0x10000>; + interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; + resets = <&rstc NPCM7XX_RESET_IPSRST2 NPCM7XX_RESET_VCD>; + nuvoton,sysgcr = <&gcr>; + nuvoton,sysgfxi = <&gfxi>; + nuvoton,ece = <&ece>; + status = "disabled"; + }; + + ece: video-codec@f0820000 { + compatible = "nuvoton,npcm750-ece"; + reg = <0xf0820000 0x2000>; + resets = <&rstc NPCM7XX_RESET_IPSRST2 NPCM7XX_RESET_ECE>; + status = "disabled"; + }; + apb { #address-cells = <1>; #size-cells = <1>;
@@ -563,6 +581,11 @@ i2c15: i2c@8f000 { pinctrl-0 = <&smb15_pins>; status = "disabled"; }; + + gfxi: gfxi@e000 { + compatible = "nuvoton,npcm750-gfxi", "syscon"; + reg = <0xe000 0x100>; + }; }; };
Signature · 1 line
2.34.1
PATCH v15 2/7 media: dt-bindings: nuvoton: Add NPCM VCD and ECE engine
In reply to Marvin LinAdd dt-bindings document for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs.
--- .../bindings/media/nuvoton,npcm-ece.yaml | 43 +++++++++++ .../bindings/media/nuvoton,npcm-vcd.yaml | 72 +++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml
Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml new file +43 -0
@@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/nuvoton,npcm-ece.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Nuvoton NPCM Encoding Compression Engine + +maintainers: + - Joseph Liu <[email protected]> + - Marvin Lin <[email protected]> + +description: | + Video Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. + +properties: + compatible: + enum: + - nuvoton,npcm750-ece + - nuvoton,npcm845-ece + + reg: + maxItems: 1 + + resets: + maxItems: 1 + +required: + - compatible + - reg + - resets + +additionalProperties: false + +examples: + - | + #include <dt-bindings/reset/nuvoton,npcm7xx-reset.h> + + ece: video-codec@f0820000 { + compatible = "nuvoton,npcm750-ece"; + reg = <0xf0820000 0x2000>; + resets = <&rstc NPCM7XX_RESET_IPSRST2 NPCM7XX_RESET_ECE>; + };
Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v15 3/7 dt-bindings: soc: nuvoton: Add NPCM GFXI
In reply to Marvin LinAdd dt-bindings document for Graphics Core Information (GFXI) node. It is used by NPCM video driver to retrieve Graphics core information.
--- .../bindings/soc/nuvoton/nuvoton,gfxi.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml
Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml new file +39 -0
@@ -0,0 +1,39 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/soc/nuvoton/nuvoton,gfxi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Graphics Core Information block in Nuvoton SoCs + +maintainers: + - Joseph Liu <[email protected]> + - Marvin Lin <[email protected]> + +description: + The Graphics Core Information (GFXI) are a block of registers in Nuvoton SoCs + that analyzes Graphics core behavior and provides information in registers. + +properties: + compatible: + items: + - enum: + - nuvoton,npcm750-gfxi + - nuvoton,npcm845-gfxi + - const: syscon + + reg: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + gfxi: gfxi@e000 { + compatible = "nuvoton,npcm750-gfxi", "syscon"; + reg = <0xe000 0x100>; + };
Signature · 1 line
2.34.1
PATCH v15 4/7 media: v4l: Add HEXTILE compressed format
In reply to Marvin LinAdd HEXTILE compressed format which is defined in Remote Framebuffer Protocol (RFC 6143, chapter 7.7.4 Hextile Encoding) and is used by Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs.
--- Documentation/userspace-api/media/v4l/pixfmt-reserved.rst | 7 +++++++ drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 3 files changed, 9 insertions(+)
Documentation/userspace-api/media/v4l/pixfmt-reserved.rst +7 -0
@@ -288,6 +288,13 @@ please make a proposal on the linux-media mailing list. - 'MT2110R' - This format is two-planar 10-Bit raster mode and having similitude with ``V4L2_PIX_FMT_MM21`` in term of alignment and tiling. Used for AVC. + * .. _V4L2-PIX-FMT-HEXTILE: + + - ``V4L2_PIX_FMT_HEXTILE`` + - 'HXTL' + - Compressed format used by Nuvoton NPCM video driver. This format is + defined in Remote Framebuffer Protocol (RFC 6143, chapter 7.7.4 Hextile + Encoding). .. raw:: latex \normalsize
drivers/media/v4l2-core/v4l2-ioctl.c +1 -0
@@ -1510,6 +1510,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)case V4L2_PIX_FMT_AV1_FRAME : descr ="AV1 Frame" ;break ;case V4L2_PIX_FMT_MT2110T : descr ="Mediatek 10bit Tile Mode" ;break ;case V4L2_PIX_FMT_MT2110R : descr ="Mediatek 10bit Raster Mode" ;break ; +case V4L2_PIX_FMT_HEXTILE : descr ="Hextile Compressed Format" ;break ;default :if (fmt->description[0 ])return ;
include/uapi/linux/videodev2.h +1 -0
@@ -804,6 +804,7 @@ struct v4l2_pix_format {#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 */ +#define V4L2_PIX_FMT_HEXTILE v4l2_fourcc('H', 'X', 'T', 'L')/* Hextile compressed */ /* 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 */
Signature · 1 line
2.34.1
PATCH v15 5/7 media: v4l2-ctrls: Add user control base for Nuvoton NPCM controls
In reply to Marvin LinAdd a control base for Nuvoton NPCM driver controls, and reserve 16 controls.
--- include/uapi/linux/v4l2-controls.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/uapi/linux/v4l2-controls.h +6 -0
@@ -203,6 +203,12 @@ enum v4l2_colorfx {*/ #define V4L2_CID_USER_ASPEED_BASE (V4L2_CID_USER_BASE + 0x11a0) +/* +* The base for Nuvoton NPCM driver controls. +* We reserve 16 controls for this driver. +*/ +#define V4L2_CID_USER_NPCM_BASE (V4L2_CID_USER_BASE + 0x11b0) +/* MPEG-class control IDs */ /* The MPEG controls are applicable to all codec controls * and the 'MPEG' part of the define is historical */
Signature · 1 line
2.34.1
PATCH v15 6/7 media: uapi: Add controls for NPCM video driver
In reply to Marvin LinCreate controls for Nuvoton NPCM video driver to support setting capture mode of Video Capture/Differentiation (VCD) engine and getting the count of HEXTILE rectangles that is compressed by Encoding Compression Engine (ECE).
--- .../userspace-api/media/drivers/index.rst | 1 + .../media/drivers/npcm-video.rst | 66 +++++++++++++++++++ include/uapi/linux/npcm-video.h | 41 ++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 Documentation/userspace-api/media/drivers/npcm-video.rst create mode 100644 include/uapi/linux/npcm-video.h
Documentation/userspace-api/media/drivers/index.rst +1 -0
@@ -37,6 +37,7 @@ For more details see the file COPYING in the source distribution of Linux. dw100 imx-uapi max2175 + npcm-video omap3isp-uapi st-vgxy61 uvcvideo
Documentation/userspace-api/media/drivers/npcm-video.rst new file +66 -0
66 lines not on this page · raw message
include/uapi/linux/npcm-video.h new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v15 7/7 media: nuvoton: Add driver for NPCM video capture and encoding engine
In reply to Marvin LinAdd driver for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. As described in the datasheet NPCM750D_DS_Rev_1.0, the VCD can capture frames from digital video input and compare two frames in memory, and then the ECE can compress the frame data into HEXTILE format. This driver implements V4L2 interfaces and provides user controls to support KVM feature, also tested with VNC Viewer ver.6.22.826 and openbmc/obmc-ikvm.
--- MAINTAINERS | 12 + drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 1 + drivers/media/platform/nuvoton/Kconfig | 15 + drivers/media/platform/nuvoton/Makefile | 2 + drivers/media/platform/nuvoton/npcm-regs.h | 152 ++ drivers/media/platform/nuvoton/npcm-video.c | 1830 +++++++++++++++++++ 7 files changed, 2013 insertions(+) create mode 100644 drivers/media/platform/nuvoton/Kconfig create mode 100644 drivers/media/platform/nuvoton/Makefile create mode 100644 drivers/media/platform/nuvoton/npcm-regs.h create mode 100644 drivers/media/platform/nuvoton/npcm-video.c
MAINTAINERS +12 -0
@@ -2480,6 +2480,18 @@ F: drivers/rtc/rtc-nct3018y.c F: include/dt-bindings/clock/nuvoton,npcm7xx-clock.h F: include/dt-bindings/clock/nuvoton,npcm845-clk.h +ARM/NUVOTON NPCM VIDEO ENGINE DRIVER +M: Joseph Liu <[email protected]> +M: Marvin Lin <[email protected]> +L: [email protected] +L: [email protected] (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml +F: Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml +F: Documentation/userspace-api/media/drivers/npcm-video.rst +F: drivers/media/platform/nuvoton/ +F: include/uapi/linux/npcm-video.h + ARM/NUVOTON WPCM450 ARCHITECTURE M: Jonathan Neuschäfer <[email protected]> L: [email protected] (moderated for non-subscribers)
drivers/media/platform/Kconfig +1 -0
@@ -73,6 +73,7 @@ source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/Kconfig" source "drivers/media/platform/microchip/Kconfig" +source "drivers/media/platform/nuvoton/Kconfig" source "drivers/media/platform/nvidia/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/qcom/Kconfig"
drivers/media/platform/Makefile +1 -0
@@ -16,6 +16,7 @@ obj-y += intel/ obj-y += marvell/ obj-y += mediatek/ obj-y += microchip/ +obj-y += nuvoton/ obj-y += nvidia/ obj-y += nxp/ obj-y += qcom/
drivers/media/platform/nuvoton/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only + +comment "Nuvoton media platform drivers" + +config VIDEO_NPCM_VCD_ECE + tristate "Nuvoton NPCM Video Capture/Encode Engine driver" + depends on V4L_PLATFORM_DRIVERS + depends on VIDEO_DEV + select VIDEOBUF2_DMA_CONTIG + help + Support for the Video Capture/Differentiation Engine (VCD) and + Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. + The VCD can capture a frame from digital video input and compare + two frames in memory, and then the ECE can compress the frame + data into HEXTILE format.
drivers/media/platform/nuvoton/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_VIDEO_NPCM_VCD_ECE) += npcm-video.o
drivers/media/platform/nuvoton/npcm-regs.h new file +152 -0
152 lines not on this page · raw message
drivers/media/platform/nuvoton/npcm-video.c new file +1830 -0
1,830 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v15 7/7] media: nuvoton: Add driver for NPCM video capture and encoding engine
Quoted 9 lines · Marvin Lin
Add driver for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. As described in the datasheet NPCM750D_DS_Rev_1.0, the VCD can capture frames from digital video input and compare two frames in memory, and then the ECE can compress the frame data into HEXTILE format. This driver implements V4L2 interfaces and provides user controls to support KVM feature, also tested with VNC Viewer ver.6.22.826 and openbmc/obmc-ikvm.
Signed-off-by Marvin Lin <[email protected]>
I'm getting two sparse warnings:
drivers/media/platform/nuvoton/npcm-video.c:227:27: warning: incorrect type in argument 1 (different address spaces)drivers/media/platform/nuvoton/npcm-video.c:227:27: expected void const volatile [noderef] __iomem *addrdrivers/media/platform/nuvoton/npcm-video.c:227:27: got void *drivers/media/platform/nuvoton/npcm-video.c:1050:20: warning: context imbalance in 'npcm_video_irq' - different lock contexts for basic block
That last one is a missing unlock:
Quoted 36 lines
drivers/media/platform/nuvoton/npcm-video.c new file +36
-0+static irqreturn_t npcm_video_irq (int irq,void *arg) +{ +struct npcm_video *video = arg; +struct regmap *vcd = video->vcd_regmap; +struct npcm_video_buffer *buf; +unsigned int index, size, status, fmt; +dma_addr_t dma_addr; +void *addr; +static const struct v4l2_event ev = { + .type =V4L2_EVENT_SOURCE_CHANGE , + .u.src_change.changes =V4L2_EVENT_SRC_CH_RESOLUTION , + }; + +regmap_read (vcd,VCD_STAT , &status); +dev_dbg (video->dev,"VCD irq status 0x%x\n" , status); + +regmap_write (vcd,VCD_STAT ,VCD_STAT_CLEAR ); + +if (test_bit (VIDEO_STOPPED , &video->flags) || + !test_bit (VIDEO_STREAMING , &video->flags)) +return IRQ_NONE ; + +if (status &VCD_STAT_DONE ) { +regmap_write (vcd,VCD_INTE ,0 ); +spin_lock (&video->lock); +clear_bit (VIDEO_CAPTURING , &video->flags); + buf =list_first_entry_or_null (&video->buffers, + struct npcm_video_buffer, link); +if (!buf) { +spin_unlock (&video->lock); +return IRQ_NONE ; + } + + addr =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); + index = buf->vb.vb2_buf.index; + fmt = video->pix_fmt.pixelformat;
drivers/media/platform/nuvoton/npcm-video.c line 1095
Quoted 10 lines
drivers/media/platform/nuvoton/npcm-video.c new file +10
-0+ +switch (fmt) { +case V4L2_PIX_FMT_RGB565 : + size =npcm_video_raw (video, index, addr); +break ; +case V4L2_PIX_FMT_HEXTILE : + dma_addr =vb2_dma_contig_plane_dma_addr (&buf->vb.vb2_buf,0 ); + size =npcm_video_hextile (video, index, dma_addr, addr); +break ; +default :
Missing unlock here.
Quoted 24 lines
drivers/media/platform/nuvoton/npcm-video.c new file +24
-0+return IRQ_NONE ; + } + +vb2_set_plane_payload (&buf->vb.vb2_buf,0 , size); + 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); +spin_unlock (&video->lock); + +if (npcm_video_start_frame (video)) +dev_err (video->dev,"Failed to capture next frame\n" ); + } + +/* Resolution changed */ +if (status &VCD_STAT_VHT_CHG || status &VCD_STAT_HAC_CHG ) { +if (!test_bit (VIDEO_RES_CHANGING , &video->flags)) { +set_bit (VIDEO_RES_CHANGING , &video->flags); + +vb2_queue_error (&video->queue); +v4l2_event_queue (&video->vdev, &ev); + }
drivers/media/platform/nuvoton/npcm-video.c line 1129
Quoted 10 lines
drivers/media/platform/nuvoton/npcm-video.c new file +10
-0+ } + +if (status &VCD_STAT_IFOR || status &VCD_STAT_IFOT ) { +dev_warn (video->dev,"VCD FIFO overrun or over thresholds\n" ); +if (npcm_video_start_frame (video)) +dev_err (video->dev,"Failed to recover from FIFO overrun\n" ); + } + +return IRQ_HANDLED ; +}
Regards,
Hans
Re: [PATCH v15 7/7] media: nuvoton: Add driver for NPCM video capture and encoding engine
In reply to Marvin LinHi Marvin,
Just one small comment:
Quoted 23 lines · Marvin Lin
Add driver for Video Capture/Differentiation Engine (VCD) and Encoding Compression Engine (ECE) present on Nuvoton NPCM SoCs. As described in the datasheet NPCM750D_DS_Rev_1.0, the VCD can capture frames from digital video input and compare two frames in memory, and then the ECE can compress the frame data into HEXTILE format. This driver implements V4L2 interfaces and provides user controls to support KVM feature, also tested with VNC Viewer ver.6.22.826 and openbmc/obmc-ikvm.
Signed-off-by Marvin Lin <[email protected]>--- MAINTAINERS | 12 + drivers/media/platform/Kconfig | 1 + drivers/media/platform/Makefile | 1 + drivers/media/platform/nuvoton/Kconfig | 15 + drivers/media/platform/nuvoton/Makefile | 2 + drivers/media/platform/nuvoton/npcm-regs.h | 152 ++ drivers/media/platform/nuvoton/npcm-video.c | 1830 +++++++++++++++++++ 7 files changed, 2013 insertions(+) create mode 100644 drivers/media/platform/nuvoton/Kconfig create mode 100644 drivers/media/platform/nuvoton/Makefile create mode 100644 drivers/media/platform/nuvoton/npcm-regs.h create mode 100644 drivers/media/platform/nuvoton/npcm-video.c
<snip>
Quoted 6 lines
drivers/media/platform/nuvoton/npcm-video.c new file +0
-0@@ -0,0 +1,1830 @@
<snip>
drivers/media/platform/nuvoton/npcm-video.c line 1390
Quoted 8 lines
drivers/media/platform/nuvoton/npcm-video.c new file +8
-0+ +/* +* This control value is set when a buffer is dequeued by userspace, i.e. in +* npcm_video_buf_finish function. +*/ +static const struct v4l2_ctrl_config npcm_ctrl_rect_count = { + .id =V4L2_CID_NPCM_RECT_COUNT , + .name ="NPCM Compressed Hextile Rectangle Count" ,
This name is too long, it should be max 31 characters. Dropping the "Compressed " part might be best, I think that word isn't needed.
drivers/media/platform/nuvoton/npcm-video.c line 1396
Quoted 6 lines
drivers/media/platform/nuvoton/npcm-video.c new file +6
-0+ .type = V4L2_CTRL_TYPE_INTEGER, + .min = 0, + .max = (MAX_WIDTH / RECT_W) * (MAX_HEIGHT / RECT_H), + .step = 1, + .def = 0, +};
With this fixed, and the sparse warnings fixed, it should be ready for merging.
Regards,
Hans
Re: [PATCH v15 7/7] media: nuvoton: Add driver for NPCM video capture and encoding engine
Hi Hans,
Thanks for your review.
Quoted 7 lines
drivers/media/platform/nuvoton/npcm-video.c line 1390
Quoted 3 lines
drivers/media/platform/nuvoton/npcm-video.c new file +3
-0+static const struct v4l2_ctrl_config npcm_ctrl_rect_count = { + .id =V4L2_CID_NPCM_RECT_COUNT , + .name ="NPCM Compressed Hextile Rectangle Count" ,This name is too long, it should be max 31 characters. Dropping the "Compressed " part might be best, I think that word isn't needed.
Quoted 8 lines
drivers/media/platform/nuvoton/npcm-video.c line 1396
Quoted 6 lines
drivers/media/platform/nuvoton/npcm-video.c new file +6
-0+ .type = V4L2_CTRL_TYPE_INTEGER, + .min = 0, + .max = (MAX_WIDTH / RECT_W) * (MAX_HEIGHT / RECT_H), + .step = 1, + .def = 0, +};With this fixed, and the sparse warnings fixed, it should be ready for merging.
OK. Will fix them in the next version.
Regards,
Marvin