Add support for mt2701 JPEG ENC support
Subsystems (3)
v10 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: 697ae940b60a172ef31948dd74316fe9de365b7e, 32 bits, 32-bit time_t
Compliance test for mtk-jpeg-dec device /dev/video0:
Driver Info:
Driver name : mtk-jpeg-dec
Card type : mtk-jpeg-dec
Bus info : platform:15004000.jpegdec
Driver version : 5.8.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-dec device /dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------
The JPEG enc log:
------------------------------------------------------------
v4l2-compliance -d /dev/video1
v4l2-compliance SHA: 697ae940b60a172ef31948dd74316fe9de365b7e, 32 bits, 32-bit time_t
Compliance test for mtk-jpeg-enc device /dev/video1:
Driver Info:
Driver name : mtk-jpeg-enc
Card type : mtk-jpeg-enc
Bus info : platform:1500a000.jpegenc
Driver version : 5.8.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-enc device /dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------
Change compared to v9:
- use pm_runtime_force_*()helpers of patch 07/28
- add one patch for handling jpeg hardware's locking up
- delete mtk_jpeg_qbuf() in patch 09/28
- add one patch for deletting vidioc_s_selection ioctl of jpeg dec
- add one patch for changing the maximum width and height supported by jpeg dec
- add one patch for refactoring mtk_jpeg_try_fmt_mplane function
- add one patch for refactoring mtk_jpeg_find_format function
- add one patch for redefinition of mtk_jpeg_q_data structure
- add one patch for changing the colorspace of jpeg to the fixed value
- add one patch for refactoring mtk_jpeg_set_default_params function
- add one patch for changing the call function of getting/enable/disable the jpeg's clock
- add one patch for using the variant structure to contain the varability between jpeg dec and enc
- return active crop information in mtk_jpeg_enc_g_selection function
- cancel mtk_jpeg_enc_bs structure
- refactor the setting hardware register functions in mtk_jpeg_enc_hw.c
- remove mtk_jpeg_enc_job_ready function
- refactor mtk_jpeg_enc_irq function
- cancel setting up a control handler for jpeg dec
- add the mechanism to ensure that the buffer is enough to hold the EXIF data in .buf_prepare callback
Xia Jiang (28):
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: Add mechanism to handle jpeg hardware's locking up
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: platform: Delete vidioc_s_selection ioctl of jpeg dec
media: platform: Change the maximum width and height supported by JPEG
dec
media: platform: Refactor mtk_jpeg_try_fmt_mplane()
media: platform: Refactor mtk_jpeg_find_format()
media: platform: Redefinition of mtk_jpeg_q_data structure
media: platform: Change the colorspace of jpeg to the fixed value
media: platform: Refactor mtk_jpeg_set_default_params()
media: platform: Change the call functions of getting/enable/disable
the jpeg's clock
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: Using the variant structure to contain the varability
between dec and enc
media: platform: Add jpeg enc feature
.../bindings/media/mediatek-jpeg-encoder.txt | 35 +
arch/arm/boot/dts/mt2701.dtsi | 13 +
drivers/media/platform/mtk-jpeg/Makefile | 5 +-
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 941 ++++++++++++------
.../media/platform/mtk-jpeg/mtk_jpeg_core.h | 108 +-
.../{mtk_jpeg_hw.c => mtk_jpeg_dec_hw.c} | 10 +-
.../{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} | 12 +-
...{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 | 154 +++
.../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 ++
12 files changed, 1009 insertions(+), 383 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} (98%)
rename drivers/media/platform/mtk-jpeg/{mtk_jpeg_hw.h => mtk_jpeg_dec_hw.h} (91%)
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 v10 1/28 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.
---
v10: 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 v10 2/28 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().
---
v10: 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 v10 3/28 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.
---
v10: 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 v10 4/28 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.
---
v10: no changes
--- 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 v10 5/28 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.
---
v10: no changes
--- .../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 · 5 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v10 6/28 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().
---
v10: no changes
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 2 -- 1 file changed, 2 deletions(-)
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 v10 7/28 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.
---
v10: use pm_runtime_force_* helpers
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +8 -10
@@ -1207,24 +1207,22 @@ static __maybe_unused int mtk_jpeg_pm_resume(struct device *dev)static __maybe_unused int mtk_jpeg_suspend (struct device *dev) { -int ret; - -if (pm_runtime_suspended (dev)) -return 0 ; +struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev); - ret =mtk_jpeg_pm_suspend (dev); -return ret; +v4l2_m2m_suspend (jpeg->m2m_dev); +return pm_runtime_force_suspend (dev); }static __maybe_unused int mtk_jpeg_resume (struct device *dev) { +struct mtk_jpeg_dev *jpeg =dev_get_drvdata (dev);int ret; -if (pm_runtime_suspended (dev)) -return 0 ; - - ret =mtk_jpeg_pm_resume (dev); + ret =pm_runtime_force_resume (dev); +if (ret <0 ) +return ret; +v4l2_m2m_resume (jpeg->m2m_dev);return ret; }
Signature · 1 line
2.18.0
PATCH v10 8/28 media: platform: Add mechanism to handle jpeg hardware's locking up
In reply to Xia JiangThere is a delayed work scheduled before starting the hardware and canceled in the interrupt handler. If the delayed work is executed, it resets the hardware and reports the failure to V4L2, so that the execution can continue from next frames.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 25 +++++++++++++++++++ .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 4 +++ 2 files changed, 29 insertions(+)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +25 -0
@@ -816,6 +816,9 @@ static void mtk_jpeg_device_run(void *priv)if (ret <0 ) goto dec_end; +schedule_delayed_work (&jpeg->job_timeout_work, +msecs_to_jiffies (MTK_JPEG_HW_TIMEOUT_MSEC )); +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;
@@ -911,6 +914,8 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)u32 dec_ret;int i; +cancel_delayed_work (&jpeg->job_timeout_work); + 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);
@@ -1066,6 +1071,25 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg)return PTR_ERR_OR_ZERO (jpeg->clk_jdec_smi); } +static void mtk_jpeg_job_timeout_work (struct work_struct *work) +{ + struct mtk_jpeg_dev *jpeg = container_of(work, struct mtk_jpeg_dev, + job_timeout_work.work); +struct mtk_jpeg_ctx *ctx; +struct vb2_v4l2_buffer *src_buf, *dst_buf; + + ctx =v4l2_m2m_get_curr_priv (jpeg->m2m_dev); + src_buf =v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); + dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); + +mtk_jpeg_dec_reset (jpeg->dec_reg_base); + +pm_runtime_put (jpeg->dev); + +v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR ); +v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_ERROR ); +v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); +}static int mtk_jpeg_probe (struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg;
@@ -1080,6 +1104,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)mutex_init (&jpeg->lock);spin_lock_init (&jpeg->hw_lock); jpeg->dev = &pdev->dev; +INIT_DELAYED_WORK (&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); jpeg->dec_reg_base =devm_ioremap_resource (&pdev->dev, res);
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +4 -0
@@ -28,6 +28,8 @@#define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024) +#define MTK_JPEG_HW_TIMEOUT_MSEC 1000 +enum mtk_jpeg_ctx_state {MTK_JPEG_INIT =0 ,MTK_JPEG_RUNNING ,
@@ -48,6 +50,7 @@ enum mtk_jpeg_ctx_state {* @clk_jdec: JPEG hw working clock * @clk_jdec_smi: JPEG SMI bus clock * @larb: SMI device +* @job_timeout_work: IRQ timeout structure */ struct mtk_jpeg_dev {struct mutex lock;
@@ -62,6 +65,7 @@ struct mtk_jpeg_dev {struct clk *clk_jdec;struct clk *clk_jdec_smi;struct device *larb; +struct delayed_work job_timeout_work; };/**
Signature · 1 line
2.18.0
PATCH v10 9/28 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.
---
v10: delete mtk_jpeg_qbuf()
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 46 +------------------ 1 file changed, 2 insertions(+), 44 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -44
@@ -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; };
@@ -501,31 +495,6 @@ static int mtk_jpeg_s_selection(struct file *file, void *priv,return 0 ; } -static int mtk_jpeg_qbuf (struct file *file,void *priv,struct v4l2_buffer *buf) -{ -struct v4l2_fh *fh = file->private_data; -struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); -struct vb2_queue *vq; -struct vb2_buffer *vb; -struct mtk_jpeg_src_buf *jpeg_src_buf; - -if (buf->type !=V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) - goto end; - - vq =v4l2_m2m_get_vq (fh->m2m_ctx, buf->type); -if (buf->index >= vq->num_buffers) { -dev_err (ctx->jpeg->dev,"buffer index out of range\n" ); -return -EINVAL ; - } - - 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); -} -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,
@@ -536,7 +505,7 @@ static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = { .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_qbuf = mtk_jpeg_qbuf, + .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, .vidioc_subscribe_event = mtk_jpeg_subscribe_event, .vidioc_g_selection = mtk_jpeg_g_selection, .vidioc_s_selection = mtk_jpeg_s_selection,
@@ -676,10 +645,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 +757,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 v10 10/28 media: platform: Delete zeroing the reserved fields
In reply to Xia JiangDelete zeroing the reserved fields because that the core already does it.
---
v10: no changes
--- 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 v10 11/28 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.
---
v10: no changes
--- .../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 v10 12/28 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().
---
v10: no changes
--- .../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];
@@ -711,8 +692,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 v10 13/28 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.
---
v10: 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 v10 14/28 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.
---
v10: no changes
--- 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
@@ -32,6 +32,12 @@#define MTK_JPEG_HW_TIMEOUT_MSEC 1000 +/** +* 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 ,
@@ -113,9 +119,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 v10 15/28 media: platform: Delete vidioc_s_selection ioctl of jpeg dec
In reply to Xia JiangJPEG dec does't support setting a compose rectangle, so remove mtk_jpeg_dec_s_selection().
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 22 ------------------- 1 file changed, 22 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +0 -22
@@ -439,27 +439,6 @@ 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) -{ -struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); - -if (s->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE ) -return -EINVAL ; - -switch (s->target) { -case V4L2_SEL_TGT_COMPOSE : - s->r.left =0 ; - s->r.top =0 ; - s->r.width = ctx->out_q.w; - s->r.height = ctx->out_q.h; -break ; -default : -return -EINVAL ; - } -return 0 ; -} -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,
@@ -473,7 +452,6 @@ static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = { .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, .vidioc_subscribe_event = mtk_jpeg_subscribe_event, .vidioc_g_selection = mtk_jpeg_g_selection, - .vidioc_s_selection = mtk_jpeg_s_selection, .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
Signature · 1 line
2.18.0
PATCH v10 16/28 media: platform: Change the maximum width and height supported by JPEG dec
In reply to Xia JiangThe maximum width and height supported by JPEG dec is 65535, so change them from 8192 to 65535.
---
v10: new add patch
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +2 -2
@@ -25,8 +25,8 @@#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_MAX_WIDTH 65535U +#define MTK_JPEG_MAX_HEIGHT 65535U#define MTK_JPEG_DEFAULT_SIZEIMAGE (1 * 1024 * 1024)
Signature · 1 line
2.18.0
PATCH v10 17/28 media: platform: Refactor mtk_jpeg_try_fmt_mplane()
In reply to Xia JiangThe function of mtk_jpeg_adjust_fmt_mplane() equals mtk_jpeg_g_fmt_vid_mplane(), so use mtk_jpeg_g_fmt_vid_mplane() to replace it .
Delete the unused ctx parameter.
Using fourcc to distinguish between different formats is more generic, because that jpeg enc will also use it.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 49 ++++++------------- 1 file changed, 16 insertions(+), 33 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +16 -33
@@ -151,44 +151,17 @@ static struct mtk_jpeg_fmt *mtk_jpeg_find_format(struct mtk_jpeg_ctx *ctx,return NULL ; } -static void mtk_jpeg_adjust_fmt_mplane (struct mtk_jpeg_ctx *ctx, -struct v4l2_format *f) +static int mtk_jpeg_try_fmt_mplane (struct v4l2_pix_format_mplane *pix_mp, +struct mtk_jpeg_fmt *fmt) { -struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; -struct mtk_jpeg_q_data *q_data; -int i; - - q_data =mtk_jpeg_get_q_data (ctx, f->type); - - pix_mp->width = q_data->w; - pix_mp->height = q_data->h; - pix_mp->pixelformat = q_data->fmt->fourcc; - pix_mp->num_planes = q_data->fmt->colplanes; - -for (i =0 ; i < pix_mp->num_planes; i++) { - pix_mp->plane_fmt[i].bytesperline = q_data->bytesperline[i]; - pix_mp->plane_fmt[i].sizeimage = q_data->sizeimage[i]; - } -} - -static int mtk_jpeg_try_fmt_mplane (struct v4l2_format *f, -struct mtk_jpeg_fmt *fmt, -struct mtk_jpeg_ctx *ctx,int q_type) -{ -struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;int i; pix_mp->field =V4L2_FIELD_NONE ; -if (ctx->state !=MTK_JPEG_INIT ) { -mtk_jpeg_adjust_fmt_mplane (ctx, f); -return 0 ; - } - pix_mp->num_planes = fmt->colplanes; pix_mp->pixelformat = fmt->fourcc; -if (q_type ==MTK_JPEG_FMT_TYPE_OUTPUT ) { +if (fmt->fourcc ==V4L2_PIX_FMT_JPEG ) {struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[0 ]; pix_mp->height = clamp(pix_mp->height, MTK_JPEG_MIN_HEIGHT,
@@ -204,7 +177,7 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,return 0 ; } -/* type is MTK_JPEG_FMT_TYPE_CAPTURE */ +/* other fourcc */ 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),
@@ -288,7 +261,12 @@ static int mtk_jpeg_try_fmt_vid_cap_mplane(struct file *file, void *priv, (fmt->fourcc >>16 &0xff ), (fmt->fourcc >> 24 & 0xff)); -return mtk_jpeg_try_fmt_mplane (f, fmt, ctx,MTK_JPEG_FMT_TYPE_CAPTURE ); +if (ctx->state !=MTK_JPEG_INIT ) { +mtk_jpeg_g_fmt_vid_mplane (file, priv, f); +return 0 ; + } + +return mtk_jpeg_try_fmt_mplane (&f->fmt.pix_mp, fmt); } static int mtk_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv,
@@ -309,7 +287,12 @@ static int mtk_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv, (fmt->fourcc >>16 &0xff ), (fmt->fourcc >> 24 & 0xff)); -return mtk_jpeg_try_fmt_mplane (f, fmt, ctx,MTK_JPEG_FMT_TYPE_OUTPUT ); +if (ctx->state !=MTK_JPEG_INIT ) { +mtk_jpeg_g_fmt_vid_mplane (file, priv, f); +return 0 ; + } + +return mtk_jpeg_try_fmt_mplane (&f->fmt.pix_mp, fmt); } static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx,
Signature · 1 line
2.18.0
PATCH v10 18/28 media: platform: Refactor mtk_jpeg_find_format()
In reply to Xia JiangDelete the unused ctx parameter.
Using mtk_jpeg_formats and num_formats parameters is more generic, because that jpeg enc will also use it.
Delete the macro definition of MTK_JPEG_FMT_TYPE_OUTPUT and MTK_JPEG_FMT_TYPE_CAPTURE, because that MTK_JPEG_FMT_FLAG_DEC_OUTPUT and MTK_JPEG_FMT_FLAG_DEC_CAPTURE are enough.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 64 ++++++++++--------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 3 - 2 files changed, 34 insertions(+), 33 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +34 -30
@@ -131,20 +131,17 @@ static struct mtk_jpeg_q_data *mtk_jpeg_get_q_data(struct mtk_jpeg_ctx *ctx,return &ctx->cap_q; } -static struct mtk_jpeg_fmt *mtk_jpeg_find_format (struct mtk_jpeg_ctx *ctx, -u32 pixelformat, -unsigned int fmt_type) +static struct mtk_jpeg_fmt * +mtk_jpeg_find_format (struct mtk_jpeg_fmt *mtk_jpeg_formats,int num_formats, +u32 pixelformat,unsigned int fmt_type) { -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 ; +unsigned int k; +struct mtk_jpeg_fmt *fmt; -for (k =0 ; k <MTK_JPEG_NUM_FORMATS ; k++) { -struct mtk_jpeg_fmt *fmt = &mtk_jpeg_formats[k]; +for (k =0 ; k < num_formats; k++) { + fmt = &mtk_jpeg_formats[k]; -if (fmt->fourcc == pixelformat && fmt->flags & fmt_flag) +if (fmt->fourcc == pixelformat && fmt->flags & fmt_type)return fmt; }
@@ -249,8 +246,9 @@ static int mtk_jpeg_try_fmt_vid_cap_mplane(struct file *file, void *priv,struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (ctx, f->fmt.pix_mp.pixelformat, -MTK_JPEG_FMT_TYPE_CAPTURE ); + fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + f->fmt.pix_mp.pixelformat, +MTK_JPEG_FMT_FLAG_DEC_CAPTURE );if (!fmt) fmt = ctx->cap_q.fmt;
@@ -275,8 +273,9 @@ static int mtk_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv,struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (ctx, f->fmt.pix_mp.pixelformat, -MTK_JPEG_FMT_TYPE_OUTPUT ); + fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + f->fmt.pix_mp.pixelformat, +MTK_JPEG_FMT_FLAG_DEC_OUTPUT );if (!fmt) fmt = ctx->out_q.fmt;
@@ -296,13 +295,12 @@ static int mtk_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv, }static int mtk_jpeg_s_fmt_mplane (struct mtk_jpeg_ctx *ctx, -struct v4l2_format *f) +struct v4l2_format *f,unsigned int fmt_type) {struct vb2_queue *vq;struct mtk_jpeg_q_data *q_data =NULL ;struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;struct mtk_jpeg_dev *jpeg = ctx->jpeg; -unsigned int f_type;int i; vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type);
@@ -316,10 +314,10 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx,return -EBUSY ; } - f_type =V4L2_TYPE_IS_OUTPUT (f->type) ? -MTK_JPEG_FMT_TYPE_OUTPUT :MTK_JPEG_FMT_TYPE_CAPTURE ; - q_data->fmt =mtk_jpeg_find_format (ctx, pix_mp->pixelformat, f_type); + q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats, +MTK_JPEG_NUM_FORMATS , + pix_mp->pixelformat, fmt_type); q_data->w = pix_mp->width; q_data->h = pix_mp->height; ctx->colorspace = pix_mp->colorspace;
@@ -356,7 +354,8 @@ static int mtk_jpeg_s_fmt_vid_out_mplane(struct file *file, void *priv,if (ret)return ret; -return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f); +return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f, +MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); } static int mtk_jpeg_s_fmt_vid_cap_mplane(struct file *file, void *priv,
@@ -368,7 +367,8 @@ static int mtk_jpeg_s_fmt_vid_cap_mplane(struct file *file, void *priv,if (ret)return ret; -return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f); +return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f, +MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); }static void mtk_jpeg_queue_src_chg_event (struct mtk_jpeg_ctx *ctx)
@@ -512,8 +512,9 @@ static bool mtk_jpeg_check_resolution_change(struct mtk_jpeg_ctx *ctx, } q_data = &ctx->cap_q; -if (q_data->fmt !=mtk_jpeg_find_format (ctx, param->dst_fourcc, -MTK_JPEG_FMT_TYPE_CAPTURE )) { +if (q_data->fmt !=mtk_jpeg_find_format (mtk_jpeg_formats, +MTK_JPEG_NUM_FORMATS , param->dst_fourcc, +MTK_JPEG_FMT_FLAG_DEC_CAPTURE )) {v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"format change\n" );return true; }
@@ -534,9 +535,10 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx, q_data = &ctx->cap_q; q_data->w = param->dec_w; q_data->h = param->dec_h; - q_data->fmt =mtk_jpeg_find_format (ctx, + q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats, +MTK_JPEG_NUM_FORMATS , param->dst_fourcc, -MTK_JPEG_FMT_TYPE_CAPTURE ); +MTK_JPEG_FMT_FLAG_DEC_CAPTURE );for (i =0 ; i < q_data->fmt->colplanes; i++) { q_data->bytesperline[i] = param->mem_stride[i];
@@ -844,16 +846,18 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) ctx->quantization =V4L2_QUANTIZATION_DEFAULT ; ctx->xfer_func =V4L2_XFER_FUNC_DEFAULT ; - q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_JPEG , -MTK_JPEG_FMT_TYPE_OUTPUT ); + q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , +V4L2_PIX_FMT_JPEG , +MTK_JPEG_FMT_FLAG_DEC_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 = &ctx->cap_q; - q->fmt =mtk_jpeg_find_format (ctx,V4L2_PIX_FMT_YUV420M , -MTK_JPEG_FMT_TYPE_CAPTURE ); + q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , +V4L2_PIX_FMT_YUV420M , +MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); q->w =MTK_JPEG_MIN_WIDTH ; q->h =MTK_JPEG_MIN_HEIGHT ;
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +0 -3
@@ -20,9 +20,6 @@#define MTK_JPEG_FMT_FLAG_DEC_OUTPUT BIT(0)#define MTK_JPEG_FMT_FLAG_DEC_CAPTURE BIT(1) -#define MTK_JPEG_FMT_TYPE_OUTPUT 1 -#define MTK_JPEG_FMT_TYPE_CAPTURE 2 -#define MTK_JPEG_MIN_WIDTH 32U#define MTK_JPEG_MIN_HEIGHT 32U#define MTK_JPEG_MAX_WIDTH 65535U
Signature · 1 line
2.18.0
PATCH v10 19/28 media: platform: Redefinition of mtk_jpeg_q_data structure
In reply to Xia JiangThe standard v4l2_pix_format_mplane structure contains width/height/ sizeimage/bytesperline, so use v4l2_pix_format_mplane to replace them.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 101 ++++++++++-------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 20 +--- 2 files changed, 57 insertions(+), 64 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +55 -46
@@ -207,15 +207,15 @@ static int mtk_jpeg_g_fmt_vid_mplane(struct file *file, void *priv, q_data =mtk_jpeg_get_q_data (ctx, f->type); - pix_mp->width = q_data->w; - pix_mp->height = q_data->h; + pix_mp->width = q_data->pix_mp.width; + pix_mp->height = q_data->pix_mp.height; pix_mp->field =V4L2_FIELD_NONE ; pix_mp->pixelformat = q_data->fmt->fourcc; pix_mp->num_planes = q_data->fmt->colplanes; - pix_mp->colorspace = ctx->colorspace; - pix_mp->ycbcr_enc = ctx->ycbcr_enc; - pix_mp->xfer_func = ctx->xfer_func; - pix_mp->quantization = ctx->quantization; + pix_mp->colorspace = q_data->pix_mp.colorspace; + pix_mp->ycbcr_enc = q_data->pix_mp.ycbcr_enc; + pix_mp->xfer_func = q_data->pix_mp.xfer_func; + pix_mp->quantization = q_data->pix_mp.quantization; v4l2_dbg(1, debug, &jpeg->v4l2_dev, "(%d) g_fmt:%c%c%c%c wxh:%ux%u\n", f->type,
@@ -228,8 +228,8 @@ static int mtk_jpeg_g_fmt_vid_mplane(struct file *file, void *priv,for (i =0 ; i < pix_mp->num_planes; i++) {struct v4l2_plane_pix_format *pfmt = &pix_mp->plane_fmt[i]; - pfmt->bytesperline = q_data->bytesperline[i]; - pfmt->sizeimage = q_data->sizeimage[i]; + pfmt->bytesperline = q_data->pix_mp.plane_fmt[i].bytesperline; + pfmt->sizeimage = q_data->pix_mp.plane_fmt[i].sizeimage; v4l2_dbg(1, debug, &jpeg->v4l2_dev, "plane[%d] bpl=%u, size=%u\n",
@@ -318,12 +318,12 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx, q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , pix_mp->pixelformat, fmt_type); - q_data->w = pix_mp->width; - q_data->h = pix_mp->height; - ctx->colorspace = pix_mp->colorspace; - ctx->ycbcr_enc = pix_mp->ycbcr_enc; - ctx->xfer_func = pix_mp->xfer_func; - ctx->quantization = pix_mp->quantization; + q_data->pix_mp.width = pix_mp->width; + q_data->pix_mp.height = pix_mp->height; + q_data->pix_mp.colorspace = pix_mp->colorspace; + q_data->pix_mp.ycbcr_enc = pix_mp->ycbcr_enc; + q_data->pix_mp.xfer_func = pix_mp->xfer_func; + q_data->pix_mp.quantization = pix_mp->quantization; v4l2_dbg(1, debug, &jpeg->v4l2_dev, "(%d) s_fmt:%c%c%c%c wxh:%ux%u\n", f->type,
@@ -331,15 +331,18 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx, (q_data->fmt->fourcc >>8 &0xff ), (q_data->fmt->fourcc >>16 &0xff ), (q_data->fmt->fourcc >>24 &0xff ), - q_data->w, q_data->h); + q_data->pix_mp.width, q_data->pix_mp.height);for (i =0 ; i < q_data->fmt->colplanes; i++) { - q_data->bytesperline[i] = pix_mp->plane_fmt[i].bytesperline; - q_data->sizeimage[i] = pix_mp->plane_fmt[i].sizeimage; + q_data->pix_mp.plane_fmt[i].bytesperline = + pix_mp->plane_fmt[i].bytesperline; + q_data->pix_mp.plane_fmt[i].sizeimage = + pix_mp->plane_fmt[i].sizeimage;v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"plane[%d] bpl=%u, size=%u\n" , - i, q_data->bytesperline[i], q_data->sizeimage[i]); + i, q_data->pix_mp.plane_fmt[i].bytesperline, + q_data->pix_mp.plane_fmt[i].sizeimage); }return 0 ;
@@ -404,15 +407,15 @@ static int mtk_jpeg_g_selection(struct file *file, void *priv,switch (s->target) {case V4L2_SEL_TGT_COMPOSE :case V4L2_SEL_TGT_COMPOSE_DEFAULT : - s->r.width = ctx->out_q.w; - s->r.height = ctx->out_q.h; + s->r.width = ctx->out_q.pix_mp.width; + s->r.height = ctx->out_q.pix_mp.height; s->r.left =0 ; s->r.top =0 ;break ;case V4L2_SEL_TGT_COMPOSE_BOUNDS :case V4L2_SEL_TGT_COMPOSE_PADDED : - s->r.width = ctx->cap_q.w; - s->r.height = ctx->cap_q.h; + s->r.width = ctx->cap_q.pix_mp.width; + s->r.height = ctx->cap_q.pix_mp.height; s->r.left =0 ; s->r.top =0 ;break ;
@@ -468,14 +471,14 @@ static int mtk_jpeg_queue_setup(struct vb2_queue *q,if (*num_planes) {for (i =0 ; i < *num_planes; i++) -if (sizes[i] < q_data->sizeimage[i]) +if (sizes[i] < q_data->pix_mp.plane_fmt[i].sizeimage)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]; + sizes[i] = q_data->pix_mp.plane_fmt[i].sizeimage;v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"sizeimage[%d]=%u\n" , i, sizes[i]); }
@@ -494,7 +497,8 @@ static int mtk_jpeg_buf_prepare(struct vb2_buffer *vb)return -EINVAL ;for (i =0 ; i < q_data->fmt->colplanes; i++) -vb2_set_plane_payload (vb, i, q_data->sizeimage[i]); +vb2_set_plane_payload (vb, i, + q_data->pix_mp.plane_fmt[i].sizeimage);return 0 ; }
@@ -506,7 +510,8 @@ static bool mtk_jpeg_check_resolution_change(struct mtk_jpeg_ctx *ctx,struct mtk_jpeg_q_data *q_data; q_data = &ctx->out_q; -if (q_data->w != param->pic_w || q_data->h != param->pic_h) { +if (q_data->pix_mp.width != param->pic_w || + q_data->pix_mp.height != param->pic_h) {v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"Picture size change\n" );return true; }
@@ -529,20 +534,20 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx,int i; q_data = &ctx->out_q; - q_data->w = param->pic_w; - q_data->h = param->pic_h; + q_data->pix_mp.width = param->pic_w; + q_data->pix_mp.height = param->pic_h; q_data = &ctx->cap_q; - q_data->w = param->dec_w; - q_data->h = param->dec_h; + q_data->pix_mp.width = param->dec_w; + q_data->pix_mp.height = param->dec_h; q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , param->dst_fourcc,MTK_JPEG_FMT_FLAG_DEC_CAPTURE );for (i =0 ; i < q_data->fmt->colplanes; i++) { - q_data->bytesperline[i] = param->mem_stride[i]; - q_data->sizeimage[i] = param->comp_size[i]; + q_data->pix_mp.plane_fmt[i].bytesperline = param->mem_stride[i]; + q_data->pix_mp.plane_fmt[i].sizeimage = param->comp_size[i]; } v4l2_dbg(1, debug, &jpeg->v4l2_dev,
@@ -841,32 +846,36 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx)struct mtk_jpeg_q_data *q = &ctx->out_q;int i; - 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->pix_mp.colorspace =V4L2_COLORSPACE_JPEG , + q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + q->pix_mp.quantization =V4L2_QUANTIZATION_DEFAULT ; + q->pix_mp.xfer_func =V4L2_XFER_FUNC_DEFAULT ; q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS ,V4L2_PIX_FMT_JPEG ,MTK_JPEG_FMT_FLAG_DEC_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->pix_mp.width =MTK_JPEG_MIN_WIDTH ; + q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ; + q->pix_mp.plane_fmt[0 ].bytesperline =0 ; + q->pix_mp.plane_fmt[0 ].sizeimage =MTK_JPEG_DEFAULT_SIZEIMAGE ; q = &ctx->cap_q; q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS ,V4L2_PIX_FMT_YUV420M ,MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); - q->w =MTK_JPEG_MIN_WIDTH ; - q->h =MTK_JPEG_MIN_HEIGHT ; + q->pix_mp.colorspace =V4L2_COLORSPACE_JPEG , + q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; + q->pix_mp.quantization =V4L2_QUANTIZATION_DEFAULT ; + q->pix_mp.xfer_func =V4L2_XFER_FUNC_DEFAULT ; + q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; + q->pix_mp.height =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 ; +u32 stride = q->pix_mp.width * q->fmt->h_sample[i] /4 ; +u32 h = q->pix_mp.height * q->fmt->v_sample[i] /4 ; - q->bytesperline[i] = stride; - q->sizeimage[i] = stride * h; + q->pix_mp.plane_fmt[i].bytesperline = stride; + q->pix_mp.plane_fmt[i].sizeimage = stride * h; } }
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +2 -18
@@ -96,18 +96,11 @@ struct mtk_jpeg_fmt {/** * mtk_jpeg_q_data - parameters of one queue * @fmt: driver-specific format of this queue -* @w: image width -* @h: image height -* @bytesperline: distance in bytes between the leftmost pixels in two adjacent -* lines -* @sizeimage: image buffer size in bytes +* @pix_mp: multiplanar format */ struct mtk_jpeg_q_data {struct mtk_jpeg_fmt *fmt; -u32 w; -u32 h; -u32 bytesperline[VIDEO_MAX_PLANES ]; -u32 sizeimage[VIDEO_MAX_PLANES ]; +struct v4l2_pix_format_mplane pix_mp; };/**
@@ -117,10 +110,6 @@ struct mtk_jpeg_q_data {* @cap_q: destination (capture) queue queue information * @fh: V4L2 file handle * @state: state of the context -* @colorspace: enum v4l2_colorspace; supplemental to pixelformat -* @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding -* @quantization: enum v4l2_quantization, colorspace quantization -* @xfer_func: enum v4l2_xfer_func, colorspace transfer function */ struct mtk_jpeg_ctx {struct mtk_jpeg_dev *jpeg;
@@ -128,11 +117,6 @@ struct mtk_jpeg_ctx {struct mtk_jpeg_q_data cap_q;struct v4l2_fh fh; enum mtk_jpeg_ctx_state state; - -enum v4l2_colorspace colorspace; -enum v4l2_ycbcr_encoding ycbcr_enc; -enum v4l2_quantization quantization; - enum v4l2_xfer_func xfer_func; };#endif /* _MTK_JPEG_CORE_H */
Signature · 1 line
2.18.0
PATCH v10 20/28 media: platform: Change the colorspace of jpeg to the fixed value
In reply to Xia JiangJpeg doesn't support colorspace conversion, so it shouldn't accept any other colorspace in S_FMT.
Change the colorspace of jpeg to the fixed value.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +12 -12
@@ -320,10 +320,10 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx, pix_mp->pixelformat, fmt_type); q_data->pix_mp.width = pix_mp->width; q_data->pix_mp.height = pix_mp->height; - q_data->pix_mp.colorspace = pix_mp->colorspace; - q_data->pix_mp.ycbcr_enc = pix_mp->ycbcr_enc; - q_data->pix_mp.xfer_func = pix_mp->xfer_func; - q_data->pix_mp.quantization = pix_mp->quantization; + q_data->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; + q_data->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ; + q_data->pix_mp.xfer_func =V4L2_XFER_FUNC_SRGB ; + q_data->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ; v4l2_dbg(1, debug, &jpeg->v4l2_dev, "(%d) s_fmt:%c%c%c%c wxh:%ux%u\n", f->type,
@@ -846,10 +846,10 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx)struct mtk_jpeg_q_data *q = &ctx->out_q;int i; - q->pix_mp.colorspace =V4L2_COLORSPACE_JPEG , - q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; - q->pix_mp.quantization =V4L2_QUANTIZATION_DEFAULT ; - q->pix_mp.xfer_func =V4L2_XFER_FUNC_DEFAULT ; + q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; + q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ; + q->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ; + q->pix_mp.xfer_func =V4L2_XFER_FUNC_SRGB ; q->fmt = mtk_jpeg_find_format(mtk_jpeg_formats, MTK_JPEG_NUM_FORMATS, V4L2_PIX_FMT_JPEG,
@@ -863,10 +863,10 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS ,V4L2_PIX_FMT_YUV420M ,MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); - q->pix_mp.colorspace =V4L2_COLORSPACE_JPEG , - q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT ; - q->pix_mp.quantization =V4L2_QUANTIZATION_DEFAULT ; - q->pix_mp.xfer_func =V4L2_XFER_FUNC_DEFAULT ; + q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; + q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ; + q->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ; + q->pix_mp.xfer_func =V4L2_XFER_FUNC_SRGB ; q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ;
Signature · 1 line
2.18.0
PATCH v10 21/28 media: platform: Refactor mtk_jpeg_set_default_params()
In reply to Xia JiangCall mtk_jpeg_try_fmt_mplane() to replace the original computation of sizeimage and bytesperline, because that mtk_jpeg_try_fmt_mplane() already did it.
---
v10: new add patch
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +2 -10
@@ -844,7 +844,6 @@ 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; q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ;
@@ -856,8 +855,7 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) MTK_JPEG_FMT_FLAG_DEC_OUTPUT); q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ; - q->pix_mp.plane_fmt[0 ].bytesperline =0 ; - q->pix_mp.plane_fmt[0 ].sizeimage =MTK_JPEG_DEFAULT_SIZEIMAGE ; +mtk_jpeg_try_fmt_mplane (&q->pix_mp, q->fmt); q = &ctx->cap_q; q->fmt = mtk_jpeg_find_format(mtk_jpeg_formats, MTK_JPEG_NUM_FORMATS,
@@ -870,13 +868,7 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ; -for (i =0 ; i < q->fmt->colplanes; i++) { -u32 stride = q->pix_mp.width * q->fmt->h_sample[i] /4 ; -u32 h = q->pix_mp.height * q->fmt->v_sample[i] /4 ; - - q->pix_mp.plane_fmt[i].bytesperline = stride; - q->pix_mp.plane_fmt[i].sizeimage = stride * h; - } +mtk_jpeg_try_fmt_mplane (&q->pix_mp, q->fmt); }static int mtk_jpeg_open (struct file *file)
Signature · 1 line
2.18.0
PATCH v10 22/28 media: platform: Change the call functions of getting/enable/disable the jpeg's clock
In reply to Xia JiangUse the generic of_property_* helpers to get the clock_nums and clocks from device tree.
Use the generic clk_bulk_* helpers to enable and disable clocks.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 47 +++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- 2 files changed, 42 insertions(+), 13 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +38 -9
@@ -783,14 +783,15 @@ 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); + + ret =clk_bulk_prepare_enable (jpeg->num_clks, jpeg->clks); +if (ret) +dev_err (jpeg->dev,"Failed to open jpeg clk: %d\n" , ret); }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_bulk_disable_unprepare (jpeg->num_clks, jpeg->clks);mtk_smi_larb_put (jpeg->larb); }
@@ -939,6 +940,7 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) {struct device_node *node;struct platform_device *pdev; +int ret, i; node =of_parse_phandle (jpeg->dev->of_node,"mediatek,larb" ,0 );if (!node)
@@ -952,12 +954,39 @@ 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); + jpeg->num_clks = +of_property_count_strings (jpeg->dev->of_node,"clock-names" ); + +if (jpeg->num_clks >0 ) { + jpeg->clks =devm_kcalloc (jpeg->dev, jpeg->num_clks, +sizeof (struct clk_bulk_data ), +GFP_KERNEL ); +if (!jpeg->clks) +return -ENOMEM ; + }else { +dev_err (&pdev->dev,"Failed to get jpeg clock count\n" ); +return -EINVAL ; + } + +for (i =0 ; i < jpeg->num_clks; i++) { + ret =of_property_read_string_index (jpeg->dev->of_node, +"clock-names" , i, + &jpeg->clks->id); +if (ret) { +dev_err (&pdev->dev, +"Failed to get clock name id = %d" , i); +return ret; + } + } - jpeg->clk_jdec_smi =devm_clk_get (jpeg->dev,"jpgdec-smi" ); -return PTR_ERR_OR_ZERO (jpeg->clk_jdec_smi); + + ret =devm_clk_bulk_get (jpeg->dev, jpeg->num_clks, jpeg->clks); +if (ret) { +dev_err (&pdev->dev,"Failed to get jpeg clock:%d\n" , ret); +return ret; + } + +return 0 ; }static void mtk_jpeg_job_timeout_work (struct work_struct *work)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +4 -4
@@ -52,8 +52,8 @@ enum mtk_jpeg_ctx_state {* @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 +* @clks: clock names +* @num_clks: numbers of clock * @larb: SMI device * @job_timeout_work: IRQ timeout structure */
@@ -67,8 +67,8 @@ struct mtk_jpeg_dev {void *alloc_ctx;struct video_device *dec_vdev;void __iomem *dec_reg_base; -struct clk *clk_jdec; -struct clk *clk_jdec_smi; +struct clk_bulk_data *clks; +int num_clks;struct device *larb;struct delayed_work job_timeout_work; };
Signature · 1 line
2.18.0
Re: [PATCH v10 22/28] media: platform: Change the call functions of getting/enable/disable the jpeg's clock
Hi Xia,
Quoted 4 lines · Xia Jiang
Use the generic of_property_* helpers to get the
clock_numsand clocks from device tree.
Use the generic clk_bulk_* helpers to enable and disable clocks.
Quoted 8 lines
Signed-off-by Xia Jiang <[email protected]>---
v10: new add patch--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 47 +++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- 2 files changed, 42 insertions(+), 13 deletions(-)
Thank you for the patch. Please see my comments inline.
Quoted 47 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +14
-7@@ -783,14 +783,15 @@ 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); + + ret =clk_bulk_prepare_enable (jpeg->num_clks, jpeg->clks); +if (ret) +dev_err (jpeg->dev,"Failed to open jpeg clk: %d\n" , ret); }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_bulk_disable_unprepare (jpeg->num_clks, jpeg->clks);mtk_smi_larb_put (jpeg->larb); }@@ -939,6 +940,7 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) {struct device_node *node;struct platform_device *pdev; +int ret, i; node =of_parse_phandle (jpeg->dev->of_node,"mediatek,larb" ,0 );if (!node)@@ -952,12 +954,39 @@ 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); + jpeg->num_clks = +of_property_count_strings (jpeg->dev->of_node,"clock-names" ); + +if (jpeg->num_clks >0 ) { + jpeg->clks =devm_kcalloc (jpeg->dev, jpeg->num_clks, +sizeof (struct clk_bulk_data ), +GFP_KERNEL ); +if (!jpeg->clks)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) · line 974
Quoted 10 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +10
-0+return -ENOMEM ; + }else { +dev_err (&pdev->dev,"Failed to get jpeg clock count\n" ); +return -EINVAL ; + } + +for (i =0 ; i < jpeg->num_clks; i++) { + ret =of_property_read_string_index (jpeg->dev->of_node, +"clock-names" , i, + &jpeg->clks->id);
The names of the clocks must be explicitly specified in the driver, as per the DT bindings.
Best regards,
Tomasz
Re: [PATCH v10 22/28] media: platform: Change the call functions of getting/enable/disable the jpeg's clock
Quoted 70 lines · Tomasz Figa
Hi Xia,
Quoted 4 lines · Xia Jiang
Use the generic of_property_* helpers to get the
clock_numsand clocks from device tree.
Use the generic clk_bulk_* helpers to enable and disable clocks.Quoted 8 lines
Signed-off-by Xia Jiang <[email protected]>---
v10: new add patch--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 47 +++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- 2 files changed, 42 insertions(+), 13 deletions(-)Thank you for the patch. Please see my comments inline.
Quoted 52 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +19
-7@@ -783,14 +783,15 @@ 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); + + ret =clk_bulk_prepare_enable (jpeg->num_clks, jpeg->clks); +if (ret) +dev_err (jpeg->dev,"Failed to open jpeg clk: %d\n" , ret); }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_bulk_disable_unprepare (jpeg->num_clks, jpeg->clks);mtk_smi_larb_put (jpeg->larb); }@@ -939,6 +940,7 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) {struct device_node *node;struct platform_device *pdev; +int ret, i; node =of_parse_phandle (jpeg->dev->of_node,"mediatek,larb" ,0 );if (!node)@@ -952,12 +954,39 @@ 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); + jpeg->num_clks = +of_property_count_strings (jpeg->dev->of_node,"clock-names" ); + +if (jpeg->num_clks >0 ) { + jpeg->clks =devm_kcalloc (jpeg->dev, jpeg->num_clks, +sizeof (struct clk_bulk_data ), +GFP_KERNEL ); +if (!jpeg->clks) +return -ENOMEM ; + }else { +dev_err (&pdev->dev,"Failed to get jpeg clock count\n" ); +return -EINVAL ; + }
Quoted 8 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) · line 974
Quoted 5 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +5
-0+ +for (i =0 ; i < jpeg->num_clks; i++) { + ret =of_property_read_string_index (jpeg->dev->of_node, +"clock-names" , i, + &jpeg->clks->id);The names of the clocks must be explicitly specified in the driver, as per the DT bindings.
Dear Tomasz,
Thank you for your reply.
You mean that I should keep the v9 version about names of the clocks in the match data.
The v10 version about the names of the clocks follows the upstreamed mtk_venc/vdec.I think that this method is more generic. For example,when other project has more clocks, we can get the names of clocks from dtsi without changing the driver code.
What about your further opinion?
Best Regards,
Xia Jiang
Quoted 3 lines
Best regards,
Tomasz
Re: [PATCH v10 22/28] media: platform: Change the call functions of getting/enable/disable the jpeg's clock
Quoted 82 lines · Xia Jiang
Quoted 70 lines · Tomasz Figa
Hi Xia,
Quoted 4 lines · Xia Jiang
Use the generic of_property_* helpers to get the
clock_numsand clocks from device tree.
Use the generic clk_bulk_* helpers to enable and disable clocks.Quoted 8 lines
Signed-off-by Xia Jiang <[email protected]>---
v10: new add patch--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 47 +++++++++++++++---- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++-- 2 files changed, 42 insertions(+), 13 deletions(-)Thank you for the patch. Please see my comments inline.
Quoted 52 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +19
-7@@ -783,14 +783,15 @@ 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); + + ret =clk_bulk_prepare_enable (jpeg->num_clks, jpeg->clks); +if (ret) +dev_err (jpeg->dev,"Failed to open jpeg clk: %d\n" , ret); }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_bulk_disable_unprepare (jpeg->num_clks, jpeg->clks);mtk_smi_larb_put (jpeg->larb); }@@ -939,6 +940,7 @@ static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) {struct device_node *node;struct platform_device *pdev; +int ret, i; node =of_parse_phandle (jpeg->dev->of_node,"mediatek,larb" ,0 );if (!node)@@ -952,12 +954,39 @@ 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); + jpeg->num_clks = +of_property_count_strings (jpeg->dev->of_node,"clock-names" ); + +if (jpeg->num_clks >0 ) { + jpeg->clks =devm_kcalloc (jpeg->dev, jpeg->num_clks, +sizeof (struct clk_bulk_data ), +GFP_KERNEL ); +if (!jpeg->clks) +return -ENOMEM ; + }else { +dev_err (&pdev->dev,"Failed to get jpeg clock count\n" ); +return -EINVAL ; + }Quoted 8 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c static int mtk_jpeg_clk_init(struct mtk_jpeg_dev *jpeg) · line 974
Quoted 5 lines
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +5
-0+ +for (i =0 ; i < jpeg->num_clks; i++) { + ret =of_property_read_string_index (jpeg->dev->of_node, +"clock-names" , i, + &jpeg->clks->id);The names of the clocks must be explicitly specified in the driver, as per the DT bindings.
Dear Tomasz,
Quoted 8 lines
Thank you for your reply.
You mean that I should keep the v9 version about names of the clocks in the match data.
The v10 version about the names of the clocks follows the upstreamed mtk_venc/vdec.I think that this method is more generic. For example,when other project has more clocks, we can get the names of clocks from dtsi without changing the driver code.
What about your further opinion?
The problem with that method is that one can put any random names in the DT and the driver will happily accept them, without any correctness checking. Moreover, if the other project has more clocks, it already requires a different compatible string in the DT bindings, so the kernel needs to be changed anyway.
Actually this is something that needs to be fixed in the mtk_venc/vdec driver as well. I believe someone just overlooked it when the driver was being reviewed.
Best regards,
Tomasz
PATCH v10 23/28 media: dt-bindings: Add jpeg enc device tree node document
In reply to Xia JiangAdd jpeg enc device tree node document.
---
v10: no changes
--- .../bindings/media/mediatek-jpeg-encoder.txt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt
Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.txt new file +35 -0
@@ -0,0 +1,35 @@ +* MediaTek JPEG Encoder + +MediaTek JPEG Encoder is the JPEG encode hardware present in MediaTek SoCs + +Required properties: +- compatible : "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 v10 24/28 arm: dts: mt2701: Add jpeg enc device tree node
In reply to Xia JiangAdd jpeg enc device tree node.
---
v10: no changes
--- 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 v10 25/28 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.
---
v10: 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 v10 26/28 media: platform: Rename existing functions/defines/variables
In reply to Xia JiangRename existing functions/defines/variables with a _dec prefix and without dec_ prefix to prepare for the addition of the jpeg encoder feature.
---
v10: no changes
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 172 +++++++++--------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 12 +- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 5 +- 3 files changed, 97 insertions(+), 92 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +88 -84
@@ -27,11 +27,11 @@#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 , - .flags =MTK_JPEG_FMT_FLAG_DEC_OUTPUT , + .flags =MTK_JPEG_FMT_FLAG_OUTPUT , }, { .fourcc =V4L2_PIX_FMT_YUV420M ,
@@ -40,7 +40,7 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { .colplanes = 3, .h_align = 5, .v_align = 4, - .flags = MTK_JPEG_FMT_FLAG_DEC_CAPTURE, + .flags = MTK_JPEG_FMT_FLAG_CAPTURE, }, { .fourcc = V4L2_PIX_FMT_YUV422M,
@@ -49,11 +49,11 @@ static struct mtk_jpeg_fmt mtk_jpeg_formats[] = { .colplanes = 3, .h_align = 5, .v_align = 3, - .flags = MTK_JPEG_FMT_FLAG_DEC_CAPTURE, + .flags = MTK_JPEG_FMT_FLAG_CAPTURE, }, }; -#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;
@@ -112,15 +112,15 @@ 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) { -return mtk_jpeg_enum_fmt (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , f, -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); +return mtk_jpeg_enum_fmt (mtk_jpeg_dec_formats,MTK_JPEG_DEC_NUM_FORMATS , + f,MTK_JPEG_FMT_FLAG_CAPTURE ); }static int mtk_jpeg_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_OUTPUT ); } static struct mtk_jpeg_q_data *mtk_jpeg_get_q_data(struct mtk_jpeg_ctx *ctx,
@@ -246,9 +246,10 @@ static int mtk_jpeg_try_fmt_vid_cap_mplane(struct file *file, void *priv,struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , f->fmt.pix_mp.pixelformat, -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); +MTK_JPEG_FMT_FLAG_CAPTURE );if (!fmt) fmt = ctx->cap_q.fmt;
@@ -273,9 +274,10 @@ static int mtk_jpeg_try_fmt_vid_out_mplane(struct file *file, void *priv,struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv);struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , f->fmt.pix_mp.pixelformat, -MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); +MTK_JPEG_FMT_FLAG_OUTPUT );if (!fmt) fmt = ctx->out_q.fmt;
@@ -315,8 +317,8 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx, } - q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats, -MTK_JPEG_NUM_FORMATS , + q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , pix_mp->pixelformat, fmt_type); q_data->pix_mp.width = pix_mp->width; q_data->pix_mp.height = pix_mp->height;
@@ -358,7 +360,7 @@ static int mtk_jpeg_s_fmt_vid_out_mplane(struct file *file, void *priv,return ret;return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f, -MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); +MTK_JPEG_FMT_FLAG_OUTPUT ); } static int mtk_jpeg_s_fmt_vid_cap_mplane(struct file *file, void *priv,
@@ -371,7 +373,7 @@ static int mtk_jpeg_s_fmt_vid_cap_mplane(struct file *file, void *priv,return ret;return mtk_jpeg_s_fmt_mplane (mtk_jpeg_fh_to_ctx (priv), f, -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); +MTK_JPEG_FMT_FLAG_CAPTURE ); }static void mtk_jpeg_queue_src_chg_event (struct mtk_jpeg_ctx *ctx)
@@ -396,8 +398,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);
@@ -425,7 +427,7 @@ static int mtk_jpeg_g_selection(struct file *file, void *priv,return 0 ; } -static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = { +static const struct v4l2_ioctl_ops mtk_jpeg_dec_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,
@@ -437,7 +439,7 @@ static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = { .vidioc_s_fmt_vid_out_mplane = mtk_jpeg_s_fmt_vid_out_mplane, .vidioc_qbuf = v4l2_m2m_ioctl_qbuf, .vidioc_subscribe_event = mtk_jpeg_subscribe_event, - .vidioc_g_selection = mtk_jpeg_g_selection, + .vidioc_g_selection = mtk_jpeg_dec_g_selection, .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs, .vidioc_prepare_buf = v4l2_m2m_ioctl_prepare_buf,
@@ -517,9 +519,9 @@ static bool mtk_jpeg_check_resolution_change(struct mtk_jpeg_ctx *ctx, } q_data = &ctx->cap_q; -if (q_data->fmt !=mtk_jpeg_find_format (mtk_jpeg_formats, -MTK_JPEG_NUM_FORMATS , param->dst_fourcc, -MTK_JPEG_FMT_FLAG_DEC_CAPTURE )) { +if (q_data->fmt !=mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , param->dst_fourcc, +MTK_JPEG_FMT_FLAG_CAPTURE )) {v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"format change\n" );return true; }
@@ -540,10 +542,10 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx, q_data = &ctx->cap_q; q_data->pix_mp.width = param->dec_w; q_data->pix_mp.height = param->dec_h; - q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_formats, -MTK_JPEG_NUM_FORMATS , + q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS , param->dst_fourcc, -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); +MTK_JPEG_FMT_FLAG_CAPTURE );for (i =0 ; i < q_data->fmt->colplanes; i++) { q_data->pix_mp.plane_fmt[i].bytesperline = param->mem_stride[i];
@@ -560,7 +562,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;
@@ -608,7 +610,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;
@@ -634,13 +636,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,
@@ -680,7 +682,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;
@@ -715,11 +717,11 @@ static void mtk_jpeg_device_run(void *priv) 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 ;
@@ -731,16 +733,16 @@ 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,
@@ -753,7 +755,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;
@@ -766,7 +768,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;
@@ -808,7 +810,7 @@ static irqreturn_t mtk_jpeg_dec_irq(int irq, void *priv)cancel_delayed_work (&jpeg->job_timeout_work); - 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) {
@@ -821,7 +823,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" );
@@ -851,17 +853,19 @@ static void mtk_jpeg_set_default_params(struct mtk_jpeg_ctx *ctx) q->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ; q->pix_mp.xfer_func =V4L2_XFER_FUNC_SRGB ; - q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + q->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS ,V4L2_PIX_FMT_JPEG , -MTK_JPEG_FMT_FLAG_DEC_OUTPUT ); +MTK_JPEG_FMT_FLAG_OUTPUT ); q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ;mtk_jpeg_try_fmt_mplane (&q->pix_mp, q->fmt); q = &ctx->cap_q; - q->fmt =mtk_jpeg_find_format (mtk_jpeg_formats,MTK_JPEG_NUM_FORMATS , + q->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, +MTK_JPEG_DEC_NUM_FORMATS ,V4L2_PIX_FMT_YUV420M , -MTK_JPEG_FMT_FLAG_DEC_CAPTURE ); +MTK_JPEG_FMT_FLAG_CAPTURE ); q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ; q->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ;
@@ -1000,7 +1004,7 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) src_buf =v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -mtk_jpeg_dec_reset (jpeg->dec_reg_base); +mtk_jpeg_dec_reset (jpeg->reg_base);pm_runtime_put (jpeg->dev);
@@ -1012,7 +1016,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 );
@@ -1025,23 +1029,23 @@ static int mtk_jpeg_probe(struct platform_device *pdev)INIT_DELAYED_WORK (&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); 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; }
@@ -1058,40 +1062,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 | -V4L2_CAP_VIDEO_M2M_MPLANE ; - - ret =video_register_device (jpeg->dec_vdev,VFL_TYPE_VIDEO ,-1 ); + jpeg->vdev->fops = &mtk_jpeg_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->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);
@@ -1099,10 +1103,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:
@@ -1122,8 +1126,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 +6 -6
@@ -17,8 +17,8 @@#define MTK_JPEG_COMP_MAX 3 -#define MTK_JPEG_FMT_FLAG_DEC_OUTPUT BIT(0) -#define MTK_JPEG_FMT_FLAG_DEC_CAPTURE BIT(1) +#define MTK_JPEG_FMT_FLAG_OUTPUT BIT(0) +#define MTK_JPEG_FMT_FLAG_CAPTURE BIT(1)#define MTK_JPEG_MIN_WIDTH 32U#define MTK_JPEG_MIN_HEIGHT 32U
@@ -50,8 +50,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 * @clks: clock names * @num_clks: numbers of 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_bulk_data *clks;int num_clks;struct device *larb;
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +3 -2
@@ -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>
Signature · 1 line
2.18.0
PATCH v10 27/28 media: platform: Using the variant structure to contain the varability between dec and enc
In reply to Xia JiangAdd varability which would be used between jpeg dec and enc to a match data structure, it will make the code linear.
---
v10: new add patch
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 100 +++++++++++------- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 28 +++++ 2 files changed, 92 insertions(+), 36 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +64 -36
@@ -80,8 +80,8 @@ 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)); +strscpy (cap->driver, jpeg->variant->dev_name,sizeof (cap->driver)); +strscpy (cap->card, jpeg->variant->dev_name,sizeof (cap->card));snprintf (cap->bus_info,sizeof (cap->bus_info),"platform:%s" ,dev_name (jpeg->dev));
@@ -112,15 +112,23 @@ 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) { -return mtk_jpeg_enum_fmt (mtk_jpeg_dec_formats,MTK_JPEG_DEC_NUM_FORMATS , - f,MTK_JPEG_FMT_FLAG_CAPTURE ); +struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); +struct mtk_jpeg_dev *jpeg = ctx->jpeg; + +return mtk_jpeg_enum_fmt (jpeg->variant->formats, + jpeg->variant->num_formats, f, +MTK_JPEG_FMT_FLAG_CAPTURE ); }static int mtk_jpeg_enum_fmt_vid_out (struct file *file,void *priv,struct v4l2_fmtdesc *f) { -return mtk_jpeg_enum_fmt (mtk_jpeg_dec_formats,MTK_JPEG_DEC_NUM_FORMATS , - f,MTK_JPEG_FMT_FLAG_OUTPUT ); +struct mtk_jpeg_ctx *ctx =mtk_jpeg_fh_to_ctx (priv); +struct mtk_jpeg_dev *jpeg = ctx->jpeg; + +return mtk_jpeg_enum_fmt (jpeg->variant->formats, + jpeg->variant->num_formats, f, +MTK_JPEG_FMT_FLAG_OUTPUT ); } static struct mtk_jpeg_q_data *mtk_jpeg_get_q_data(struct mtk_jpeg_ctx *ctx,
@@ -244,10 +252,11 @@ static int mtk_jpeg_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_dev *jpeg = ctx->jpeg;struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , + fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, f->fmt.pix_mp.pixelformat,MTK_JPEG_FMT_FLAG_CAPTURE );if (!fmt)
@@ -272,10 +281,11 @@ static int mtk_jpeg_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_dev *jpeg = ctx->jpeg;struct mtk_jpeg_fmt *fmt; - fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , + fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, f->fmt.pix_mp.pixelformat,MTK_JPEG_FMT_FLAG_OUTPUT );if (!fmt)
@@ -316,9 +326,8 @@ static int mtk_jpeg_s_fmt_mplane(struct mtk_jpeg_ctx *ctx,return -EBUSY ; } - - q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , + q_data->fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, pix_mp->pixelformat, fmt_type); q_data->pix_mp.width = pix_mp->width; q_data->pix_mp.height = pix_mp->height;
@@ -519,9 +528,10 @@ static bool mtk_jpeg_check_resolution_change(struct mtk_jpeg_ctx *ctx, } q_data = &ctx->cap_q; -if (q_data->fmt !=mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , param->dst_fourcc, -MTK_JPEG_FMT_FLAG_CAPTURE )) { +if (q_data->fmt != +mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, param->dst_fourcc, +MTK_JPEG_FMT_FLAG_CAPTURE )) {v4l2_dbg (1 , debug, &jpeg->v4l2_dev,"format change\n" );return true; }
@@ -542,8 +552,8 @@ static void mtk_jpeg_set_queue_data(struct mtk_jpeg_ctx *ctx, q_data = &ctx->cap_q; q_data->pix_mp.width = param->dec_w; q_data->pix_mp.height = param->dec_h; - q_data->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , + q_data->fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, param->dst_fourcc,MTK_JPEG_FMT_FLAG_CAPTURE );
@@ -749,13 +759,14 @@ static int mtk_jpeg_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) {struct mtk_jpeg_ctx *ctx = priv; +struct mtk_jpeg_dev *jpeg = ctx->jpeg;int ret; src_vq->type =V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ; 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_dec_qops; + src_vq->ops = jpeg->variant->qops; src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_COPY ; src_vq->lock = &ctx->jpeg->lock;
@@ -768,7 +779,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_dec_qops; + dst_vq->ops = jpeg->variant->qops; dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_COPY ; dst_vq->lock = &ctx->jpeg->lock;
@@ -847,24 +858,25 @@ 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; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ; q->pix_mp.quantization =V4L2_QUANTIZATION_FULL_RANGE ; q->pix_mp.xfer_func =V4L2_XFER_FUNC_SRGB ; - q->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , -V4L2_PIX_FMT_JPEG , + q->fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, + jpeg->variant->out_q_default_fourcc,MTK_JPEG_FMT_FLAG_OUTPUT ); q->pix_mp.width =MTK_JPEG_MIN_WIDTH ; q->pix_mp.height =MTK_JPEG_MIN_HEIGHT ;mtk_jpeg_try_fmt_mplane (&q->pix_mp, q->fmt); q = &ctx->cap_q; - q->fmt =mtk_jpeg_find_format (mtk_jpeg_dec_formats, -MTK_JPEG_DEC_NUM_FORMATS , -V4L2_PIX_FMT_YUV420M , + q->fmt =mtk_jpeg_find_format (jpeg->variant->formats, + jpeg->variant->num_formats, + jpeg->variant->cap_q_default_fourcc,MTK_JPEG_FMT_FLAG_CAPTURE ); q->pix_mp.colorspace =V4L2_COLORSPACE_SRGB ; q->pix_mp.ycbcr_enc =V4L2_YCBCR_ENC_601 ;
@@ -1004,7 +1016,7 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work) src_buf =v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -mtk_jpeg_dec_reset (jpeg->reg_base); + jpeg->variant->hw_reset (jpeg->reg_base);pm_runtime_put (jpeg->dev);
@@ -1026,6 +1038,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)mutex_init (&jpeg->lock);spin_lock_init (&jpeg->hw_lock); jpeg->dev = &pdev->dev; + jpeg->variant =of_device_get_match_data (jpeg->dev);INIT_DELAYED_WORK (&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -1041,8 +1054,8 @@ static int mtk_jpeg_probe(struct platform_device *pdev)return jpeg_irq; } - ret =devm_request_irq (&pdev->dev, jpeg_irq, mtk_jpeg_dec_irq,0 , - pdev->name, jpeg); + ret =devm_request_irq (&pdev->dev, jpeg_irq, + jpeg->variant->irq_handler,0 , pdev->name, jpeg);if (ret) {dev_err (&pdev->dev,"Failed to request jpeg_irq %d (%d)\n" , jpeg_irq, ret);
@@ -1062,7 +1075,8 @@ static int mtk_jpeg_probe(struct platform_device *pdev) goto err_dev_register; } - jpeg->m2m_dev =v4l2_m2m_init (&mtk_jpeg_dec_m2m_ops); + jpeg->m2m_dev =v4l2_m2m_init (jpeg->variant->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);
@@ -1075,9 +1089,9 @@ static int mtk_jpeg_probe(struct platform_device *pdev) goto err_vfd_jpeg_alloc; }snprintf (jpeg->vdev->name,sizeof (jpeg->vdev->name), -"%s-dec" ,MTK_JPEG_NAME ); +"%s" , jpeg->variant->dev_name); jpeg->vdev->fops = &mtk_jpeg_fops; - jpeg->vdev->ioctl_ops = &mtk_jpeg_dec_ioctl_ops; + jpeg->vdev->ioctl_ops = jpeg->variant->ioctl_ops; jpeg->vdev->minor =-1 ; jpeg->vdev->release = video_device_release; jpeg->vdev->lock = &jpeg->lock;
@@ -1094,8 +1108,9 @@ static int mtk_jpeg_probe(struct platform_device *pdev)video_set_drvdata (jpeg->vdev, jpeg);v4l2_info (&jpeg->v4l2_dev, -"decoder device registered as /dev/video%d (%d,%d)\n" , - jpeg->vdev->num,VIDEO_MAJOR , jpeg->vdev->minor); +"%s device registered as /dev/video%d (%d,%d)\n" , + jpeg->variant->dev_name, jpeg->vdev->num, +VIDEO_MAJOR , jpeg->vdev->minor);platform_set_drvdata (pdev, jpeg);
@@ -1178,14 +1193,27 @@ static const struct dev_pm_ops mtk_jpeg_pm_ops = { SET_RUNTIME_PM_OPS(mtk_jpeg_pm_suspend, mtk_jpeg_pm_resume, NULL) }; +static const struct mtk_jpeg_variant mt8173_jpeg_drvdata = { + .formats = mtk_jpeg_dec_formats, + .num_formats =MTK_JPEG_DEC_NUM_FORMATS , + .qops = &mtk_jpeg_dec_qops, + .irq_handler = mtk_jpeg_dec_irq, + .hw_reset = mtk_jpeg_dec_reset, + .m2m_ops = &mtk_jpeg_dec_m2m_ops, + .dev_name ="mtk-jpeg-dec" , + .ioctl_ops = &mtk_jpeg_dec_ioctl_ops, + .out_q_default_fourcc =V4L2_PIX_FMT_JPEG , + .cap_q_default_fourcc =V4L2_PIX_FMT_YUV420M , +}; +static const struct of_device_id mtk_jpeg_match[] = { { .compatible ="mediatek,mt8173-jpgdec" , - .data =NULL , + .data = &mt8173_jpeg_drvdata, }, { .compatible ="mediatek,mt2701-jpgdec" , - .data =NULL , + .data = &mt8173_jpeg_drvdata, }, {}, };
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +28 -0
@@ -41,6 +41,32 @@ enum mtk_jpeg_ctx_state { MTK_JPEG_SOURCE_CHANGE, }; +/** +* mtk_jpeg_variant - mtk jpeg driver variant +* @format: jpeg driver's internal color format +* @num_format: number of format +* @qops: the callback of jpeg vb2_ops +* @irq_handler: jpeg irq handler callback +* @hw_reset: jpeg hardware reset callback +* @m2m_ops: the callback of jpeg v4l2_m2m_ops +* @dev_name: jpeg device name +* @ioctl_ops: the callback of jpeg v4l2_ioctl_ops +* @out_q_default_fourcc: output queue default fourcc +* @cap_q_default_fourcc: capture queue default fourcc +*/ +struct mtk_jpeg_variant { +struct mtk_jpeg_fmt *formats; +int num_formats; +const struct vb2_ops *qops; +irqreturn_t (*irq_handler)(int irq,void *priv); +void (*hw_reset)(void __iomem *base); +const struct v4l2_m2m_ops *m2m_ops; +const char *dev_name; +const struct v4l2_ioctl_ops *ioctl_ops; +u32 out_q_default_fourcc; +u32 cap_q_default_fourcc; +}; +/** * struct mt_jpeg - JPEG IP abstraction * @lock: the mutex protecting this structure
@@ -56,6 +82,7 @@ enum mtk_jpeg_ctx_state {* @num_clks: numbers of clock * @larb: SMI device * @job_timeout_work: IRQ timeout structure +* @variant: driver variant to be used */ struct mtk_jpeg_dev {struct mutex lock;
@@ -71,6 +98,7 @@ struct mtk_jpeg_dev {int num_clks;struct device *larb;struct delayed_work job_timeout_work; +const struct mtk_jpeg_variant *variant; };/**
Signature · 1 line
2.18.0
PATCH v10 28/28 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.
---
v10: cancel mtk_jpeg_enc_bs structure.
refactor the setting hardware register functions in mtk_jpeg_enc_hw.c. remove mtk_jpeg_enc_job_ready().
refactor mtk_jpeg_enc_irq().
cancel setting up a control handler for jpeg dec.
add the mechanism to ensure that the buffer is enough to hold the EXIF data in .buf_prepare callback.
--- drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 345 +++++++++++++++++- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 17 + .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 154 ++++++++ .../media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h | 91 +++++ 5 files changed, 608 insertions(+), 4 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 +342 -3
475 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +17 -0
@@ -3,6 +3,7 @@* Copyright (c) 2016 MediaTek Inc. * Author: Ming Hsiu Tsai <[email protected]> * Rick Chang <[email protected]> +* Xia Jiang <[email protected]> */ #ifndef _MTK_JPEG_CORE_H
@@ -12,6 +13,8 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fh.h> +#include <media/v4l2-mem2mem.h> +#include <media/v4l2-ioctl.h> #define MTK_JPEG_NAME "mtk-jpeg"
@@ -29,6 +32,8 @@#define MTK_JPEG_HW_TIMEOUT_MSEC 1000 +#define MTK_JPEG_MAX_EXIF_SIZE (64 * 1024) +/** * enum mtk_jpeg_ctx_state - states of the context state machine * @MTK_JPEG_INIT: current state is initialized
@@ -104,6 +109,7 @@ struct mtk_jpeg_dev {/** * struct jpeg_fmt - driver's internal color format data * @fourcc: the fourcc code, 0 if not applicable +* @hw_format: hardware format value * @h_sample: horizontal sample count of plane in 4 * 4 pixel image * @v_sample: vertical sample count of plane in 4 * 4 pixel image * @colplanes: number of color planes (1 for packed formats)
@@ -113,6 +119,7 @@ struct mtk_jpeg_dev {*/ struct mtk_jpeg_fmt {u32 fourcc; +u32 hw_format;int h_sample[VIDEO_MAX_PLANES ];int v_sample[VIDEO_MAX_PLANES ];int colplanes;
@@ -125,10 +132,12 @@ struct mtk_jpeg_fmt {* mtk_jpeg_q_data - parameters of one queue * @fmt: driver-specific format of this queue * @pix_mp: multiplanar format +* @enc_crop_rect: jpeg encoder crop information */ struct mtk_jpeg_q_data {struct mtk_jpeg_fmt *fmt;struct v4l2_pix_format_mplane pix_mp; +struct v4l2_rect enc_crop_rect; };/**
@@ -138,6 +147,10 @@ struct mtk_jpeg_q_data {* @cap_q: destination (capture) queue queue information * @fh: V4L2 file handle * @state: state of the context +* @enable_exif: enable exif mode of jpeg encoder +* @enc_quality: jpeg encoder quality +* @restart_interval: jpeg encoder restart interval +* @ctrl_hdl: controls handler */ struct mtk_jpeg_ctx {struct mtk_jpeg_dev *jpeg;
@@ -145,6 +158,10 @@ struct mtk_jpeg_ctx {struct mtk_jpeg_q_data cap_q;struct v4l2_fh fh;enum mtk_jpeg_ctx_state state; +bool enable_exif; +u8 enc_quality; +u8 restart_interval; + struct v4l2_ctrl_handler ctrl_hdl; };#endif /* _MTK_JPEG_CORE_H */
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c new file +154 -0
154 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.18.0
Hi Xia,
Quoted 233 lines · Xia Jiang
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:697ae940b60a172ef31948dd74316fe9de365b7e, 32 bits, 32-bittime_tCompliance test for mtk-jpeg-dec device
/dev/video0:Driver Info:
Driver name : mtk-jpeg-dec Card type : mtk-jpeg-dec Bus info : platform:15004000.jpegdec Driver version : 5.8.0 Capabilities : 0x84204000Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps :0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected JPEG DecoderRequired ioctls:
testVIDIOC_QUERYCAP: OKAllow for multiple opens:
test second/dev/video0open: OK
testVIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OKtest invalid ioctls: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) testVIDIOC_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) testVIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) testVIDIOC_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: 0Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_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: 0Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) testVIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
testVIDIOC_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: 0Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) testVIDIOC_G_FBUF: OK (Not Supported) testVIDIOC_G_FMT: OK
testVIDIOC_TRY_FMT: OK
testVIDIOC_S_FMT: OK
testVIDIOC_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) testVIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK testVIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)Total for mtk-jpeg-dec device
/dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------The JPEG enc log:
------------------------------------------------------------
v4l2-compliance -d/dev/video1
v4l2-compliance SHA:697ae940b60a172ef31948dd74316fe9de365b7e, 32 bits, 32-bittime_tCompliance test for mtk-jpeg-enc device
/dev/video1:Driver Info:
Driver name : mtk-jpeg-enc Card type : mtk-jpeg-enc Bus info : platform:1500a000.jpegenc Driver version : 5.8.0 Capabilities : 0x84204000Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps :0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected JPEG EncoderRequired ioctls:
testVIDIOC_QUERYCAP: OKAllow for multiple opens:
test second/dev/video1open: OK
testVIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OKtest invalid ioctls: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) testVIDIOC_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) testVIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) testVIDIOC_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: 0Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_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: 0Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) testVIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK testVIDIOC_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: 0Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) testVIDIOC_G_FBUF: OK (Not Supported) testVIDIOC_G_FMT: OK
testVIDIOC_TRY_FMT: OK
testVIDIOC_S_FMT: OK
testVIDIOC_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) testVIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK testVIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)Total for mtk-jpeg-enc device
/dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0
------------------------------------------------------------Change compared to v9:
- use pm_runtime_force_*()helpers of patch 07/28
- add one patch for handling jpeg hardware's locking up
- deletemtk_jpeg_qbuf()in patch 09/28
- add one patch for delettingvidioc_s_selectionioctl of jpeg dec
- add one patch for changing the maximum width and height supported by jpeg dec
- add one patch for refactoringmtk_jpeg_try_fmt_mplanefunction
- add one patch for refactoringmtk_jpeg_find_formatfunction
- add one patch for redefinition ofmtk_jpeg_q_datastructure
- add one patch for changing the colorspace of jpeg to the fixed value
- add one patch for refactoringmtk_jpeg_set_default_paramsfunction
- add one patch for changing the call function of getting/enable/disable the jpeg's clock
- add one patch for using the variant structure to contain the varability between jpeg dec and enc
- return active crop information inmtk_jpeg_enc_g_selectionfunction
- cancelmtk_jpeg_enc_bsstructure
- refactor the setting hardware register functions inmtk_jpeg_enc_hw.c
- removemtk_jpeg_enc_job_readyfunction
- refactormtk_jpeg_enc_irqfunction
- cancel setting up a control handler for jpeg dec
- add the mechanism to ensure that the buffer is enough to hold the EXIF data in .buf_prepare callbackXia Jiang (28):
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: Add mechanism to handle jpeg hardware's locking up
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: ChangeMTK_JPEG_COMP_MAXmacro definition location
media: platform: Delete redundant code and add annotation for an enum
media: platform: Deletevidioc_s_selectionioctl of jpeg dec
media: platform: Change the maximum width and height supported by JPEG
Quoted 8 lines
dec
media: platform: Refactormtk_jpeg_try_fmt_mplane()
media: platform: Refactormtk_jpeg_find_format()
media: platform: Redefinition ofmtk_jpeg_q_datastructure
media: platform: Change the colorspace of jpeg to the fixed value
media: platform: Refactormtk_jpeg_set_default_params()
media: platform: Change the call functions of getting/enable/disable
the jpeg's clock
Except one comment to that one patch, the series looks good to me. After fixing that last comment, feel free to add my Reviewed-by to all the patches which still don't have it.
Thanks a lot for patiently addressing the comments. I think the series improves the driver a lot.
Best regards,
Tomasz