Add support for mt2701 JPEG ENC support
Subsystems (3)
v9 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: 74377da4f5f3b63203c599d5dd75db6af91fdbb9, 32 bits, 32-bit time_t
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.7.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
test invalid ioctls: 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 (Not Supported)
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: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------
The JPEG enc log:
------------------------------------------------------------
v4l2-compliance -d /dev/video1
v4l2-compliance SHA: 74377da4f5f3b63203c599d5dd75db6af91fdbb9, 32 bits, 32-bit time_t
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.7.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
test invalid ioctls: 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
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
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: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------
Change compared to v8:
-change commit message of patch 02/18
-use pm_runtime_put() to replace pm_runtime_put_sync() of patch 05/18
-add one patch for deletting the resetting hardware flow in the system PM ops
-use v4l2_m2m_suspend() and v4l2_m2m_resume() to improve the implemention
of the system PM ops. This patch(07/18) depends on [RFC,V4,1/4] media:
v4l2_mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume(https://patchwork.kernel.org/patch/11272917/)
-add one patch for cancelling the last frame handling flow
-add one patch for deletting zeroing the reserved fields
-move changing data type of max/min width/height to patch 10/18
-add one patch for renaming existing functions/defines/variables
Xia Jiang (18):
media: platform: Improve subscribe event flow for bug fixing
media: platform: Improve queue set up flow for bug fixing
media: platform: Improve getting and requesting irq flow for bug
fixing
media: platform: Change the fixed device node number to unfixed value
media: platform: Improve power on and power off flow
media: platform: Delete the resetting hardware flow in the system PM
ops
media: platform: Improve the implementation of the system PM ops
media: platform: Cancel the last frame handling flow
media: platform: Delete zeroing the reserved fields
media: platform: Stylistic changes for improving code quality
media: platform: Use generic rounding helpers
media: platform: Change MTK_JPEG_COMP_MAX macro definition location
media: platform: Delete redundant code and add annotation for an enum
media: dt-bindings: Add jpeg enc device tree node document
arm: dts: mt2701: Add jpeg enc device tree node
media: platform: Rename jpeg dec file name
media: platform: Rename existing functions/defines/variables
media: platform: Add jpeg enc feature
.../bindings/media/mediatek-jpeg-encoder.txt | 37 +
arch/arm/boot/dts/mt2701.dtsi | 13 +
check.txt | 13 +
drivers/media/platform/mtk-jpeg/Makefile | 5 +-
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 1130 ++++++++++++-----
.../media/platform/mtk-jpeg/mtk_jpeg_core.h | 66 +-
.../{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +-
.../{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 14 +-
...{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} | 2 +-
...{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} | 2 +-
.../{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} | 19 +-
.../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 193 +++
.../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 123 ++
13 files changed, 1295 insertions(+), 332 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
create mode 100644 check.txt
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} (98%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (89%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.c => mtk_jpeg_dec_parse.c} (98%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_reg.h => mtk_jpeg_dec_reg.h} (77%)
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.hSignature · 1 line
2.18.0
PATCH v9 1/18 media: platform: Improve subscribe event flow for bug fixing
Let v4l2_ctrl_subscribe_event() do the job for other types except V4L2_EVENT_SOURCE_CHANGE.
---
v9: no changes
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -2
@@ -446,9 +446,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,
Signature · 1 line
2.18.0
PATCH v9 2/18 media: platform: Improve queue set up flow for bug fixing
In reply to Xia JiangAdd checking created buffer size follow in mtk_jpeg_queue_setup().
---
v9: no changes
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +7 -0
@@ -571,6 +571,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];
Signature · 1 line
2.18.0
PATCH v9 3/18 media: platform: Improve getting and requesting irq flow for bug fixing
In reply to Xia JiangDelete platform_get_resource operation for irq.
Return actual value rather than EINVAL when fail to get and request irq.
---
v9: no changes
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -5
@@ -1103,12 +1103,10 @@ static int mtk_jpeg_probe(struct platform_device *pdev)return ret; } - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); dec_irq =platform_get_irq (pdev,0 ); -if (!res || dec_irq <0 ) { +if (dec_irq <0 ) {dev_err (&pdev->dev,"Failed to get dec_irq %d.\n" , dec_irq); - ret = -EINVAL ; -return ret; +return dec_irq; } ret = devm_request_irq(&pdev->dev, dec_irq, mtk_jpeg_dec_irq, 0,
@@ -1116,7 +1114,6 @@ static int mtk_jpeg_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"Failed to request dec_irq %d (%d)\n" , dec_irq, ret); - ret = -EINVAL ; goto err_req_irq; }
Signature · 1 line
2.18.0
PATCH v9 4/18 media: platform: Change the fixed device node number to unfixed value
In reply to Xia JiangThe driver can be instantiated multiple times, e.g. for a decoder and an encoder. Moreover, other drivers could coexist on the same system. This makes the static video node number assignment pointless, so switch to automatic assignment instead.
---
v9: change the commit message
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +1 -1
@@ -1154,7 +1154,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev) jpeg->dec_vdev->device_caps =V4L2_CAP_STREAMING |V4L2_CAP_VIDEO_M2M_MPLANE ; - ret =video_register_device (jpeg->dec_vdev,VFL_TYPE_VIDEO ,3 ); + ret =video_register_device (jpeg->dec_vdev,VFL_TYPE_VIDEO ,-1 );if (ret) {v4l2_err (&jpeg->v4l2_dev,"Failed to register video device\n" ); goto err_dec_vdev_register;
Signature · 1 line
2.18.0
PATCH v9 5/18 media: platform: Improve power on and power off flow
In reply to Xia JiangCall pm_runtime_get_sync() before starting a frame and then pm_runtime_put() after completing it. This can save power for the time between processing two frames.
---
v9: use pm_runtime_put() to replace pm_runtime_put_sync()
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +6 -21
@@ -710,23 +710,6 @@ static struct vb2_v4l2_buffer *mtk_jpeg_buf_remove(struct mtk_jpeg_ctx *ctx,return v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); } -static int mtk_jpeg_start_streaming (struct vb2_queue *q,unsigned int count) -{ -struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q); -struct vb2_v4l2_buffer *vb; -int ret =0 ; - - ret =pm_runtime_get_sync (ctx->jpeg->dev); -if (ret <0 ) - goto err; - -return 0 ; -err: -while ((vb =mtk_jpeg_buf_remove (ctx, q->type))) -v4l2_m2m_buf_done (vb,VB2_BUF_STATE_QUEUED ); -return ret; -} -static void mtk_jpeg_stop_streaming (struct vb2_queue *q) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q);
@@ -751,8 +734,6 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q)while ((vb =mtk_jpeg_buf_remove (ctx, q->type)))v4l2_m2m_buf_done (vb,VB2_BUF_STATE_ERROR ); - -pm_runtime_put_sync (ctx->jpeg->dev); }static const struct vb2_ops mtk_jpeg_qops = {
@@ -761,7 +742,6 @@ static const struct vb2_ops mtk_jpeg_qops = { .buf_queue = mtk_jpeg_buf_queue, .wait_prepare = vb2_ops_wait_prepare, .wait_finish = vb2_ops_wait_finish, - .start_streaming = mtk_jpeg_start_streaming, .stop_streaming = mtk_jpeg_stop_streaming, };
@@ -812,7 +792,7 @@ 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; -int i; +int i, ret; src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);
@@ -832,6 +812,10 @@ static void mtk_jpeg_device_run(void *priv)return ; } + ret =pm_runtime_get_sync (jpeg->dev); +if (ret <0 ) + 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 dec_end;
@@ -957,6 +941,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)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); +pm_runtime_put (ctx->jpeg->dev);return IRQ_HANDLED ; }
Signature · 1 line
2.18.0
PATCH v9 6/18 media: platform: Delete the resetting hardware flow in the system PM ops
In reply to Xia JiangDelete the resetting hardware flow in suspend and resume function because that resetting operation will be done in device_run().
---
v9: new patch
--- check.txt | 13 +++++++++++++ drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 check.txt
check.txt new file +13 -0
@@ -0,0 +1,13 @@ +WARNING:LONG_LINE: line over 80 characters +#820: FILE: ./drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:820: ++ if (mtk_jpeg_set_dec_dst(ctx, &jpeg_src_buf->dec_param, &dst_buf->vb2_buf, &fb)) + +total: 0 errors, 1 warnings, 1271 lines checked + +NOTE: For some of the reported defects, checkpatch may be able to + mechanically convert to the typical style using --fix or --fix-inplace. + +./drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c has style problems, please review. + +NOTE: If any of the errors are false positives, please report + them to the maintainer, see CHECKPATCH in MAINTAINERS.
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +0 -2
@@ -1191,7 +1191,6 @@ 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);mtk_jpeg_clk_off (jpeg);return 0 ;
@@ -1202,7 +1201,6 @@ 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);return 0 ; }
Signature · 1 line
2.18.0
PATCH v9 7/18 media: platform: Improve the implementation of the system PM ops
In reply to Xia JiangAdd v4l2_m2m_suspend() function call in mtk_jpeg_suspend() to make sure that the current frame is processed completely before suspend. Add v4l2_m2m_resume() function call in mtk_jpeg_resume() to unblock the driver from scheduling next frame.
---
v9: use v4l2_m2m_suspend() and v4l2_m2m_resume() to improve the
implemention of the system PM ops
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +6 -0
@@ -1208,10 +1208,13 @@ static __maybe_unused int mtk_jpeg_pm_resume(struct device *dev)static __maybe_unused int mtk_jpeg_suspend (struct device *dev) {int ret; +struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev);if (pm_runtime_suspended (dev))return 0 ; +v4l2_m2m_suspend (jpeg->m2m_dev); + ret =mtk_jpeg_pm_suspend (dev);return ret; }
@@ -1219,12 +1222,15 @@ static __maybe_unused int mtk_jpeg_suspend(struct device *dev)static __maybe_unused int mtk_jpeg_resume (struct device *dev) {int ret; +struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev);if (pm_runtime_suspended (dev))return 0 ; ret =mtk_jpeg_pm_resume (dev); +v4l2_m2m_resume (jpeg->m2m_dev); +return ret; }
Signature · 1 line
2.18.0
PATCH v9 8/18 media: platform: Cancel the last frame handling flow
In reply to Xia JiangThere is no need to queue an empty buffer for signaling a last frame, because all frames are separate from each other in JPEG.
---
v9: new patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +1 -20
@@ -55,15 +55,9 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = {#define MTK_JPEG_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_formats) -enum { -MTK_JPEG_BUF_FLAGS_INIT =0 , -MTK_JPEG_BUF_FLAGS_LAST_FRAME =1 , -}; -struct mtk_jpeg_src_buf {struct vb2_v4l2_buffer b;struct list_head list; -int flags;struct mtk_jpeg_dec_param dec_param; };
@@ -520,8 +514,6 @@ static int mtk_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf) vb =vb2_get_buffer (vq, buf->index); jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (vb); - jpeg_src_buf->flags = (buf->m.planes[0 ].bytesused ==0 ) ? -MTK_JPEG_BUF_FLAGS_LAST_FRAME :MTK_JPEG_BUF_FLAGS_INIT ; end:return v4l2_m2m_qbuf (file, fh->m2m_ctx, buf); }
@@ -676,10 +668,6 @@ static void mtk_jpeg_buf_queue(struct vb2_buffer *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) {
@@ -792,19 +780,12 @@ 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; -int i, ret; +int ret; src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf); -if (jpeg_src_buf->flags &MTK_JPEG_BUF_FLAGS_LAST_FRAME ) { -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; - } -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 ;
Signature · 1 line
2.18.0
PATCH v9 9/18 media: platform: Delete zeroing the reserved fields
In reply to Xia JiangDelete zeroing the reserved fields because that the core already does it.
---
v9: new patch
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +0 -5
@@ -198,7 +198,6 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,struct mtk_jpeg_dev *jpeg = ctx->jpeg;int i; -memset (pix_mp->reserved,0 ,sizeof (pix_mp->reserved)); pix_mp->field =V4L2_FIELD_NONE ;if (ctx->state !=MTK_JPEG_INIT ) {
@@ -217,7 +216,6 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, &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 );
@@ -237,7 +235,6 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,u32 stride = pix_mp->width * fmt->h_sample[i] /4 ;u32 h = pix_mp->height * fmt->v_sample[i] /4 ; -memset (pfmt->reserved,0 ,sizeof (pfmt->reserved)); pfmt->bytesperline = stride; pfmt->sizeimage = stride * h; }
@@ -270,7 +267,6 @@ static int mtk_jpeg_g_fmt_vid_mplane(struct file *file, void *priv, q_data =mtk_jpeg_get_q_data (ctx, f->type); -memset (pix_mp->reserved,0 ,sizeof (pix_mp->reserved)); pix_mp->width = q_data->w; pix_mp->height = q_data->h; pix_mp->field =V4L2_FIELD_NONE ;
@@ -294,7 +290,6 @@ static int mtk_jpeg_g_fmt_vid_mplane(struct file *file, void *priv, pfmt->bytesperline = q_data->bytesperline[i]; pfmt->sizeimage = q_data->sizeimage[i]; -memset (pfmt->reserved,0 ,sizeof (pfmt->reserved)); v4l2_dbg(1, debug, &jpeg->v4l2_dev, "plane[%d] bpl=%u, size=%u\n",
Signature · 1 line
2.18.0
PATCH v9 10/18 media: platform: Stylistic changes for improving code quality
In reply to Xia JiangChange register offset hex numerals from uppercase to lowercase. Change data type of max/min width/height from integer to unsigned integer.
---
v9: move changing data type of max/min width/height to this patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++++---- drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +4 -4
@@ -21,10 +21,10 @@#define MTK_JPEG_FMT_TYPE_OUTPUT 1#define MTK_JPEG_FMT_TYPE_CAPTURE 2 -#define MTK_JPEG_MIN_WIDTH 32 -#define MTK_JPEG_MIN_HEIGHT 32 -#define MTK_JPEG_MAX_WIDTH 8192 -#define MTK_JPEG_MAX_HEIGHT 8192 +#define MTK_JPEG_MIN_WIDTH 32U +#define MTK_JPEG_MIN_HEIGHT 32U +#define MTK_JPEG_MAX_WIDTH 8192U +#define MTK_JPEG_MAX_HEIGHT 8192U#define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024)
drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h +9 -9
@@ -20,29 +20,29 @@#define BIT_INQST_MASK_ALLIRQ 0x37#define JPGDEC_REG_RESET 0x0090 -#define JPGDEC_REG_BRZ_FACTOR 0x00F8 -#define JPGDEC_REG_DU_NUM 0x00FC +#define JPGDEC_REG_BRZ_FACTOR 0x00f8 +#define JPGDEC_REG_DU_NUM 0x00fc#define JPGDEC_REG_DEST_ADDR0_Y 0x0140#define JPGDEC_REG_DEST_ADDR0_U 0x0144#define JPGDEC_REG_DEST_ADDR0_V 0x0148 -#define JPGDEC_REG_DEST_ADDR1_Y 0x014C +#define JPGDEC_REG_DEST_ADDR1_Y 0x014c#define JPGDEC_REG_DEST_ADDR1_U 0x0150#define JPGDEC_REG_DEST_ADDR1_V 0x0154#define JPGDEC_REG_STRIDE_Y 0x0158 -#define JPGDEC_REG_STRIDE_UV 0x015C +#define JPGDEC_REG_STRIDE_UV 0x015c#define JPGDEC_REG_IMG_STRIDE_Y 0x0160#define JPGDEC_REG_IMG_STRIDE_UV 0x0164 -#define JPGDEC_REG_WDMA_CTRL 0x016C +#define JPGDEC_REG_WDMA_CTRL 0x016c#define JPGDEC_REG_PAUSE_MCU_NUM 0x0170 -#define JPGDEC_REG_OPERATION_MODE 0x017C +#define JPGDEC_REG_OPERATION_MODE 0x017c#define JPGDEC_REG_FILE_ADDR 0x0200 -#define JPGDEC_REG_COMP_ID 0x020C +#define JPGDEC_REG_COMP_ID 0x020c#define JPGDEC_REG_TOTAL_MCU_NUM 0x0210#define JPGDEC_REG_COMP0_DATA_UNIT_NUM 0x0224 -#define JPGDEC_REG_DU_CTRL 0x023C +#define JPGDEC_REG_DU_CTRL 0x023c#define JPGDEC_REG_TRIG 0x0240#define JPGDEC_REG_FILE_BRP 0x0248 -#define JPGDEC_REG_FILE_TOTAL_SIZE 0x024C +#define JPGDEC_REG_FILE_TOTAL_SIZE 0x024c#define JPGDEC_REG_QT_ID 0x0270#define JPGDEC_REG_INTERRUPT_STATUS 0x0274#define JPGDEC_REG_STATUS 0x0278
Signature · 1 line
2.18.0
PATCH v9 11/18 media: platform: Use generic rounding helpers
In reply to Xia JiangUse clamp() to replace mtk_jpeg_bound_align_image() and round() to replace mtk_jpeg_align().
---
v9: change the patch title description
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 41 +++++-------------- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c | 8 ++-- drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h | 5 --- 3 files changed, 15 insertions(+), 39 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +11 -30
@@ -151,25 +151,6 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx,return NULL ; } -static void mtk_jpeg_bound_align_image (u32 *w,unsigned int wmin, -unsigned int wmax,unsigned int walign, -u32 *h,unsigned int hmin, -unsigned int hmax,unsigned int halign) -{ -int width, height, w_step, h_step; - - width = *w; - height = *h; - w_step =1 << walign; - h_step =1 << halign; - -v4l_bound_align_image (w, wmin, wmax, walign, h, hmin, hmax, halign,0 ); -if (*w < width && (*w + w_step) <= wmax) - *w += w_step; -if (*h < height && (*h + h_step) <= hmax) - *h += h_step; -} -static void mtk_jpeg_adjust_fmt_mplane (struct mtk_jpeg_ctx *ctx,struct v4l2_format *f) {
@@ -211,24 +192,24 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,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 ); + 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 ); pfmt->bytesperline =0 ;/* Source size must be aligned to 128 */ - pfmt->sizeimage =mtk_jpeg_align (pfmt->sizeimage,128 ); + pfmt->sizeimage =round_up (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); + pix_mp->height =clamp (round_up (pix_mp->height, fmt->v_align), +MTK_JPEG_MIN_HEIGHT ,MTK_JPEG_MAX_HEIGHT ); + pix_mp->width =clamp (round_up (pix_mp->width, fmt->h_align), +MTK_JPEG_MIN_WIDTH ,MTK_JPEG_MAX_WIDTH );for (i =0 ; i < fmt->colplanes; i++) {struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[i];
@@ -734,8 +715,8 @@ static void mtk_jpeg_set_dec_src(struct mtk_jpeg_ctx *ctx, { bs->str_addr =vb2_dma_contig_plane_dma_addr (src_buf,0 ); bs->end_addr = bs->str_addr + -mtk_jpeg_align (vb2_get_plane_payload (src_buf,0 ),16 ); - bs->size =mtk_jpeg_align (vb2_plane_size (src_buf,0 ),128 ); +round_up (vb2_get_plane_payload (src_buf,0 ),16 ); + bs->size =round_up (vb2_plane_size (src_buf,0 ),128 ); } static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx,
drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c +4 -4
@@ -153,10 +153,10 @@ static int mtk_jpeg_calc_dst_size(struct mtk_jpeg_dec_param *param) param->sampling_w[i];/* output format is 420/422 */ param->comp_w[i] = padding_w >> brz_w[i]; - param->comp_w[i] =mtk_jpeg_align (param->comp_w[i], -MTK_JPEG_DCTSIZE ); - param->img_stride[i] = i ?mtk_jpeg_align (param->comp_w[i],16 ) - :mtk_jpeg_align (param->comp_w[i],32 ); + param->comp_w[i] =round_up (param->comp_w[i], +MTK_JPEG_DCTSIZE ); + param->img_stride[i] = i ?round_up (param->comp_w[i],16 ) + :round_up (param->comp_w[i],32 ); ds_row_h[i] = (MTK_JPEG_DCTSIZE * param->sampling_h[i]); } param->dec_w = param->img_stride[0 ];
drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h +0 -5
@@ -54,11 +54,6 @@ struct mtk_jpeg_dec_param {u8 uv_brz_w; }; -static inline u32 mtk_jpeg_align (u32 val,u32 align) -{ -return (val + align -1 ) & ~(align -1 ); -} -struct mtk_jpeg_bs {dma_addr_t str_addr;dma_addr_t end_addr;
Signature · 1 line
2.18.0
PATCH v9 12/18 media: platform: Change MTK_JPEG_COMP_MAX macro definition location
In reply to Xia JiangMove MTK_JPEG_COMP_MAX definition to mtk_jpeg_core.h file, because it is used by mtk_jpeg_core.c file.
---
v9: no changes
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 2 ++ drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +2 -0
@@ -15,6 +15,8 @@#define MTK_JPEG_NAME "mtk-jpeg" +#define MTK_JPEG_COMP_MAX 3 +#define MTK_JPEG_FMT_FLAG_DEC_OUTPUT BIT(0)#define MTK_JPEG_FMT_FLAG_DEC_CAPTURE BIT(1)
drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h +0 -1
@@ -8,7 +8,6 @@#ifndef _MTK_JPEG_REG_H#define _MTK_JPEG_REG_H -#define MTK_JPEG_COMP_MAX 3#define MTK_JPEG_BLOCK_MAX 10#define MTK_JPEG_DCTSIZE 8
Signature · 1 line
2.18.0
PATCH v9 13/18 media: platform: Delete redundant code and add annotation for an enum
In reply to Xia JiangDelete unused member variables annotation.
Delete unused variable definition.
Delete redundant log print, because V4L2 debug logs already print it. Add annotation for enum mtk_jpeg_ctx_state.
---
v9: add annotation for enum mtk_jpeg_ctx_state
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 15 ++------------- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++++++-- 2 files changed, 8 insertions(+), 15 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -13
@@ -176,14 +176,13 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, struct mtk_jpeg_ctx *ctx, int q_type) {struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; -struct mtk_jpeg_dev *jpeg = ctx->jpeg;int i; pix_mp->field =V4L2_FIELD_NONE ;if (ctx->state !=MTK_JPEG_INIT ) {mtk_jpeg_adjust_fmt_mplane (ctx, f); - goto end; +return 0 ; } pix_mp->num_planes = fmt->colplanes;
@@ -202,7 +201,7 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, pfmt->sizeimage =round_up (pfmt->sizeimage,128 );if (pfmt->sizeimage ==0 ) pfmt->sizeimage =MTK_JPEG_DEFAULT_SIZEIMAGE ; - goto end; +return 0 ; }/* type is MTK_JPEG_FMT_TYPE_CAPTURE */
@@ -219,16 +218,6 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f, pfmt->bytesperline = stride; pfmt->sizeimage = stride * h; } -end: -v4l2_dbg (2 , debug, &jpeg->v4l2_dev,"wxh:%ux%u\n" , - pix_mp->width, pix_mp->height); -for (i =0 ; i < pix_mp->num_planes; i++) { -v4l2_dbg (2 , debug, &jpeg->v4l2_dev, -"plane[%d] bpl=%u, size=%u\n" , - i, - pix_mp->plane_fmt[i].bytesperline, - pix_mp->plane_fmt[i].sizeimage); - }return 0 ; }
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +6 -2
@@ -30,6 +30,12 @@#define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024) +/** +* enum mtk_jpeg_ctx_state - states of the context state machine +* @MTK_JPEG_INIT: current state is initialized +* @MTK_JPEG_RUNNING: current state is running +* @MTK_JPEG_SOURCE_CHANGE: current state is source resolution change +*/ enum mtk_jpeg_ctx_state {MTK_JPEG_INIT =0 ,MTK_JPEG_RUNNING ,
@@ -109,9 +115,7 @@ struct mtk_jpeg_q_data {* @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 * @colorspace: enum v4l2_colorspace; supplemental to pixelformat * @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding * @quantization: enum v4l2_quantization, colorspace quantization
Signature · 1 line
2.18.0
PATCH v9 14/18 media: dt-bindings: Add jpeg enc device tree node document
In reply to Xia JiangAdd jpeg enc device tree node document.
---
v9: no changes
--- .../bindings/media/mediatek-jpeg-encoder.txt | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +37 -0
@@ -0,0 +1,37 @@ +* MediaTek JPEG Encoder + +MediaTek JPEG Encoder is the JPEG encode hardware present in MediaTek SoCs + +Required properties: +- compatible : should be one of: + "mediatek,mt2701-jpgenc" + ... + followed by "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,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>; + };
Signature · 1 line
2.18.0
PATCH v9 15/18 arm: dts: mt2701: Add jpeg enc device tree node
In reply to Xia JiangAdd jpeg enc device tree node.
---
v9: add "mt2701" in the title description
--- arch/arm/boot/dts/mt2701.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm/boot/dts/mt2701.dtsi +13 -0
@@ -568,6 +568,19 @@ <&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
PATCH v9 16/18 media: platform: Rename jpeg dec file name
In reply to Xia JiangRename the files which are for decode feature. This is preparing path since the jpeg enc patch will be added later.
---
v9: no changes
---
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} (98%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_parse.h => mtk_jpeg_dec_parse.h} (92%)
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,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -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
@@ -23,9 +23,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
@@ -9,7 +9,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
@@ -11,7 +11,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
@@ -8,7 +8,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
@@ -8,7 +8,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 v9 17/18 media: platform: Rename existing functions/defines/variables
In reply to Xia JiangRename existing funcitons/defines/variables with a _dec prefix and without dec_ prefix to prepare for the addition of the jpeg encoder feature.
---
v9: new patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 196 +++++++++--------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 +- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 7 +- 3 files changed, 107 insertions(+), 104 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +99 -97
@@ -27,7 +27,7 @@#include "mtk_jpeg_core.h" #include "mtk_jpeg_dec_parse.h" -static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { +static struct mtk_jpeg_fmt mtk_jpeg_dec_formats[] = { { .fourcc =V4L2_PIX_FMT_JPEG , .colplanes =1 ,
@@ -53,7 +53,7 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { }, }; -#define MTK_JPEG_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_formats) +#define MTK_JPEG_DEC_NUM_FORMATS ARRAY_SIZE(mtk_jpeg_dec_formats)struct mtk_jpeg_src_buf {struct vb2_v4l2_buffer b;
@@ -75,12 +75,12 @@ static inline struct mtk_jpeg_src_buf *mtk_jpeg_vb2_to_srcbuf( return container_of(to_vb2_v4l2_buffer(vb), struct mtk_jpeg_src_buf, b); } -static int mtk_jpeg_querycap (struct file *file,void *priv, +static int mtk_jpeg_dec_querycap (struct file *file,void *priv,struct v4l2_capability *cap) {struct mtk_jpeg_dev *jpeg =video_drvdata (file); -strscpy (cap->driver,MTK_JPEG_NAME " decoder" ,sizeof (cap->driver)); +strscpy (cap->driver,MTK_JPEG_NAME ,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));
@@ -109,22 +109,23 @@ static int mtk_jpeg_enum_fmt(struct mtk_jpeg_fmt *mtk_jpeg_formats, int n,return 0 ; } -static int mtk_jpeg_enum_fmt_vid_cap (struct file *file,void *priv, -struct v4l2_fmtdesc *f) +static int mtk_jpeg_dec_enum_fmt_vid_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) { -return mtk_jpeg_enum_fmt (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , f, +return mtk_jpeg_enum_fmt (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , f,MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); } -static int mtk_jpeg_enum_fmt_vid_out (struct file *file,void *priv, -struct v4l2_fmtdesc *f) +static int mtk_jpeg_dec_enum_fmt_vid_out (struct file *file,void *priv, +struct v4l2_fmtdesc *f) { -return mtk_jpeg_enum_fmt (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , f, -MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); +return mtk_jpeg_enum_fmt (mtk_jpeg_dec_formats,MTK_JPEG_DEC_NUM_FORMATS , + f,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;
@@ -141,8 +142,8 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx, 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]; +for (k =0 ; k <MTK_JPEG_DEC_NUM_FORMATS ; k++) { +struct mtk_jpeg_fmt *fmt = &mtk_jpeg_dec_formats[k];if (fmt->fourcc == pixelformat && fmt->flags & fmt_flag)return fmt;
@@ -270,8 +271,8 @@ static int mtk_jpeg_g_fmt_vid_mplane(struct file *file, void *priv,return 0 ; } -static int mtk_jpeg_try_fmt_vid_cap_mplane (struct file *file,void *priv, -struct v4l2_format *f) +static int mtk_jpeg_dec_try_fmt_vid_cap_mplane (struct file *file,void *priv, +struct v4l2_format *f) {struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt;
@@ -291,8 +292,8 @@ static int mtk_jpeg_try_fmt_vid_cap_mplane(struct file *file, void *priv,return mtk_jpeg_try_fmt_mplane (f, fmt, ctx,MTK_JPEG_FMT_TYPE_CAPTURE ); } -static int mtk_jpeg_try_fmt_vid_out_mplane (struct file *file,void *priv, -struct v4l2_format *f) +static int mtk_jpeg_dec_try_fmt_vid_out_mplane (struct file *file,void *priv, +struct v4l2_format *f) {struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt;
@@ -364,24 +365,24 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx,return 0 ; } -static int mtk_jpeg_s_fmt_vid_out_mplane (struct file *file,void *priv, -struct v4l2_format *f) +static int mtk_jpeg_dec_s_fmt_vid_out_mplane (struct file *file,void *priv, +struct v4l2_format *f) {int ret; - ret =mtk_jpeg_try_fmt_vid_out_mplane (file, priv, f); + ret =mtk_jpeg_dec_try_fmt_vid_out_mplane (file, priv, f);if (ret)return ret;return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f); } -static int mtk_jpeg_s_fmt_vid_cap_mplane (struct file *file,void *priv, -struct v4l2_format *f) +static int mtk_jpeg_dec_s_fmt_vid_cap_mplane (struct file *file,void *priv, +struct v4l2_format *f) {int ret; - ret =mtk_jpeg_try_fmt_vid_cap_mplane (file, priv, f); + ret =mtk_jpeg_dec_try_fmt_vid_cap_mplane (file, priv, f);if (ret)return ret;
@@ -410,8 +411,8 @@ static int mtk_jpeg_subscribe_event(struct v4l2_fh *fh,return v4l2_ctrl_subscribe_event (fh, sub); } -static int mtk_jpeg_g_selection (struct file *file,void *priv, -struct v4l2_selection *s) +static int mtk_jpeg_dec_g_selection (struct file *file,void *priv, +struct v4l2_selection *s) {struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);
@@ -439,8 +440,8 @@ static int mtk_jpeg_g_selection(struct file *file, void *priv,return 0 ; } -static int mtk_jpeg_s_selection (struct file *file,void *priv, -struct v4l2_selection *s) +static int mtk_jpeg_dec_s_selection (struct file *file,void *priv, +struct v4l2_selection *s) {struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);
@@ -483,20 +484,20 @@ static int mtk_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)return v4l2_m2m_qbuf (file, fh->m2m_ctx, buf); } -static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = { - .vidioc_querycap = mtk_jpeg_querycap, - .vidioc_enum_fmt_vid_cap = mtk_jpeg_enum_fmt_vid_cap, - .vidioc_enum_fmt_vid_out = mtk_jpeg_enum_fmt_vid_out, - .vidioc_try_fmt_vid_cap_mplane = mtk_jpeg_try_fmt_vid_cap_mplane, - .vidioc_try_fmt_vid_out_mplane = mtk_jpeg_try_fmt_vid_out_mplane, +static const struct v4l2_ioctl_ops mtk_jpeg_dec_ioctl_ops = { + .vidioc_querycap = mtk_jpeg_dec_querycap, + .vidioc_enum_fmt_vid_cap = mtk_jpeg_dec_enum_fmt_vid_cap, + .vidioc_enum_fmt_vid_out = mtk_jpeg_dec_enum_fmt_vid_out, + .vidioc_try_fmt_vid_cap_mplane = mtk_jpeg_dec_try_fmt_vid_cap_mplane, + .vidioc_try_fmt_vid_out_mplane = mtk_jpeg_dec_try_fmt_vid_out_mplane, .vidioc_g_fmt_vid_cap_mplane = mtk_jpeg_g_fmt_vid_mplane, .vidioc_g_fmt_vid_out_mplane = mtk_jpeg_g_fmt_vid_mplane, - .vidioc_s_fmt_vid_cap_mplane = mtk_jpeg_s_fmt_vid_cap_mplane, - .vidioc_s_fmt_vid_out_mplane = mtk_jpeg_s_fmt_vid_out_mplane, + .vidioc_s_fmt_vid_cap_mplane = mtk_jpeg_dec_s_fmt_vid_cap_mplane, + .vidioc_s_fmt_vid_out_mplane = mtk_jpeg_dec_s_fmt_vid_out_mplane, .vidioc_qbuf = mtk_jpeg_qbuf, .vidioc_subscribe_event = mtk_jpeg_subscribe_event, - .vidioc_g_selection = mtk_jpeg_g_selection, - .vidioc_s_selection = mtk_jpeg_s_selection, + .vidioc_g_selection = mtk_jpeg_dec_g_selection, + .vidioc_s_selection = mtk_jpeg_dec_s_selection, .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
@@ -615,7 +616,7 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx, param->dec_w, param->dec_h); } -static void mtk_jpeg_buf_queue (struct vb2_buffer *vb) +static void mtk_jpeg_dec_buf_queue (struct vb2_buffer *vb) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (vb->vb2_queue);struct mtk_jpeg_dec_param *param;
@@ -663,7 +664,7 @@ static struct vb2_v4l2_buffer *mtk_jpeg_buf_remove(struct mtk_jpeg_ctx *ctx,return v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); } -static void mtk_jpeg_stop_streaming (struct vb2_queue *q) +static void mtk_jpeg_dec_stop_streaming (struct vb2_queue *q) {struct mtk_jpeg_ctx *ctx =vb2_get_drv_priv (q);struct vb2_v4l2_buffer *vb;
@@ -689,13 +690,13 @@ static void mtk_jpeg_stop_streaming(struct vb2_queue *q)v4l2_m2m_buf_done (vb,VB2_BUF_STATE_ERROR ); } -static const struct vb2_ops mtk_jpeg_qops = { +static const struct vb2_ops mtk_jpeg_dec_qops = { .queue_setup = mtk_jpeg_queue_setup, .buf_prepare = mtk_jpeg_buf_prepare, - .buf_queue = mtk_jpeg_buf_queue, + .buf_queue = mtk_jpeg_dec_buf_queue, .wait_prepare = vb2_ops_wait_prepare, .wait_finish = vb2_ops_wait_finish, - .stop_streaming = mtk_jpeg_stop_streaming, + .stop_streaming = mtk_jpeg_dec_stop_streaming, }; static void mtk_jpeg_set_dec_src(struct mtk_jpeg_ctx *ctx,
@@ -735,7 +736,7 @@ static int mtk_jpeg_set_dec_dst(struct mtk_jpeg_ctx *ctx,return 0 ; } -static void mtk_jpeg_device_run (void *priv) +static void mtk_jpeg_dec_device_run (void *priv) {struct mtk_jpeg_ctx *ctx = priv;struct mtk_jpeg_dev *jpeg = ctx->jpeg;
@@ -763,15 +764,16 @@ static void mtk_jpeg_device_run(void *priv) 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)) +if (mtk_jpeg_set_dec_dst (ctx, &jpeg_src_buf->dec_param, + &dst_buf->vb2_buf, &fb)) goto dec_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, +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 ;
@@ -783,19 +785,19 @@ static void mtk_jpeg_device_run(void *priv)v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); } -static int mtk_jpeg_job_ready (void *priv) +static int mtk_jpeg_dec_job_ready (void *priv) {struct mtk_jpeg_ctx *ctx = priv;return (ctx->state ==MTK_JPEG_RUNNING ) ?1 :0 ; } -static const struct v4l2_m2m_ops mtk_jpeg_m2m_ops = { - .device_run = mtk_jpeg_device_run, - .job_ready = mtk_jpeg_job_ready, +static const struct v4l2_m2m_ops mtk_jpeg_dec_m2m_ops = { + .device_run = mtk_jpeg_dec_device_run, + .job_ready = mtk_jpeg_dec_job_ready, }; -static int mtk_jpeg_queue_init (void *priv,struct vb2_queue *src_vq, +static int mtk_jpeg_dec_queue_init (void *priv,struct vb2_queue *src_vq,struct vb2_queue *dst_vq) {struct mtk_jpeg_ctx *ctx = priv;
@@ -805,7 +807,7 @@ static int mtk_jpeg_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->io_modes =VB2_DMABUF |VB2_MMAP ; src_vq->drv_priv = ctx; src_vq->buf_struct_size =sizeof (struct mtk_jpeg_src_buf ); - src_vq->ops = &mtk_jpeg_qops; + src_vq->ops = &mtk_jpeg_dec_qops; src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_COPY ; src_vq->lock = &ctx->jpeg->lock;
@@ -818,7 +820,7 @@ static int mtk_jpeg_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->io_modes =VB2_DMABUF |VB2_MMAP ; dst_vq->drv_priv = ctx; dst_vq->buf_struct_size =sizeof (struct v4l2_m2m_buffer ); - dst_vq->ops = &mtk_jpeg_qops; + dst_vq->ops = &mtk_jpeg_dec_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_COPY ; dst_vq->lock = &ctx->jpeg->lock;
@@ -857,7 +859,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)u32 dec_ret;int i; - dec_ret =mtk_jpeg_dec_get_int_status (jpeg->dec_reg_base); + dec_ret =mtk_jpeg_dec_get_int_status (jpeg->reg_base); dec_irq_ret =mtk_jpeg_dec_enum_result (dec_ret); ctx =v4l2_m2m_get_curr_priv (jpeg->m2m_dev);if (!ctx) {
@@ -870,7 +872,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv) 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); +mtk_jpeg_dec_reset (jpeg->reg_base);if (dec_irq_ret !=MTK_JPEG_DEC_RESULT_EOF_DONE ) {dev_err (jpeg->dev,"decode failed\n" );
@@ -891,7 +893,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)return IRQ_HANDLED ; } -static void mtk_jpeg_set_default_params (struct mtk_jpeg_ctx *ctx) +static void mtk_jpeg_set_dec_default_params (struct mtk_jpeg_ctx *ctx) {struct mtk_jpeg_q_data *q = &ctx->out_q;int i;
@@ -923,7 +925,7 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) } } -static int mtk_jpeg_open (struct file *file) +static int mtk_jpeg_dec_open (struct file *file) {struct mtk_jpeg_dev *jpeg =video_drvdata (file);struct video_device *vfd =video_devdata (file);
@@ -945,13 +947,13 @@ static int mtk_jpeg_open(struct file *file) ctx->jpeg = jpeg; ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (jpeg->m2m_dev, ctx, - mtk_jpeg_queue_init); + mtk_jpeg_dec_queue_init);if (IS_ERR (ctx->fh.m2m_ctx)) { ret =PTR_ERR (ctx->fh.m2m_ctx); goto error; } -mtk_jpeg_set_default_params (ctx); +mtk_jpeg_set_dec_default_params (ctx);mutex_unlock (&jpeg->lock);return 0 ;
@@ -978,9 +980,9 @@ static int mtk_jpeg_release(struct file *file)return 0 ; } -static const struct v4l2_file_operations mtk_jpeg_fops = { +static const struct v4l2_file_operations mtk_jpeg_dec_fops = { .owner =THIS_MODULE , - .open = mtk_jpeg_open, + .open = mtk_jpeg_dec_open, .release = mtk_jpeg_release, .poll = v4l2_m2m_fop_poll, .unlocked_ioctl = video_ioctl2,
@@ -1016,7 +1018,7 @@ 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 );
@@ -1028,23 +1030,23 @@ static int mtk_jpeg_probe(struct platform_device *pdev) jpeg->dev = &pdev->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; } - dec_irq =platform_get_irq (pdev,0 ); -if (dec_irq <0 ) { -dev_err (&pdev->dev,"Failed to get dec_irq %d.\n" , dec_irq); -return dec_irq; + 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_dec_irq,0 , pdev->name, jpeg);if (ret) { -dev_err (&pdev->dev,"Failed to request dec_irq %d (%d)\n" , - dec_irq, ret); +dev_err (&pdev->dev,"Failed to request jpeg_irq %d (%d)\n" , + jpeg_irq, ret); goto err_req_irq; }
@@ -1061,40 +1063,40 @@ static int mtk_jpeg_probe(struct platform_device *pdev) goto err_dev_register; } - jpeg->m2m_dev =v4l2_m2m_init (&mtk_jpeg_m2m_ops); + jpeg->m2m_dev =v4l2_m2m_init (&mtk_jpeg_dec_m2m_ops);if (IS_ERR (jpeg->m2m_dev)) {v4l2_err (&jpeg->v4l2_dev,"Failed to init mem2mem device\n" ); ret =PTR_ERR (jpeg->m2m_dev); goto err_m2m_init; } - jpeg->dec_vdev =video_device_alloc (); -if (!jpeg->dec_vdev) { + jpeg->vdev =video_device_alloc (); +if (!jpeg->vdev) { ret = -ENOMEM ; - goto err_dec_vdev_alloc; + goto err_vfd_jpeg_alloc; } -snprintf (jpeg->dec_vdev->name,sizeof (jpeg->dec_vdev->name), +snprintf (jpeg->vdev->name,sizeof (jpeg->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 | + jpeg->vdev->fops = &mtk_jpeg_dec_fops; + jpeg->vdev->ioctl_ops = &mtk_jpeg_dec_ioctl_ops; + jpeg->vdev->minor =-1 ; + jpeg->vdev->release = video_device_release; + jpeg->vdev->lock = &jpeg->lock; + jpeg->vdev->v4l2_dev = &jpeg->v4l2_dev; + jpeg->vdev->vfl_dir =VFL_DIR_M2M ; + jpeg->vdev->device_caps =V4L2_CAP_STREAMING |V4L2_CAP_VIDEO_M2M_MPLANE ; - ret =video_register_device (jpeg->dec_vdev,VFL_TYPE_VIDEO ,-1 ); + ret =video_register_device (jpeg->vdev,VFL_TYPE_VIDEO ,-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->vdev, 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->vdev->num,VIDEO_MAJOR , jpeg->vdev->minor);platform_set_drvdata (pdev, jpeg);
@@ -1102,10 +1104,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->vdev); -err_dec_vdev_alloc: +err_vfd_jpeg_alloc:v4l2_m2m_release (jpeg->m2m_dev); err_m2m_init:
@@ -1125,8 +1127,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->vdev); +video_device_release (jpeg->vdev);v4l2_m2m_release (jpeg->m2m_dev);v4l2_device_unregister (&jpeg->v4l2_dev);
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +4 -4
@@ -51,8 +51,8 @@ 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 +* @vdev: video device node for jpeg mem2mem mode +* @reg_base: JPEG registers mapping * @clk_jdec: JPEG hw working clock * @clk_jdec_smi: JPEG SMI bus clock * @larb: SMI device
@@ -65,8 +65,8 @@ 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 video_device *vdev; +void __iomem *reg_base;struct clk *clk_jdec;struct clk *clk_jdec_smi;struct device *larb;
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +4 -3
@@ -3,10 +3,11 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> */ -#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>
@@ -75,4 +76,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 */
Signature · 1 line
2.18.0
PATCH v9 18/18 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.
---
v9: add member variable(struct v4l2_rect) in out_q structure for storing
the active crop information.
move the renaming exsting functions/defines/variables to a separate patch.
--- drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 845 +++++++++++++++--- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 44 +- .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 193 ++++ .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 123 +++ 5 files changed, 1084 insertions(+), 126 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
drivers/media/platform/mtk-jpeg/Makefile +4 -1
@@ -1,3 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -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 +729 -116
1,171 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +35 -9
113 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c new file +193 -0
193 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
2.18.0