Add support for mt2701 JPEG ENC support
Subsystems (3)
v2 cover Add support for mt2701 JPEG ENC support
This patchset add support for mt2701 JPEG ENC support.
This is the compliance test result for jpeg dec and enc.
The JPEG dec log:
------------------------------------------------------------
v4l2-compliance -d /dev/video0
v4l2-compliance SHA: 1b961f5e82b0805faea0ba68bfa8037213a02351, 32 bits
Compliance test for mtk-jpeg device /dev/video0:
Driver Info:
Driver name : mtk-jpeg
Card type : mtk-jpeg decoder
Bus info : platform:15004000.jpegdec
Driver version : 5.2.0
Capabilities : 0x84204000 Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected JPEG Decoder
Required ioctls:
test VIDIOC_QUERYCAP: 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 (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 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 (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
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
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0
Format ioctls:
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
test Scaling: OK
Codec ioctls:
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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for mtk-jpeg device /dev/video0: 44, Succeeded: 44, Failed: 0, Warnings: 0
------------------------------------------------------------
The JPEG enc log:
------------------------------------------------------------
v4l2-compliance -d /dev/video1
v4l2-compliance SHA: 1b961f5e82b0805faea0ba68bfa8037213a02351, 32 bits
Compliance test for mtk-jpeg device /dev/video1:
Driver Info:
Driver name : mtk-jpeg
Card type : mtk-jpeg encoder
Bus info : platform:1500a000.jpegenc
Driver version : 5.2.0
Capabilities : 0x84204000 Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected JPEG Encoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video1 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 (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 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 (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
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 test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 4 Private Controls: 0
Format ioctls:
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
test Scaling: OK
Codec ioctls:
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:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for mtk-jpeg device /dev/video1: 44, Succeeded: 44, Failed: 0, Warnings: 0
------------------------------------------------------------
Change compared to v1:
-fix compliance test fail, check created buffer size in driver
Xia Jiang (5):
media: dt-bindings: Add JPEG ENC device tree node document
media: platform: Rename jpeg dec file name
media: platform: Add jpeg enc feature
media: platform: change GPLv2 license to SPDX
arm: dts: add jpeg enc device tree node
.../bindings/media/mediatek-jpeg-encoder.txt | 33 +
arch/arm/boot/dts/mt2701.dtsi | 12 +
drivers/media/platform/mtk-jpeg/Makefile | 5 +-
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 753 ++++++++++++++----
.../media/platform/mtk-jpeg/mtk_jpeg_core.h | 123 ++-
.../{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 11 +-
.../{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 18 +-
...{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 11 +-
.../platform/mtk-jpeg/mtk_jpeg_dec_parse.h | 18 +
.../{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 9 +-
.../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 175 ++++
.../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 60 ++
.../platform/mtk-jpeg/mtk_jpeg_enc_reg.h | 49 ++
.../media/platform/mtk-jpeg/mtk_jpeg_parse.h | 25 -
drivers/media/v4l2-core/v4l2-ctrls.c | 1 +
include/uapi/linux/v4l2-controls.h | 2 +
16 files changed, 1060 insertions(+), 245 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (96%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (76%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (85%)
create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (78%)
create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h
create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_reg.h
delete mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.hSignature · 1 line
2.18.0
PATCH v2 1/5 media: dt-bindings: Add JPEG ENC device tree node document
add JPEG ENC device tree node document
--- .../bindings/media/mediatek-jpeg-encoder.txt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +33 -0
@@ -0,0 +1,33 @@ +* MediaTek JPEG Encoder + +MediaTek JPEG Encoder is the JPEG encode hardware present in MediaTek SoCs + +Required properties: +- compatible : must be "mediatek,mtk-jpgenc" +- reg : physical base address of the JPEG encoder registers and length of + memory mapped region. +- interrupts : interrupt number to the interrupt controller. +- clocks: device clocks, see + Documentation/devicetree/bindings/clock/clock-bindings.txt for details. +- clock-names: must contain "jpgenc". It is the clock of JPEG encoder. +- power-domains: a phandle to the power domain, see + Documentation/devicetree/bindings/power/power_domain.txt for details. +- mediatek,larb: must contain the local arbiters in the current SoCs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details. +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. + +Example: + jpegenc: jpegenc@1500a000 { + compatible = "mediatek,mtk-jpgenc"; + reg = <0 0x1500a000 0 0x1000>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_VENC>; + clock-names = "jpgenc"; + power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; + mediatek,larb = <&larb2>; + iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>, + <&iommu MT2701_M4U_PORT_JPGENC_BSDMA>; + };
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [PATCH 1/5] media: dt-bindings: Add JPEG ENC device tree node document
Quoted 3 lines · Xia Jiang
add JPEG ENC device tree node document
Change-Id: I9f0a8aec7eced20c88acbc88d6ff179763f91246
Run checkpatch.pl. (Remove this)
Quoted 12 lines
Signed-off-by Xia Jiang <[email protected]>--- .../bindings/media/mediatek-jpeg-encoder.txt | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txtDocumentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +0
-0
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt line 6
Quoted 6 lines
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +6
-0@@ -0,0 +1,33 @@ +* MediaTek JPEG Encoder + +MediaTek JPEG Encoder is the JPEG encode hardware present in MediaTek SoCs + +Required properties: +- compatible : must be "mediatek,mtk-jpgenc"
Needs an SoC specific compatible.
Quoted 30 lines
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +27
-0+- reg : physical base address of the JPEG encoder registers and length of + memory mapped region. +- interrupts : interrupt number to the interrupt controller. +- clocks: device clocks, see + Documentation/devicetree/bindings/clock/clock-bindings.txt for details. +- clock-names: must contain "jpgenc". It is the clock of JPEG encoder. +- power-domains: a phandle to the power domain, see + Documentation/devicetree/bindings/power/power_domain.txt for details. +- mediatek,larb: must contain the local arbiters in the current SoCs, see + Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt + for details. +- iommus: should point to the respective IOMMU block with master port as + argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt + for details. + +Example: + jpegenc: jpegenc@1500a000 { + compatible = "mediatek,mtk-jpgenc"; + reg = <0 0x1500a000 0 0x1000>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_VENC>; + clock-names = "jpgenc"; + power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; + mediatek,larb = <&larb2>; + iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>, + <&iommu MT2701_M4U_PORT_JPGENC_BSDMA>; + };Signature · 1 line
2.18.0
PATCH v2 2/5 media: platform: Rename jpeg dec file name
In reply to Xia JiangRename the files which are for decode feature. This is a preparing patch since the jpeg enc patch will be added later.
---
drivers/media/platform/mtk-jpeg/Makefile | 2 +-
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
.../platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 2 +-
.../platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 2 +-
.../mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +-
.../mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +-
.../platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 0
7 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (99%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (98%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (99%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (96%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (100%)drivers/media/platform/mtk-jpeg/Makefile +1 -1
@@ -1,2 +1,2 @@ -mtk_jpeg-objs := mtk_jpeg_core.o mtk_jpeg_hw.o mtk_jpeg_parse.o +mtk_jpeg-objs := mtk_jpeg_core.o mtk_jpeg_dec_hw.o mtk_jpeg_dec_parse.o obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -2
@@ -31,9 +31,9 @@#include <media/videobuf2-dma-contig.h> #include <soc/mediatek/smi.h> -#include "mtk_jpeg_hw.h" +#include "mtk_jpeg_dec_hw.h" #include "mtk_jpeg_core.h" -#include "mtk_jpeg_parse.h" +#include "mtk_jpeg_dec_parse.h" static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { {
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c +1 -1
@@ -17,7 +17,7 @@#include <linux/kernel.h> #include <media/videobuf2-core.h> -#include "mtk_jpeg_hw.h" +#include "mtk_jpeg_dec_hw.h" #define MTK_JPEG_DUNUM_MASK (val) (((val) - 1) & 0x3)
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h +1 -1
@@ -19,7 +19,7 @@#include <media/videobuf2-core.h> #include "mtk_jpeg_core.h" -#include "mtk_jpeg_reg.h" +#include "mtk_jpeg_dec_reg.h" enum {MTK_JPEG_DEC_RESULT_EOF_DONE =0 ,
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.c +1 -1
@@ -16,7 +16,7 @@#include <linux/kernel.h> #include <linux/videodev2.h> -#include "mtk_jpeg_parse.h" +#include "mtk_jpeg_dec_parse.h" #define TEM 0x01#define SOF0 0xc0
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.h +1 -1
@@ -16,7 +16,7 @@#ifndef _MTK_JPEG_PARSE_H#define _MTK_JPEG_PARSE_H -#include "mtk_jpeg_hw.h" +#include "mtk_jpeg_dec_hw.h" bool mtk_jpeg_parse (struct mtk_jpeg_dec_param *param,u8 *src_addr_va,u32 src_size);
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h +0 -0
Signature · 1 line
2.18.0
PATCH v2 3/5 media: platform: Add jpeg enc feature
In reply to Xia JiangAdd mtk jpeg encode v4l2 driver based on jpeg decode, because that jpeg decode and encode have great similarities with function operation. add EXIF enable control for jpeg encode.
--- drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 740 ++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 114 ++- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 7 +- .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 175 +++++ .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 60 ++ .../platform/mtk-jpeg/mtk_jpeg_enc_reg.h | 49 ++ drivers/media/v4l2-core/v4l2-ctrls.c | 1 + include/uapi/linux/v4l2-controls.h | 2 + 9 files changed, 986 insertions(+), 167 deletions(-) create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_reg.h
drivers/media/platform/mtk-jpeg/Makefile +4 -1
@@ -1,2 +1,5 @@ -mtk_jpeg-objs := mtk_jpeg_core.o mtk_jpeg_dec_hw.o mtk_jpeg_dec_parse.o +mtk_jpeg-objs := mtk_jpeg_core.o \ + mtk_jpeg_dec_hw.o \ + mtk_jpeg_dec_parse.o \ + mtk_jpeg_enc_hw.o obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +587 -153
1,044 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +104 -10
171 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +4 -3
@@ -2,6 +2,7 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -13,8 +14,8 @@* GNU General Public License for more details. */ -#ifndef _MTK_JPEG_HW_H -#define _MTK_JPEG_HW_H +#ifndef _MTK_JPEG_DEC_HW_H +#define _MTK_JPEG_DEC_HW_H#include <media/videobuf2-core.h>
@@ -88,4 +89,4 @@ void mtk_jpeg_dec_set_config(void __iomem *base,void mtk_jpeg_dec_reset (void __iomem *dec_reg_base);void mtk_jpeg_dec_start (void __iomem *dec_reg_base); -#endif /* _MTK_JPEG_HW_H */ +#endif /* _MTK_JPEG_DEC_HW_H */
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c new file +175 -0
175 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h new file +60 -0
60 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_reg.h new file +49 -0
49 lines not on this page · raw message
drivers/media/v4l2-core/v4l2-ctrls.c +1 -0
@@ -1010,6 +1010,7 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_JPEG_CHROMA_SUBSAMPLING :return "Chroma Subsampling" ;case V4L2_CID_JPEG_RESTART_INTERVAL :return "Restart Interval" ;case V4L2_CID_JPEG_COMPRESSION_QUALITY :return "Compression Quality" ; +case V4L2_CID_JPEG_ENABLE_EXIF :return "Enable Exif" ;case V4L2_CID_JPEG_ACTIVE_MARKER :return "Active Markers" ;/* Image source controls */
include/uapi/linux/v4l2-controls.h +2 -0
@@ -998,6 +998,8 @@ enum v4l2_jpeg_chroma_subsampling {#define V4L2_JPEG_ACTIVE_MARKER_COM (1 << 16)#define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17)#define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18) +#define V4L2_CID_JPEG_ENABLE_EXIF (V4L2_CID_JPEG_CLASS_BASE + 5) +/* Image source controls */
Signature · 1 line
2.18.0
Re: [PATCH 3/5] media: platform: Add jpeg enc feature
Hi Xia,
Some review comments below:
Quoted 5 lines · Xia Jiang
Add mtk jpeg encode v4l2 driver based on jpeg decode, because that jpeg decode and encode have great similarities with function operation. add EXIF enable control for jpeg encode.
Change-Id: I38bf86a372f69d42a4680c4d772b64a30e81d7be
Please don't include Change-Id tags, these do not belong in the kernel repo.
Quoted 190 lines
Signed-off-by Xia Jiang <[email protected]>--- drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 740 ++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 114 ++- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 7 +- .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 175 +++++ .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 60 ++ .../platform/mtk-jpeg/mtk_jpeg_enc_reg.h | 49 ++ drivers/media/v4l2-core/v4l2-ctrls.c | 1 + include/uapi/linux/v4l2-controls.h | 2 + 9 files changed, 986 insertions(+), 167 deletions(-) create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_reg.hdrivers/media/platform/mtk-jpeg/Makefile +4
-1@@ -1,2 +1,5 @@ -mtk_jpeg-objs := mtk_jpeg_core.o mtk_jpeg_dec_hw.o mtk_jpeg_dec_parse.o +mtk_jpeg-objs := mtk_jpeg_core.o \ + mtk_jpeg_dec_hw.o \ + mtk_jpeg_dec_parse.o \ + mtk_jpeg_enc_hw.o obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.odrivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +110
-5@@ -2,6 +2,7 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -31,6 +32,7 @@#include <media/videobuf2-dma-contig.h> #include <soc/mediatek/smi.h> +#include "mtk_jpeg_enc_hw.h" #include "mtk_jpeg_dec_hw.h" #include "mtk_jpeg_core.h" #include "mtk_jpeg_dec_parse.h" @@ -39,7 +41,8 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { { .fourcc = V4L2_PIX_FMT_JPEG, .colplanes = 1, - .flags = MTK_JPEG_FMT_FLAG_DEC_OUTPUT, + .flags = MTK_JPEG_FMT_FLAG_DEC_OUTPUT | + MTK_JPEG_FMT_FLAG_ENC_CAPTURE, }, { .fourcc = V4L2_PIX_FMT_YUV420M,@@ -59,6 +62,42 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { .v_align = 3, .flags = MTK_JPEG_FMT_FLAG_DEC_CAPTURE, }, + { + .fourcc = V4L2_PIX_FMT_NV12M, + .h_sample = {4, 2, 2}, + .v_sample = {4, 2, 2}, + .colplanes = 2, + .h_align = 4, + .v_align = 4, + .flags = MTK_JPEG_FMT_FLAG_ENC_OUTPUT, + }, + { + .fourcc = V4L2_PIX_FMT_NV21M, + .h_sample = {4, 2, 2}, + .v_sample = {4, 2, 2}, + .colplanes = 2, + .h_align = 4, + .v_align = 4, + .flags = MTK_JPEG_FMT_FLAG_ENC_OUTPUT, + }, + { + .fourcc = V4L2_PIX_FMT_YUYV, + .h_sample = {4, 2, 2}, + .v_sample = {4, 4, 4}, + .colplanes = 1, + .h_align = 4, + .v_align = 3, + .flags = MTK_JPEG_FMT_FLAG_ENC_OUTPUT, + }, + { + .fourcc = V4L2_PIX_FMT_YVYU, + .h_sample = {4, 2, 2}, + .v_sample = {4, 4, 4}, + .colplanes = 1, + .h_align = 4, + .v_align = 3, + .flags = MTK_JPEG_FMT_FLAG_ENC_OUTPUT, + }, }; #define MTK_JPEG_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_formats)@@ -73,11 +112,19 @@ struct mtk_jpeg_src_buf {struct list_head list;int flags;struct mtk_jpeg_dec_param dec_param; +struct mtk_jpeg_enc_param enc_param; }; +#define MTK_MAX_CTRLS_HINT 20 +static int debug;module_param (debug, int,0644 ); +static inline struct mtk_jpeg_ctx *ctrl_to_ctx (struct v4l2_ctrl *ctrl) +{ + return container_of(ctrl->handler, struct mtk_jpeg_ctx, ctrl_hdl); +} +static inline struct mtk_jpeg_ctx *mtk_jpeg_fh_to_ctx (struct v4l2_fh *fh) { return container_of(fh, struct mtk_jpeg_ctx, fh);@@ -94,10 +141,81 @@ static int mtk_jpeg_querycap(struct file *file, void *priv, {struct mtk_jpeg_dev *jpeg =video_drvdata (file); -strscpy (cap->driver,MTK_JPEG_NAME " decoder" ,sizeof (cap->driver)); -strscpy (cap->card,MTK_JPEG_NAME " decoder" ,sizeof (cap->card)); -snprintf (cap->bus_info,sizeof (cap->bus_info),"platform:%s" , -dev_name (jpeg->dev)); +strscpy (cap->driver,MTK_JPEG_NAME ,sizeof (cap->driver)); +if (jpeg->mode ==MTK_JPEG_ENC ) +strscpy (cap->card,MTK_JPEG_NAME " encoder" ,sizeof (cap->card)); +else +strscpy (cap->card,MTK_JPEG_NAME " decoder" ,sizeof (cap->card)); +snprintf (cap->bus_info,sizeof (cap->bus_info),"platform:%s" , +dev_name (jpeg->dev)); + +return 0 ; +} + +static int vidioc_jpeg_s_ctrl (struct v4l2_ctrl *ctrl) +{ +struct mtk_jpeg_ctx *ctx =ctrl_to_ctx (ctrl); +struct jpeg_enc_param *p = &ctx->jpeg_param; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; +int ret =0 ; + +switch (ctrl->id) { +case V4L2_CID_JPEG_RESTART_INTERVAL : + p->restart_interval = ctrl->val; +break ; +case V4L2_CID_JPEG_COMPRESSION_QUALITY : + p->enc_quality = ctrl->val; +break ; +case V4L2_CID_JPEG_ENABLE_EXIF : + p->enable_exif = ctrl->val; +break ; + } + +v4l2_dbg (2 , debug, &jpeg->v4l2_dev,"%s val = %d" , +v4l2_ctrl_get_name (ctrl->id), ctrl->val); + +return ret; +} + +static const struct v4l2_ctrl_ops mtk_jpeg_ctrl_ops = { + .s_ctrl = vidioc_jpeg_s_ctrl, +}; + +int mtk_jpeg_ctrls_setup (struct mtk_jpeg_ctx *ctx) +{ +const struct v4l2_ctrl_ops *ops = &mtk_jpeg_ctrl_ops; +struct v4l2_ctrl_handler *handler = &ctx->ctrl_hdl; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; + +v4l2_ctrl_handler_init (handler,MTK_MAX_CTRLS_HINT ); + +if (jpeg->mode ==MTK_JPEG_ENC ) { +v4l2_ctrl_new_std (handler, ops,V4L2_CID_JPEG_RESTART_INTERVAL , +0 ,100 ,1 ,0 ); +if (handler->error) { +v4l2_err (&jpeg->v4l2_dev,"V4L2_CID_JPEG_RESTART_INTERVAL Init" , +"control handler fail %d\n" , handler->error); +return handler->error; + } +v4l2_ctrl_new_std (handler, ops, +V4L2_CID_JPEG_COMPRESSION_QUALITY ,48 ,100 ,1 , +90 ); +if (handler->error) { + v4l2_err(&jpeg->v4l2_dev, "V4L2_CID_JPEG_COMPRESSION_QUALITY", + "Init control handler fail %d\n",
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c static int mtk_jpeg_querycap(struct file *file, void *priv, · line 215
Quoted 10 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +10
-0+ handler->error); +return handler->error; + } +v4l2_ctrl_new_std (handler, ops,V4L2_CID_JPEG_ENABLE_EXIF ,0 , +1 ,1 ,0 ); +if (handler->error) { +v4l2_err (&jpeg->v4l2_dev,"V4L2_CID_JPEG_ENABLE_EXIF Init" , +"control handler fail %d\n" , handler->error); +return handler->error; + }
No need to test handler->error after each v4l2_ctrl_new_std(). You have to do it only once after the last control was added. v4l2_ctrl_new_std() doesn't do anything if handler->error was non-zero.
Quoted 1,437 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +467
-148+ } + +v4l2_ctrl_handler_setup (&ctx->ctrl_hdl);return 0 ; }@@ -126,23 +244,29 @@ static int mtk_jpeg_enum_fmt(struct mtk_jpeg_fmt *mtk_jpeg_formats, int n,static int mtk_jpeg_enum_fmt_vid_cap (struct file *file,void *priv,struct v4l2_fmtdesc *f) { +struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); +return mtk_jpeg_enum_fmt (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , f, + ctx->jpeg->mode ==MTK_JPEG_ENC ? +MTK_JPEG_FMT_FLAG_ENC_CAPTURE :MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); }static int mtk_jpeg_enum_fmt_vid_out (struct file *file,void *priv,struct v4l2_fmtdesc *f) { +struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); +return mtk_jpeg_enum_fmt (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , f, + ctx->jpeg->mode ==MTK_JPEG_ENC ? +MTK_JPEG_FMT_FLAG_ENC_OUTPUT :MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); } -static struct mtk_jpeg_q_data *mtk_jpeg_get_q_data (struct mtk_jpeg_ctx *ctx, -enum v4l2_buf_type type) +static struct mtk_jpeg_q_data * +mtk_jpeg_get_q_data (struct mtk_jpeg_ctx *ctx,enum v4l2_buf_type type) { -if (V4L2_TYPE_IS_OUTPUT (type)) -return &ctx->out_q; -return &ctx->cap_q; +return V4L2_TYPE_IS_OUTPUT (type) ? &ctx->out_q : &ctx->cap_q; } static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx,@@ -151,9 +275,14 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx, {unsigned int k, fmt_flag; - fmt_flag = (fmt_type ==MTK_JPEG_FMT_TYPE_OUTPUT ) ? -MTK_JPEG_FMT_FLAG_DEC_OUTPUT : -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ; +if (ctx->jpeg->mode ==MTK_JPEG_ENC ) + fmt_flag = (fmt_type ==MTK_JPEG_FMT_TYPE_OUTPUT ) ? +MTK_JPEG_FMT_FLAG_ENC_OUTPUT : +MTK_JPEG_FMT_FLAG_ENC_CAPTURE ; +else + fmt_flag = (fmt_type ==MTK_JPEG_FMT_TYPE_OUTPUT ) ? +MTK_JPEG_FMT_FLAG_DEC_OUTPUT : +MTK_JPEG_FMT_FLAG_DEC_CAPTURE ;for (k =0 ; k <MTK_JPEG_NUM_FORMATS ; k++) {struct mtk_jpeg_fmt *fmt = &mtk_jpeg_formats[k];@@ -210,7 +339,7 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, {struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;struct mtk_jpeg_dev *jpeg = ctx->jpeg; -int i; +int i, align_w, align_h;memset (pix_mp->reserved,0 ,sizeof (pix_mp->reserved)); pix_mp->field =V4L2_FIELD_NONE ;@@ -224,36 +353,111 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, pix_mp->pixelformat = fmt->fourcc;if (q_type ==MTK_JPEG_FMT_TYPE_OUTPUT ) { -struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[0 ]; - -mtk_jpeg_bound_align_image (&pix_mp->width,MTK_JPEG_MIN_WIDTH , -MTK_JPEG_MAX_WIDTH ,0 , - &pix_mp->height,MTK_JPEG_MIN_HEIGHT , -MTK_JPEG_MAX_HEIGHT ,0 ); +if (jpeg->mode ==MTK_JPEG_ENC ) { + pix_mp->height =clamp (pix_mp->height, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT ); + pix_mp->width =clamp (pix_mp->width, +MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH ); + align_w = pix_mp->width; + align_h = pix_mp->height; + align_w =round_up (align_w,2 ); +if (pix_mp->num_planes ==1U ) { + align_w = align_w <<1 ; +mtk_jpeg_bound_align_image (&align_w, +MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH , +5 , &align_h, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT , +3 ); + pix_mp->plane_fmt[0 ].bytesperline = align_w; + pix_mp->plane_fmt[0 ].sizeimage = + align_w * align_h; + }else if (pix_mp->num_planes ==2U ) { +mtk_jpeg_bound_align_image (&align_w, +MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH , +4 , &align_h, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT , +4 ); + pix_mp->plane_fmt[0 ].bytesperline = align_w; + pix_mp->plane_fmt[0 ].sizeimage = + align_w * align_h; + pix_mp->plane_fmt[1 ].bytesperline = align_w; + pix_mp->plane_fmt[1 ].sizeimage = + (align_w * align_h) /2 ; + }else { +v4l2_err (&ctx->jpeg->v4l2_dev, +"Unsupport num planes = %d\n" , + pix_mp->num_planes); + } + goto end; + }else { +struct v4l2_plane_pix_format *pfmt = + &pix_mp->plane_fmt[0 ]; + +mtk_jpeg_bound_align_image (&pix_mp->width, +MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH ,0 , + &pix_mp->height, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT ,0 ); -memset (pfmt->reserved,0 ,sizeof (pfmt->reserved)); pfmt->bytesperline =0 ;/* Source size must be aligned to 128 */ pfmt->sizeimage =mtk_jpeg_align (pfmt->sizeimage,128 );if (pfmt->sizeimage ==0 ) pfmt->sizeimage =MTK_JPEG_DEFAULT_SIZEIMAGE ; + goto end; } + }/* type is MTK_JPEG_FMT_TYPE_CAPTURE */ -mtk_jpeg_bound_align_image (&pix_mp->width,MTK_JPEG_MIN_WIDTH , -MTK_JPEG_MAX_WIDTH , fmt->h_align, - &pix_mp->height,MTK_JPEG_MIN_HEIGHT , -MTK_JPEG_MAX_HEIGHT , fmt->v_align); +if (jpeg->mode ==MTK_JPEG_ENC ) { +mtk_jpeg_bound_align_image (&pix_mp->width,MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH ,0 , + &pix_mp->height,MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT ,0 ); -for (i =0 ; i < fmt->colplanes; i++) { -struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[i]; -u32 stride = pix_mp->width * fmt->h_sample[i] /4 ; -u32 h = pix_mp->height * fmt->v_sample[i] /4 ; +if (fmt->fourcc ==V4L2_PIX_FMT_JPEG ) { + pix_mp->plane_fmt[0 ].bytesperline =0 ; + pix_mp->plane_fmt[0 ].sizeimage = +mtk_jpeg_align (pix_mp->plane_fmt[0 ].sizeimage, +128 ); +if (pix_mp->plane_fmt[0 ].sizeimage ==0 ) + pix_mp->plane_fmt[0 ].sizeimage = +MTK_JPEG_DEFAULT_SIZEIMAGE ; + } + }else { + pix_mp->height =clamp (pix_mp->height,MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT ); + pix_mp->width =clamp (pix_mp->width,MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH ); +mtk_jpeg_bound_align_image (&pix_mp->width,MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH , fmt->h_align, + &pix_mp->height, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT , fmt->v_align); + +for (i =0 ; i < fmt->colplanes; i++) { +struct v4l2_plane_pix_format *pfmt = + &pix_mp->plane_fmt[i]; +u32 stride = pix_mp->width * fmt->h_sample[i] /4 ; +u32 h = pix_mp->height * fmt->v_sample[i] /4 ; + + pfmt->bytesperline = stride; + pfmt->sizeimage = stride * h; + } + } +for (i =0 ; i < fmt->colplanes; i++) { +struct v4l2_plane_pix_format *pfmt = + &pix_mp->plane_fmt[i];memset (pfmt->reserved,0 ,sizeof (pfmt->reserved)); - pfmt->bytesperline = stride; - pfmt->sizeimage = stride * h; } end: v4l2_dbg(2, debug, &jpeg->v4l2_dev, "wxh:%ux%u\n",@@ -454,9 +658,9 @@ static int mtk_jpeg_subscribe_event(struct v4l2_fh *fh,switch (sub->type) {case V4L2_EVENT_SOURCE_CHANGE :return v4l2_src_change_event_subscribe (fh, sub); -default : -return -EINVAL ; } + +return v4l2_ctrl_subscribe_event (fh, sub); } static int mtk_jpeg_g_selection(struct file *file, void *priv,@@ -579,6 +783,13 @@ static int mtk_jpeg_queue_setup(struct vb2_queue *q,if (!q_data)return -EINVAL ; +if (*num_planes) { +for (i =0 ; i < *num_planes; i++) +if (sizes[i] < q_data->sizeimage[i]) +return -EINVAL ; +return 0 ; + } + *num_planes = q_data->fmt->colplanes;for (i =0 ; i < q_data->fmt->colplanes; i++) { sizes[i] = q_data->sizeimage[i];@@ -659,10 +870,92 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx, param->dec_w, param->dec_h); } +static void mtk_jpeg_set_param (struct mtk_jpeg_ctx *ctx, +struct mtk_jpeg_enc_param *param) +{ +struct mtk_jpeg_q_data *q_data_src = &ctx->out_q; +struct jpeg_enc_param *jpeg_params = &ctx->jpeg_param; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; +u32 width_even; +u32 is_420; +u32 padding_width; +u32 padding_height; + +switch (q_data_src->fmt->fourcc) { +case V4L2_PIX_FMT_YUYV : + param->enc_format =JPEG_YUV_FORMAT_YUYV ; +break ; +case V4L2_PIX_FMT_YVYU : + param->enc_format =JPEG_YUV_FORMAT_YVYU ; +break ; +case V4L2_PIX_FMT_NV12M : + param->enc_format =JPEG_YUV_FORMAT_NV12 ; +break ; +case V4L2_PIX_FMT_NV21M : + param->enc_format =JPEG_YUV_FORMAT_NV12 ; +break ; +default : +v4l2_err (&jpeg->v4l2_dev,"Unsupport fourcc =%d\n" , + q_data_src->fmt->fourcc); +break ; + } + param->enc_w = q_data_src->w; + param->enc_h = q_data_src->h; + +if (jpeg_params->enc_quality >=97 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q97 ; +else if (jpeg_params->enc_quality >=95 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q95 ; +else if (jpeg_params->enc_quality >=92 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q92 ; +else if (jpeg_params->enc_quality >=90 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q90 ; +else if (jpeg_params->enc_quality >=87 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q87 ; +else if (jpeg_params->enc_quality >=84 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q84 ; +else if (jpeg_params->enc_quality >=80 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q80 ; +else if (jpeg_params->enc_quality >=74 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q74 ; +else if (jpeg_params->enc_quality >=64 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q64 ; +else if (jpeg_params->enc_quality >=60 ) + param->enc_quality =JPEG_ENCODE_QUALITY_Q60 ; +else + param->enc_quality =JPEG_ENCODE_QUALITY_Q48 ; + + param->enable_exif = jpeg_params->enable_exif; + param->restart_interval = jpeg_params->restart_interval; + + width_even = ((param->enc_w +1 ) >>1 ) <<1 ; + is_420 = (param->enc_format ==JPEG_YUV_FORMAT_NV12 || + param->enc_format ==JPEG_YUV_FORMAT_NV12 ) ?1 :0 ; + padding_width =mtk_jpeg_align (param->enc_w,16 ); + padding_height =mtk_jpeg_align (param->enc_h, is_420 ?16 :8 ); +if (!is_420) + width_even = width_even <<1 ; + + param->img_stride =mtk_jpeg_align (width_even, (is_420 ?16 :32 )); + param->mem_stride =mtk_jpeg_align (width_even, (is_420 ?16 :32 )); + param->total_encdu = + ((padding_width >>4 ) * (padding_height >> (is_420 ?4 :3 )) * + (is_420 ?6 :4 )) -1 ; + +v4l2_dbg (0 ,2 , &jpeg->v4l2_dev,"fmt %d, w,h %d,%d, enable_exif %d," , +"enc_quality %d, restart_interval %d,img_stride %d," , +"mem_stride %d,totalEncDu %d\n" , + param->enc_format, param->enc_w, param->enc_h, + param->enable_exif, param->enc_quality, + param->restart_interval, param->img_stride, + param->mem_stride, param->total_encdu); +} +static void mtk_jpeg_buf_queue (struct vb2_buffer *vb) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (vb->vb2_queue);struct mtk_jpeg_dec_param *param; +struct mtk_jpeg_enc_param *enc_param;struct mtk_jpeg_dev *jpeg = ctx->jpeg;struct mtk_jpeg_src_buf *jpeg_src_buf;bool header_valid;@@ -674,29 +967,45 @@ static void mtk_jpeg_buf_queue(struct vb2_buffer *vb) goto end; jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (vb); - param = &jpeg_src_buf->dec_param; -memset (param,0 ,sizeof (*param)); - -if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { -v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"Got eos\n" ); - goto end; - } - header_valid =mtk_jpeg_parse (param, (u8 *)vb2_plane_vaddr (vb,0 ), -vb2_get_plane_payload (vb,0 )); -if (!header_valid) { -v4l2_err (&jpeg->v4l2_dev,"Header invalid.\n" ); -vb2_buffer_done (vb,VB2_BUF_STATE_ERROR ); -return ; - } - -if (ctx->state ==MTK_JPEG_INIT ) { -struct vb2_queue *dst_vq =v4l2_m2m_get_vq ( - ctx->fh.m2m_ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ); +if (jpeg->mode ==MTK_JPEG_ENC ) { + enc_param = &jpeg_src_buf->enc_param; +memset (enc_param,0 ,sizeof (*enc_param)); +mtk_jpeg_set_param (ctx, enc_param); +if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { +v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"Got eos" ); + goto end; + } +if (ctx->state ==MTK_JPEG_INIT ) + ctx->state =MTK_JPEG_RUNNING ; + }else { + param = &jpeg_src_buf->dec_param; +memset (param,0 ,sizeof (*param)); + +if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { +v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"Got eos\n" ); + goto end; + } + header_valid =mtk_jpeg_parse (param, + (u8 *)vb2_plane_vaddr (vb,0 ), +vb2_get_plane_payload (vb,0 )); +if (!header_valid) { +v4l2_err (&jpeg->v4l2_dev,"Header invalid.\n" ); +vb2_buffer_done (vb,VB2_BUF_STATE_ERROR ); +return ; + } -mtk_jpeg_queue_src_chg_event (ctx); -mtk_jpeg_set_queue_data (ctx, param); - ctx->state =vb2_is_streaming (dst_vq) ? -MTK_JPEG_SOURCE_CHANGE :MTK_JPEG_RUNNING ; +if (ctx->state ==MTK_JPEG_INIT ) { +struct vb2_queue *dst_vq; + + dst_vq =v4l2_m2m_get_vq + (ctx->fh.m2m_ctx, +V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ); +mtk_jpeg_queue_src_chg_event (ctx); +mtk_jpeg_set_queue_data (ctx, param); + ctx->state =vb2_is_streaming (dst_vq) ? +MTK_JPEG_SOURCE_CHANGE : +MTK_JPEG_RUNNING ; + } } end:v4l2_m2m_buf_queue (ctx->fh.m2m_ctx,to_vb2_v4l2_buffer (vb));@@ -739,16 +1048,16 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q)* subsampling. Update capture queue when the stream is off. */ if (ctx->state ==MTK_JPEG_SOURCE_CHANGE && - !V4L2_TYPE_IS_OUTPUT (q->type)) { + !V4L2_TYPE_IS_OUTPUT (q->type) && + ctx->jpeg->mode ==MTK_JPEG_DEC ) {struct mtk_jpeg_src_buf *src_buf; vb =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); src_buf =mtk_jpeg_vb2_to_srcbuf (&vb->vb2_buf);mtk_jpeg_set_queue_data (ctx, &src_buf->dec_param); ctx->state =MTK_JPEG_RUNNING ; - }else if (V4L2_TYPE_IS_OUTPUT (q->type)) { + }else if (V4L2_TYPE_IS_OUTPUT (q->type)) ctx->state =MTK_JPEG_INIT ; - }while ((vb =mtk_jpeg_buf_remove (ctx, q->type)))v4l2_m2m_buf_done (vb,VB2_BUF_STATE_ERROR );@@ -803,6 +1112,28 @@ static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx,return 0 ; } +static void mtk_jpeg_set_enc_dst (struct mtk_jpeg_ctx *ctx, +struct vb2_buffer *dst_buf, +struct mtk_jpeg_enc_bs *bs) +{ + bs->dma_addr =vb2_dma_contig_plane_dma_addr (dst_buf,0 ) & + (~JPEG_ENC_DST_ADDR_OFFSET_MASK ); + bs->dma_addr_offset =0 ; + bs->dma_addr_offsetmask = bs->dma_addr &JPEG_ENC_DST_ADDR_OFFSET_MASK ; + bs->size =mtk_jpeg_align (vb2_plane_size (dst_buf,0 ),128 ); +} + +static void mtk_jpeg_set_enc_src (struct mtk_jpeg_ctx *ctx, +struct vb2_buffer *src_buf, +struct mtk_jpeg_enc_fb *fb) +{ +int i; + +for (i =0 ; i < src_buf->num_planes; i++) + fb->fb_addr[i].dma_addr = +vb2_dma_contig_plane_dma_addr (src_buf, i); +} +static void mtk_jpeg_device_run (void *priv) {struct mtk_jpeg_ctx *ctx = priv;@@ -813,6 +1144,8 @@ static void mtk_jpeg_device_run(void *priv)struct mtk_jpeg_src_buf *jpeg_src_buf;struct mtk_jpeg_bs bs;struct mtk_jpeg_fb fb; +struct mtk_jpeg_enc_bs enc_bs; +struct mtk_jpeg_enc_fb enc_fb;int i; src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx);@@ -823,30 +1156,45 @@ static void mtk_jpeg_device_run(void *priv)for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++)vb2_set_plane_payload (&dst_buf->vb2_buf, i,0 ); buf_state =VB2_BUF_STATE_DONE ; - goto dec_end; + goto device_run_end; } -if (mtk_jpeg_check_resolution_change (ctx, &jpeg_src_buf->dec_param)) { -mtk_jpeg_queue_src_chg_event (ctx); - ctx->state =MTK_JPEG_SOURCE_CHANGE ; -v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); -return ; - } +if (jpeg->mode ==MTK_JPEG_ENC ) { +mtk_jpeg_set_enc_dst (ctx, &dst_buf->vb2_buf, &enc_bs); +mtk_jpeg_set_enc_src (ctx, &src_buf->vb2_buf, &enc_fb); + +spin_lock_irqsave (&jpeg->hw_lock, flags); +mtk_jpeg_enc_reset (jpeg->reg_base); +mtk_jpeg_enc_set_config (jpeg->reg_base, + &jpeg_src_buf->enc_param, &enc_bs, + &enc_fb); + +mtk_jpeg_enc_start (jpeg->reg_base); + }else { +if (mtk_jpeg_check_resolution_change + (ctx, &jpeg_src_buf->dec_param)) { +mtk_jpeg_queue_src_chg_event (ctx); + ctx->state =MTK_JPEG_SOURCE_CHANGE ; +v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); +return ; + } -mtk_jpeg_set_dec_src (ctx, &src_buf->vb2_buf, &bs); -if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, &dst_buf->vb2_buf, &fb)) - goto dec_end; +mtk_jpeg_set_dec_src (ctx, &src_buf->vb2_buf, &bs); +if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, + &dst_buf->vb2_buf, &fb)) + goto device_run_end; -spin_lock_irqsave (&jpeg->hw_lock, flags); -mtk_jpeg_dec_reset (jpeg->dec_reg_base); -mtk_jpeg_dec_set_config (jpeg->dec_reg_base, - &jpeg_src_buf->dec_param, &bs, &fb); +spin_lock_irqsave (&jpeg->hw_lock, flags); +mtk_jpeg_dec_reset (jpeg->reg_base); +mtk_jpeg_dec_set_config (jpeg->reg_base, + &jpeg_src_buf->dec_param, &bs, &fb); -mtk_jpeg_dec_start (jpeg->dec_reg_base); +mtk_jpeg_dec_start (jpeg->reg_base); + }spin_unlock_irqrestore (&jpeg->hw_lock, flags);return ; -dec_end: +device_run_end:v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_buf_done (src_buf, buf_state);@@ -906,30 +1254,30 @@ static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg) ret =mtk_smi_larb_get (jpeg->larb);if (ret)dev_err (jpeg->dev,"mtk_smi_larb_get larbvdec fail %d\n" , ret); -clk_prepare_enable (jpeg->clk_jdec_smi); -clk_prepare_enable (jpeg->clk_jdec); +if (jpeg->mode ==MTK_JPEG_DEC ) +clk_prepare_enable (jpeg->clk_jpeg_smi); +clk_prepare_enable (jpeg->clk_jpeg); }static void mtk_jpeg_clk_off (struct mtk_jpeg_dev *jpeg) { -clk_disable_unprepare (jpeg->clk_jdec); -clk_disable_unprepare (jpeg->clk_jdec_smi); +clk_disable_unprepare (jpeg->clk_jpeg); +if (jpeg->mode ==MTK_JPEG_DEC ) +clk_disable_unprepare (jpeg->clk_jpeg_smi);mtk_smi_larb_put (jpeg->larb); } -static irqreturn_t mtk_jpeg_dec_irq (int irq,void *priv) +static irqreturn_t mtk_jpeg_irq (int irq,void *priv) {struct mtk_jpeg_dev *jpeg = priv;struct mtk_jpeg_ctx *ctx;struct vb2_v4l2_buffer *src_buf, *dst_buf;struct mtk_jpeg_src_buf *jpeg_src_buf;enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ; -u32 dec_irq_ret; -u32 dec_ret; +u32 irq_ret; +u32 ret, result_size;int i; - dec_ret =mtk_jpeg_dec_get_int_status (jpeg->dec_reg_base); - dec_irq_ret =mtk_jpeg_dec_enum_result (dec_ret); ctx =v4l2_m2m_get_curr_priv (jpeg->m2m_dev);if (!ctx) {v4l2_err (&jpeg->v4l2_dev,"Context is NULL\n" );@@ -940,21 +1288,42 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf); -if (dec_irq_ret >=MTK_JPEG_DEC_RESULT_UNDERFLOW ) -mtk_jpeg_dec_reset (jpeg->dec_reg_base); +if (jpeg->mode ==MTK_JPEG_ENC ) { + ret =mtk_jpeg_enc_get_int_status (jpeg->reg_base); + irq_ret =mtk_jpeg_enc_enum_result (jpeg->reg_base, ret, + &result_size); -if (dec_irq_ret !=MTK_JPEG_DEC_RESULT_EOF_DONE ) { -dev_err (jpeg->dev,"decode failed\n" ); - goto dec_end; - } +if (irq_ret >=MTK_JPEG_ENC_RESULT_STALL ) +mtk_jpeg_enc_reset (jpeg->reg_base); + +if (irq_ret !=MTK_JPEG_ENC_RESULT_DONE ) { +dev_err (jpeg->dev,"encode failed\n" ); + goto irq_end; + } + +vb2_set_plane_payload (&dst_buf->vb2_buf,0 , + result_size); + }else { + ret =mtk_jpeg_dec_get_int_status (jpeg->reg_base); + irq_ret =mtk_jpeg_dec_enum_result (ret); -for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) -vb2_set_plane_payload (&dst_buf->vb2_buf, i, - jpeg_src_buf->dec_param.comp_size[i]); +if (irq_ret >=MTK_JPEG_DEC_RESULT_UNDERFLOW ) +mtk_jpeg_dec_reset (jpeg->reg_base); + +if (irq_ret !=MTK_JPEG_DEC_RESULT_EOF_DONE ) { +dev_err (jpeg->dev,"decode failed\n" ); + goto irq_end; + } + +for (i =0 ; i < dst_buf->vb2_buf.num_planes; i++) +vb2_set_plane_payload + (&dst_buf->vb2_buf, i, + jpeg_src_buf->dec_param.comp_size[i]); + } buf_state =VB2_BUF_STATE_DONE ; -dec_end: +irq_end:v4l2_m2m_buf_done (src_buf, buf_state);v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx);@@ -964,32 +1333,72 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)static void mtk_jpeg_set_default_params (struct mtk_jpeg_ctx *ctx) {struct mtk_jpeg_q_data *q = &ctx->out_q; -int i; +int i, align_w, align_h; + + ctx->fh.ctrl_handler = &ctx->ctrl_hdl; ctx->colorspace =V4L2_COLORSPACE_JPEG , ctx->ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; ctx->quantization =V4L2_QUANTIZATION_DEFAULT ; ctx->xfer_func =V4L2_XFER_FUNC_DEFAULT ; - q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_JPEG , +if (ctx->jpeg->mode ==MTK_JPEG_ENC ) { + q->w =MTK_JPEG_MIN_WIDTH ; + q->h =MTK_JPEG_MIN_HEIGHT ; + + q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_YUYV , +MTK_JPEG_FMT_TYPE_OUTPUT ); + + align_w = q->w; + align_h = q->h; + align_w =round_up (align_w,2 ); + align_w = align_w <<1 ; +v4l_bound_align_image (&align_w, +MTK_JPEG_MIN_WIDTH , +MTK_JPEG_MAX_WIDTH ,5 , + &align_h, +MTK_JPEG_MIN_HEIGHT , +MTK_JPEG_MAX_HEIGHT ,3 ,0 ); + +if (align_w <MTK_JPEG_MIN_WIDTH && + (align_w +32 ) <=MTK_JPEG_MAX_WIDTH ) + align_w +=32 ; +if (align_h <MTK_JPEG_MIN_HEIGHT && + (align_h +8 ) <=MTK_JPEG_MAX_HEIGHT ) + align_h +=8 ; + + q->sizeimage[0 ] = align_w * align_h; + q->bytesperline[0 ] = align_w; + }else { + q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_JPEG ,MTK_JPEG_FMT_TYPE_OUTPUT ); - q->w =MTK_JPEG_MIN_WIDTH ; - q->h =MTK_JPEG_MIN_HEIGHT ; - q->bytesperline[0 ] =0 ; - q->sizeimage[0 ] =MTK_JPEG_DEFAULT_SIZEIMAGE ; + q->w =MTK_JPEG_MIN_WIDTH ; + q->h =MTK_JPEG_MIN_HEIGHT ; + q->bytesperline[0 ] =0 ; + q->sizeimage[0 ] =MTK_JPEG_DEFAULT_SIZEIMAGE ; + } q = &ctx->cap_q; - q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_YUV420M , +if (ctx->jpeg->mode ==MTK_JPEG_ENC ) { + q->w =MTK_JPEG_MIN_WIDTH ; + q->h =MTK_JPEG_MIN_HEIGHT ; + q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_JPEG , +MTK_JPEG_FMT_TYPE_CAPTURE ); + q->bytesperline[0 ] =0 ; + q->sizeimage[0 ] =MTK_JPEG_DEFAULT_SIZEIMAGE ; + }else { + q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_YUV420M ,MTK_JPEG_FMT_TYPE_CAPTURE ); - q->w =MTK_JPEG_MIN_WIDTH ; - q->h =MTK_JPEG_MIN_HEIGHT ; + q->w =MTK_JPEG_MIN_WIDTH ; + q->h =MTK_JPEG_MIN_HEIGHT ; -for (i =0 ; i < q->fmt->colplanes; i++) { -u32 stride = q->w * q->fmt->h_sample[i] /4 ; -u32 h = q->h * q->fmt->v_sample[i] /4 ; +for (i =0 ; i < q->fmt->colplanes; i++) { +u32 stride = q->w * q->fmt->h_sample[i] /4 ; +u32 h = q->h * q->fmt->v_sample[i] /4 ; - q->bytesperline[i] = stride; - q->sizeimage[i] = stride * h; + q->bytesperline[i] = stride; + q->sizeimage[i] = stride * h; + } } }@@ -1021,6 +1430,13 @@ static int mtk_jpeg_open(struct file *file) goto error; } + ret =mtk_jpeg_ctrls_setup (ctx); +if (ret) { +v4l2_err (&jpeg->v4l2_dev,"Failed to setup controls() (%d)\n" , + ret); + goto error; + } +mtk_jpeg_set_default_params (ctx);mutex_unlock (&jpeg->lock);return 0 ;@@ -1041,6 +1457,7 @@ static int mtk_jpeg_release(struct file *file)mutex_lock (&jpeg->lock);v4l2_m2m_ctx_release (ctx->fh.m2m_ctx); +v4l2_ctrl_handler_free (&ctx->ctrl_hdl);v4l2_fh_del (&ctx->fh);v4l2_fh_exit (&ctx->fh);kfree (ctx);@@ -1065,6 +1482,7 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) node =of_parse_phandle (jpeg->dev->of_node,"mediatek,larb" ,0 );if (!node)return -EINVAL ; + pdev =of_find_device_by_node (node);if (WARN_ON (!pdev)) {of_node_put (node);@@ -1074,19 +1492,24 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) jpeg->larb = &pdev->dev; - jpeg->clk_jdec =devm_clk_get (jpeg->dev,"jpgdec" ); -if (IS_ERR (jpeg->clk_jdec)) -return PTR_ERR (jpeg->clk_jdec); +if (jpeg->mode ==MTK_JPEG_ENC ) { + jpeg->clk_jpeg =devm_clk_get (jpeg->dev,"jpgenc" ); +return PTR_ERR_OR_ZERO (jpeg->clk_jpeg); + } - jpeg->clk_jdec_smi =devm_clk_get (jpeg->dev,"jpgdec-smi" ); -return PTR_ERR_OR_ZERO (jpeg->clk_jdec_smi); + jpeg->clk_jpeg =devm_clk_get (jpeg->dev,"jpgdec" ); +if (IS_ERR (jpeg->clk_jpeg)) +return PTR_ERR (jpeg->clk_jpeg); + + jpeg->clk_jpeg_smi =devm_clk_get (jpeg->dev,"jpgdec-smi" ); +return PTR_ERR_OR_ZERO (jpeg->clk_jpeg_smi); }static int mtk_jpeg_probe (struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg;struct resource *res; -int dec_irq; +int jpeg_irq;int ret; jpeg =devm_kzalloc (&pdev->dev,sizeof (*jpeg),GFP_KERNEL );@@ -1096,28 +1519,26 @@ static int mtk_jpeg_probe(struct platform_device *pdev)mutex_init (&jpeg->lock);spin_lock_init (&jpeg->hw_lock); jpeg->dev = &pdev->dev; + jpeg->mode = (enum mtk_jpeg_mode )of_device_get_match_data (jpeg->dev); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - jpeg->dec_reg_base =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (jpeg->dec_reg_base)) { - ret =PTR_ERR (jpeg->dec_reg_base); + jpeg->reg_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (jpeg->reg_base)) { + ret =PTR_ERR (jpeg->reg_base);return ret; } - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); - dec_irq =platform_get_irq (pdev,0 ); -if (!res || dec_irq <0 ) { -dev_err (&pdev->dev,"Failed to get dec_irq %d.\n" , dec_irq); - ret = -EINVAL ; -return ret; + jpeg_irq =platform_get_irq (pdev,0 ); +if (jpeg_irq <0 ) { +dev_err (&pdev->dev,"Failed to get jpeg_irq %d.\n" , jpeg_irq); +return jpeg_irq; } - ret =devm_request_irq (&pdev->dev, dec_irq, mtk_jpeg_dec_irq,0 , + ret =devm_request_irq (&pdev->dev, jpeg_irq, mtk_jpeg_irq,0 , pdev->name, jpeg);if (ret) { -dev_err (&pdev->dev,"Failed to request dec_irq %d (%d)\n" , - dec_irq, ret); - ret = -EINVAL ; +dev_err (&pdev->dev,"Failed to request jpeg_irq %d (%d)\n" , + jpeg_irq, ret); goto err_req_irq; }@@ -1141,33 +1562,35 @@ static int mtk_jpeg_probe(struct platform_device *pdev) goto err_m2m_init; } - jpeg->dec_vdev =video_device_alloc (); -if (!jpeg->dec_vdev) { + jpeg->vfd_jpeg =video_device_alloc (); +if (!jpeg->vfd_jpeg) { ret = -ENOMEM ; - goto err_dec_vdev_alloc; + goto err_vfd_jpeg_alloc; } -snprintf (jpeg->dec_vdev->name,sizeof (jpeg->dec_vdev->name), -"%s-dec" ,MTK_JPEG_NAME ); - jpeg->dec_vdev->fops = &mtk_jpeg_fops; - jpeg->dec_vdev->ioctl_ops = &mtk_jpeg_ioctl_ops; - jpeg->dec_vdev->minor =-1 ; - jpeg->dec_vdev->release = video_device_release; - jpeg->dec_vdev->lock = &jpeg->lock; - jpeg->dec_vdev->v4l2_dev = &jpeg->v4l2_dev; - jpeg->dec_vdev->vfl_dir =VFL_DIR_M2M ; - jpeg->dec_vdev->device_caps =V4L2_CAP_STREAMING | +snprintf (jpeg->vfd_jpeg->name,sizeof (jpeg->vfd_jpeg->name), +"%s-%s" ,MTK_JPEG_NAME , + jpeg->mode ==MTK_JPEG_ENC ?"enc" :"dec" ); + jpeg->vfd_jpeg->fops = &mtk_jpeg_fops; + jpeg->vfd_jpeg->ioctl_ops = &mtk_jpeg_ioctl_ops; + jpeg->vfd_jpeg->minor =-1 ; + jpeg->vfd_jpeg->release = video_device_release; + jpeg->vfd_jpeg->lock = &jpeg->lock; + jpeg->vfd_jpeg->v4l2_dev = &jpeg->v4l2_dev; + jpeg->vfd_jpeg->vfl_dir =VFL_DIR_M2M ; + jpeg->vfd_jpeg->device_caps =V4L2_CAP_STREAMING |V4L2_CAP_VIDEO_M2M_MPLANE ; - ret =video_register_device (jpeg->dec_vdev,VFL_TYPE_GRABBER ,3 ); + ret =video_register_device (jpeg->vfd_jpeg,VFL_TYPE_GRABBER ,-1 );if (ret) {v4l2_err (&jpeg->v4l2_dev,"Failed to register video device\n" ); - goto err_dec_vdev_register; + goto err_vfd_jpeg_register; } -video_set_drvdata (jpeg->dec_vdev, jpeg); +video_set_drvdata (jpeg->vfd_jpeg, jpeg);v4l2_info (&jpeg->v4l2_dev, -"decoder device registered as /dev/video%d (%d,%d)\n" , - jpeg->dec_vdev->num,VIDEO_MAJOR , jpeg->dec_vdev->minor); +"jpeg device %d registered as /dev/video%d (%d,%d)\n" , + jpeg->mode, jpeg->vfd_jpeg->num,VIDEO_MAJOR , + jpeg->vfd_jpeg->minor);platform_set_drvdata (pdev, jpeg);@@ -1175,10 +1598,10 @@ static int mtk_jpeg_probe(struct platform_device *pdev)return 0 ; -err_dec_vdev_register: -video_device_release (jpeg->dec_vdev); +err_vfd_jpeg_register: +video_device_release (jpeg->vfd_jpeg); -err_dec_vdev_alloc: +err_vfd_jpeg_alloc:v4l2_m2m_release (jpeg->m2m_dev); err_m2m_init:@@ -1198,8 +1621,8 @@ static int mtk_jpeg_remove(struct platform_device *pdev)struct mtk_jpeg_dev *jpeg =platform_get_drvdata (pdev);pm_runtime_disable (&pdev->dev); -video_unregister_device (jpeg->dec_vdev); -video_device_release (jpeg->dec_vdev); +video_unregister_device (jpeg->vfd_jpeg); +video_device_release (jpeg->vfd_jpeg);v4l2_m2m_release (jpeg->m2m_dev);v4l2_device_unregister (&jpeg->v4l2_dev);@@ -1210,7 +1633,11 @@ static __maybe_unused int mtk_jpeg_pm_suspend(struct device *dev) {struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev); -mtk_jpeg_dec_reset (jpeg->dec_reg_base); +if (jpeg->mode ==MTK_JPEG_ENC ) +mtk_jpeg_enc_reset (jpeg->reg_base); +else +mtk_jpeg_dec_reset (jpeg->reg_base); +mtk_jpeg_clk_off (jpeg);return 0 ;@@ -1221,7 +1648,10 @@ static __maybe_unused int mtk_jpeg_pm_resume(struct device *dev)struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev);mtk_jpeg_clk_on (jpeg); -mtk_jpeg_dec_reset (jpeg->dec_reg_base); +if (jpeg->mode ==MTK_JPEG_ENC ) +mtk_jpeg_enc_reset (jpeg->reg_base); +else +mtk_jpeg_dec_reset (jpeg->reg_base);return 0 ; }@@ -1257,11 +1687,15 @@ static const struct dev_pm_ops mtk_jpeg_pm_ops = {static const struct of_device_id mtk_jpeg_match[] = { { .compatible ="mediatek,mt8173-jpgdec" , - .data =NULL , + .data = (void *)MTK_JPEG_DEC , }, { .compatible ="mediatek,mt2701-jpgdec" , - .data =NULL , + .data = (void *)MTK_JPEG_DEC , + }, + { + .compatible ="mediatek,mtk-jpgenc" , + .data = (void *)MTK_JPEG_ENC , }, {}, };drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +104
-10@@ -2,6 +2,7 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -25,6 +26,8 @@#define MTK_JPEG_FMT_FLAG_DEC_OUTPUT BIT(0)#define MTK_JPEG_FMT_FLAG_DEC_CAPTURE BIT(1) +#define MTK_JPEG_FMT_FLAG_ENC_OUTPUT BIT(2) +#define MTK_JPEG_FMT_FLAG_ENC_CAPTURE BIT(3)#define MTK_JPEG_FMT_TYPE_OUTPUT 1#define MTK_JPEG_FMT_TYPE_CAPTURE 2@@ -36,12 +39,63 @@#define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024) +#define MTK_JPEG_ENCODE 0 +#define MTK_JPEG_DECODE 1 + +/** +* enum mtk_jpeg_ctx_state - contex state of jpeg +*/ enum mtk_jpeg_ctx_state {MTK_JPEG_INIT =0 ,MTK_JPEG_RUNNING ,MTK_JPEG_SOURCE_CHANGE , }; +/** +* enum mtk_jpeg_mode - mode of jpeg +*/ +enum mtk_jpeg_mode { +MTK_JPEG_ENC , +MTK_JPEG_DEC , +}; + +/** +* enum jpeg_enc_yuv_fmt - yuv format of jpeg enc +*/ +enum jpeg_enc_yuv_fmt { +JPEG_YUV_FORMAT_YUYV =0 , +JPEG_YUV_FORMAT_YVYU =1 , +JPEG_YUV_FORMAT_NV12 =2 , +JEPG_YUV_FORMAT_NV21 =3 , +}; + +/** +* enum JPEG_ENCODE_QUALITY_ENUM - number of jpeg encoder quality +*/ +enum JPEG_ENCODE_QUALITY_ENUM { +JPEG_ENCODE_QUALITY_Q60 =0x0 , +JPEG_ENCODE_QUALITY_Q80 =0x1 , +JPEG_ENCODE_QUALITY_Q90 =0x2 , +JPEG_ENCODE_QUALITY_Q95 =0x3 , + +JPEG_ENCODE_QUALITY_Q39 =0x4 , +JPEG_ENCODE_QUALITY_Q68 =0x5 , +JPEG_ENCODE_QUALITY_Q84 =0x6 , +JPEG_ENCODE_QUALITY_Q92 =0x7 , + +JPEG_ENCODE_QUALITY_Q48 =0x8 , +JPEG_ENCODE_QUALITY_Q74 =0xA , +JPEG_ENCODE_QUALITY_Q87 =0xB , + +JPEG_ENCODE_QUALITY_Q34 =0xC , +JPEG_ENCODE_QUALITY_Q64 =0xE , +JPEG_ENCODE_QUALITY_Q82 =0xF , + +JPEG_ENCODE_QUALITY_Q97 =0x10 , + +JPEG_ENCODE_QUALITY_ALL =0xFFFFFFFF +}; +/** * struct mt_jpeg - JPEG IP abstraction * @lock: the mutex protecting this structure @@ -51,11 +105,12 @@ enum mtk_jpeg_ctx_state {* @v4l2_dev: v4l2 device for mem2mem mode * @m2m_dev: v4l2 mem2mem device data * @alloc_ctx: videobuf2 memory allocator's context -* @dec_vdev: video device node for decoder mem2mem mode -* @dec_reg_base: JPEG registers mapping -* @clk_jdec: JPEG hw working clock -* @clk_jdec_smi: JPEG SMI bus clock +* @vfd_jpeg: video device node for jpeg mem2mem mode +* @reg_base: JPEG registers mapping +* @clk_jpeg: JPEG hw working clock +* @clk_jpeg_smi: JPEG SMI bus clock * @larb: SMI device +* @mode: compression (encode) operation or decompression (decode) */ struct mtk_jpeg_dev {struct mutex lock;@@ -65,11 +120,12 @@ struct mtk_jpeg_dev {struct v4l2_device v4l2_dev;struct v4l2_m2m_dev *m2m_dev;void *alloc_ctx; -struct video_device *dec_vdev; -void __iomem *dec_reg_base; -struct clk *clk_jdec; -struct clk *clk_jdec_smi; +struct video_device *vfd_jpeg; +void __iomem *reg_base; +struct clk *clk_jpeg; +struct clk *clk_jpeg_smi;struct device *larb; +enum mtk_jpeg_mode mode; };/** @@ -109,15 +165,51 @@ struct mtk_jpeg_q_data {u32 sizeimage[VIDEO_MAX_PLANES ]; }; +/** +* jpeg_enc_param - parameters of jpeg encode control +* @enable_exif: EXIF enable for jpeg encode mode +* @enc_quality: destination image quality in encode mode +* @restart_interval: JPEG restart interval for JPEG encoding +*/ +struct jpeg_enc_param { +u32 enable_exif; +u32 enc_quality; +u32 restart_interval; +}; + +/** +* mtk_jpeg_enc_param: General jpeg encoding parameters +* @enc_w: image width +* @enc_h: image height +* @enable_exif: EXIF enable for jpeg encode mode +* @enc_quality: destination image quality in encode mode +* @enc_format: input image format +* @restart_interval: JPEG restart interval for JPEG encoding +* @img_stride: jpeg encoder image stride +* @mem_stride: jpeg encoder memory stride +* @total_encdu: total 8x8 block number +*/ +struct mtk_jpeg_enc_param { +u32 enc_w; +u32 enc_h; +u32 enable_exif; +u32 enc_quality; +u32 enc_format; +u32 restart_interval; +u32 img_stride; +u32 mem_stride; +u32 total_encdu; +}; +/** * mtk_jpeg_ctx - the device context data * @jpeg: JPEG IP device for this context * @out_q: source (output) queue information * @cap_q: destination (capture) queue queue information * @fh: V4L2 file handle -* @dec_param parameters for HW decoding * @state: state of the context -* @header_valid: set if header has been parsed and valid +* @jpeg_param: jpeg encode parameters +* @ctrl_hdl: controls handler * @colorspace: enum v4l2_colorspace; supplemental to pixelformat * @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding * @quantization: enum v4l2_quantization, colorspace quantization @@ -129,6 +221,8 @@ struct mtk_jpeg_ctx {struct mtk_jpeg_q_data cap_q;struct v4l2_fh fh;enum mtk_jpeg_ctx_state state; +struct jpeg_enc_param jpeg_param; +struct v4l2_ctrl_handler ctrl_hdl;enum v4l2_colorspace colorspace;enum v4l2_ycbcr_encoding ycbcr_enc;drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +4
-3@@ -2,6 +2,7 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -13,8 +14,8 @@* GNU General Public License for more details. */ -#ifndef _MTK_JPEG_HW_H -#define _MTK_JPEG_HW_H +#ifndef _MTK_JPEG_DEC_HW_H +#define _MTK_JPEG_DEC_HW_H#include <media/videobuf2-core.h> @@ -88,4 +89,4 @@ void mtk_jpeg_dec_set_config(void __iomem *base,void mtk_jpeg_dec_reset (void __iomem *dec_reg_base);void mtk_jpeg_dec_start (void __iomem *dec_reg_base); -#endif /* _MTK_JPEG_HW_H */ +#endif /* _MTK_JPEG_DEC_HW_H */ drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c new file +175
-0@@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Author: Xia Jiang <[email protected]> +* +*/ + +#include <linux/io.h> +#include <linux/kernel.h> +#include <media/videobuf2-core.h> + +#include "mtk_jpeg_enc_hw.h" + +void mtk_jpeg_enc_reset (void __iomem *base) +{ +writel (0x00 , base +JPGENC_RSTB ); +writel (JPEG_ENC_RESET_BIT , base +JPGENC_RSTB ); +writel (0x00 , base +JPGENC_CODEC_SEL ); +} + +u32 mtk_jpeg_enc_get_int_status (void __iomem *base) +{ +u32 ret; + + ret =readl (base +JPGENC_INT_STS ) & +JPEG_DRV_ENC_INT_STATUS_MASK_ALLIRQ ; +if (ret) +writel (0 , base +JPGENC_INT_STS ); + +return ret; +} + +u32 mtk_jpeg_enc_get_file_size (void __iomem *base) +{ +return readl (base +JPGENC_DMA_ADDR0 ) -readl (base +JPGENC_DST_ADDR0 ); +} + +u32 mtk_jpeg_enc_enum_result (void __iomem *base,u32 irq_status,u32 *file_size) +{ + *file_size =mtk_jpeg_enc_get_file_size (base); +if (irq_status &JPEG_DRV_ENC_INT_STATUS_DONE ) +return MTK_JPEG_ENC_RESULT_DONE ; +else if (irq_status &JPEG_DRV_ENC_INT_STATUS_STALL ) +return MTK_JPEG_ENC_RESULT_STALL ; +else if (irq_status &JPEG_DRV_ENC_INT_STATUS_VCODEC_IRQ ) +return MTK_JPEG_ENC_RESULT_VCODEC_IRQ ; +return MTK_JPEG_ENC_RESULT_ERROR_UNKNOWN ; +} + +static void mtk_jpeg_enc_set_blk_num (void __iomem *base,u32 blk_num) +{ +writel (blk_num, base +JPGENC_BLK_NUM ); +} + +static void mtk_jpeg_enc_set_encFormat (void __iomem *base,u32 enc_format) +{ +u32 value; + + value =readl (base +JPGENC_CTRL ); + value &= ~JPEG_ENC_CTRL_YUV_BIT ; + value |=JPGENC_FORMAT (enc_format); +writel (value, base +JPGENC_CTRL ); +} + +static void mtk_jpeg_enc_set_img_size (void __iomem *base,u32 width,u32 height) +{ +u32 value; + + value =JPGENC_WIDTH_HEIGHT (width, height); +writel (value, base +JPGENC_IMG_SIZE ); +} + +static void mtk_jpeg_enc_set_src_img (void __iomem *base,u32 width, +u32 height,u32 yuv_format, +u32 total_encdu) +{ +mtk_jpeg_enc_set_img_size (base, width, height); +mtk_jpeg_enc_set_encFormat (base, yuv_format); +mtk_jpeg_enc_set_blk_num (base, total_encdu); +} + +static void mtk_jpeg_enc_set_src_buf (void __iomem *base,u32 img_stride, +u32 mem_stride,u32 src_addr, +u32 src_addr_c) +{ +writel (img_stride, base +JPGENC_IMG_STRIDE ); +writel (mem_stride, base +JPGENC_STRIDE ); +writel (src_addr, base +JPGENC_SRC_LUMA_ADDR ); +writel (src_addr_c, base +JPGENC_SRC_CHROMA_ADDR ); +} + +static void mtk_jpeg_enc_set_dst_buf (void __iomem *base,u32 dst_addr, +u32 stall_size,u32 init_offset, +u32 offset_mask) +{ +writel (JPGENC_INIT_OFFSET (init_offset), base +JPGENC_OFFSET_ADDR ); +writel (JPGENC_OFFSET_MASK (offset_mask), base +JPGENC_BYTE_OFFSET_MASK ); +writel (JPGENC_DST_ADDR (dst_addr), base +JPGENC_DST_ADDR0 ); +writel (JPGENC_STALL_ADDR (dst_addr, stall_size), + base +JPGENC_STALL_ADDR0 ); +} + +static void mtk_jpeg_enc_set_quality (void __iomem *base,u32 quality) +{ +u32 value; + + value =readl (base +JPGENC_QUALITY ); + value =JPGENC_SET_QUALITY (value, quality); +writel (value, base +JPGENC_QUALITY ); +} + +static void mtk_jpeg_enc_set_restart_interval (void __iomem *base, +u32 restart_interval) +{ +u32 value; + + value =readl (base +JPGENC_CTRL ); +if (restart_interval) + value |=JPEG_ENC_CTRL_RESTART_EN_BIT ; +else + value &= ~JPEG_ENC_CTRL_RESTART_EN_BIT ; +writel (value, base +JPGENC_CTRL ); +writel (restart_interval, base +JPGENC_RST_MCU_NUM ); +} + +static void mtk_jpeg_enc_set_encode_mode (void __iomem *base,u32 exif_en) +{ +u32 value; + + value =readl (base +JPGENC_CTRL ); + value &= ~JPEG_ENC_CTRL_FILE_FORMAT_BIT ; +writel (value, base +JPGENC_CTRL ); + +if (exif_en) { + value =readl (base +JPGENC_CTRL ); + value |=JPEG_ENC_EN_JFIF_EXIF ; +writel (value, base +JPGENC_CTRL ); + } +} + +static void mtk_jpeg_enc_set_ctrl_cfg (void __iomem *base,u32 exif_en, +u32 quality,u32 restart_interval) +{ +mtk_jpeg_enc_set_quality (base, quality); + +mtk_jpeg_enc_set_restart_interval (base, restart_interval); + +mtk_jpeg_enc_set_encode_mode (base, exif_en); +} + +void mtk_jpeg_enc_start (void __iomem *base) +{ +u32 value; + + value =readl (base +JPGENC_CTRL ); + value |=JPEG_ENC_CTRL_INT_EN_BIT |JPEG_ENC_CTRL_ENABLE_BIT ; +writel (value, base +JPGENC_CTRL ); +} + +void mtk_jpeg_enc_set_config (void __iomem *base, +struct mtk_jpeg_enc_param *config, +struct mtk_jpeg_enc_bs *bs, +struct mtk_jpeg_enc_fb *fb) +{ +mtk_jpeg_enc_set_src_img (base, config->enc_w, config->enc_h, + config->enc_format, config->total_encdu); +mtk_jpeg_enc_set_src_buf (base, config->img_stride, config->mem_stride, + fb->fb_addr[0 ].dma_addr, + fb->fb_addr[1 ].dma_addr); +mtk_jpeg_enc_set_dst_buf (base, bs->dma_addr, bs->size, + bs->dma_addr_offset, bs->dma_addr_offsetmask); +mtk_jpeg_enc_set_ctrl_cfg (base, config->enable_exif, + config->enc_quality, + config->restart_interval); +}drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h new file +60
-0@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +* Author: Xia Jiang <[email protected]> +* +*/ + +#ifndef _MTK_JPEG_ENC_HW_H +#define _MTK_JPEG_ENC_HW_H + +#include <media/videobuf2-core.h> + +#include "mtk_jpeg_core.h" +#include "mtk_jpeg_enc_reg.h" + +#define JPEG_ENC_DST_ADDR_OFFSET_MASK GENMASK(3, 0) + +#define JPEG_ENC_CTRL_YUV_BIT 0x18 +#define JPEG_ENC_CTRL_RESTART_EN_BIT BIT(10) +#define JPEG_ENC_CTRL_FILE_FORMAT_BIT BIT(5) +#define JPEG_ENC_EN_JFIF_EXIF BIT(5) +#define JPEG_ENC_CTRL_INT_EN_BIT BIT(2) +#define JPEG_ENC_CTRL_ENABLE_BIT BIT(0) +#define JPEG_ENC_RESET_BIT BIT(0) + +enum { +MTK_JPEG_ENC_RESULT_DONE =0 , +MTK_JPEG_ENC_RESULT_STALL , +MTK_JPEG_ENC_RESULT_VCODEC_IRQ , +MTK_JPEG_ENC_RESULT_ERROR_UNKNOWN +}; + +struct mtk_jpeg_enc_bs { +dma_addr_t dma_addr; +size_t size; +u32 dma_addr_offset; +u32 dma_addr_offsetmask; +}; + +struct mtk_jpeg_mem { +dma_addr_t dma_addr; +size_t size; +}; + +struct mtk_jpeg_enc_fb { +struct mtk_jpeg_mem fb_addr[MTK_JPEG_COMP_MAX ]; +u32 num_planes; +}; + +void mtk_jpeg_enc_reset (void __iomem *base); +u32 mtk_jpeg_enc_get_int_status (void __iomem *base); +u32 mtk_jpeg_enc_get_file_size (void __iomem *base); +u32 mtk_jpeg_enc_enum_result (void __iomem *base,u32 irq_status, +u32 *file_size); +void mtk_jpeg_enc_start (void __iomem *enc_reg_base); +void mtk_jpeg_enc_set_config (void __iomem *base, +struct mtk_jpeg_enc_param *config, +struct mtk_jpeg_enc_bs *bs, +struct mtk_jpeg_enc_fb *fb); +#endif /* _MTK_JPEG_ENC_HW_H */ drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_reg.h new file +49
-0@@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +* Author: Xia Jiang <[email protected]> +* +*/ +#ifndef _MTK_JPEG_ENC_REG_H +#define _MTK_JPEG_ENC_REG_H +#define MTK_JPEG_COMP_MAX 3 + +#define JPEG_DRV_ENC_INT_STATUS_DONE BIT(0) +#define JPEG_DRV_ENC_INT_STATUS_STALL BIT(1) +#define JPEG_DRV_ENC_INT_STATUS_VCODEC_IRQ BIT(4) +#define JPEG_DRV_ENC_INT_STATUS_MASK_ALLIRQ 0x13 + +#define JPGENC_RSTB 0x100 +#define JPGENC_CTRL 0x104 +#define JPGENC_QUALITY 0x108 +#define JPGENC_BLK_NUM 0x10C +#define JPGENC_BLK_CNT 0x110 +#define JPGENC_INT_STS 0x11C +#define JPGENC_DST_ADDR0 0x120 +#define JPGENC_DMA_ADDR0 0x124 +#define JPGENC_STALL_ADDR0 0x128 +#define JPGENC_OFFSET_ADDR 0x138 +#define JPGENC_RST_MCU_NUM 0x150 +#define JPGENC_IMG_SIZE 0x154 +#define JPGENC_DEBUG_INFO0 0x160 +#define JPGENC_DEBUG_INFO1 0x164 +#define JPGENC_TOTAL_CYCLE 0x168 +#define JPGENC_BYTE_OFFSET_MASK 0x16C +#define JPGENC_SRC_LUMA_ADDR 0x170 +#define JPGENC_SRC_CHROMA_ADDR 0x174 +#define JPGENC_STRIDE 0x178 +#define JPGENC_IMG_STRIDE 0x17C +#define JPGENC_DCM_CTRL 0x300 +#define JPGENC_CODEC_SEL 0x314 +#define JPGENC_ULTRA_THRES 0x318 + +#define JPGENC_FORMAT (x) (((x) & 3) << 3) +#define JPGENC_WIDTH_HEIGHT (w, h) (((w) << 16) | (h)) +#define JPGENC_INIT_OFFSET (x) ((x) & (~0xF)) +#define JPGENC_OFFSET_MASK (x) ((x) & 0xF) +#define JPGENC_DST_ADDR (x) ((x) & (~0xF)) +#define JPGENC_STALL_ADDR (x, y) (((x) + (y)) & (~0xF)) +#define JPGENC_QUALITY_MASK 0xFFFF0000 +#define JPGENC_SET_QUALITY (x, y) (((x) & JPGENC_QUALITY_MASK) | (y)) + +#endif /* _MTK_JPEG_ENC_REG_H */ drivers/media/v4l2-core/v4l2-ctrls.c +1
-0@@ -1010,6 +1010,7 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_JPEG_CHROMA_SUBSAMPLING :return "Chroma Subsampling" ;case V4L2_CID_JPEG_RESTART_INTERVAL :return "Restart Interval" ;case V4L2_CID_JPEG_COMPRESSION_QUALITY :return "Compression Quality" ; +case V4L2_CID_JPEG_ENABLE_EXIF :return "Enable Exif" ;case V4L2_CID_JPEG_ACTIVE_MARKER :return "Active Markers" ;/* Image source controls */ include/uapi/linux/v4l2-controls.h +0
-0
include/uapi/linux/v4l2-controls.h enum v4l2_jpeg_chroma_subsampling { · line 1002
Quoted 5 lines
include/uapi/linux/v4l2-controls.h +2
-0@@ -998,6 +998,8 @@ enum v4l2_jpeg_chroma_subsampling {#define V4L2_JPEG_ACTIVE_MARKER_COM (1 << 16)#define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17)#define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18) +#define V4L2_CID_JPEG_ENABLE_EXIF (V4L2_CID_JPEG_CLASS_BASE + 5) +
Adding V4L2_CID_JPEG_ENABLE_EXIF should be done in a separate patch, and you need to add documentation for this control as well!
Regards,
Hans
Quoted 4 lines
include/uapi/linux/v4l2-controls.h +0
-0/* Image source controls */
PATCH v2 4/5 media: platform: change GPLv2 license to SPDX
In reply to Xia JiangSwitch GPLv2 license to SPDX license.
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h | 9 +-------- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h | 9 +-------- 7 files changed, 7 insertions(+), 56 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +1 -8
@@ -1,17 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * Xia Jiang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/clk.h>
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +1 -8
@@ -1,17 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * Xia Jiang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #ifndef _MTK_JPEG_CORE_H
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +1 -8
@@ -1,16 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/io.h>
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +1 -8
@@ -1,17 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * Xia Jiang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #ifndef _MTK_JPEG_DEC_HW_H
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c +1 -8
@@ -1,16 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #include <linux/kernel.h>
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h +1 -8
@@ -1,16 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #ifndef _MTK_JPEG_PARSE_H
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h +1 -8
@@ -1,16 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. */ #ifndef _MTK_JPEG_REG_H
Signature · 1 line
2.18.0
PATCH v2 5/5 arm: dts: add jpeg enc device tree node
In reply to Xia Jiangadd jpeg enc device tree node
--- arch/arm/boot/dts/mt2701.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/mt2701.dtsi +12 -0
@@ -569,6 +569,18 @@ <&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>; }; + jpegenc: jpegenc@1500a000 { + compatible = "mediatek,mt2701-jpgenc", "mediatek,mtk-jpgenc"; + reg = <0 0x1500a000 0 0x1000>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_LOW>; + clocks = <&imgsys CLK_IMG_VENC>; + clock-names = "jpgenc"; + power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>; + mediatek,larb = <&larb2>; + iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>, + <&iommu MT2701_M4U_PORT_JPGENC_BSDMA>; + }; + vdecsys: syscon@16000000 { compatible = "mediatek,mt2701-vdecsys", "syscon"; reg = <0 0x16000000 0 0x1000>;
Signature · 1 line
2.18.0