Support multi-hardware jpeg decoding using of_platform_populate
Subsystems (3)
v2 cover Support multi-hardware jpeg decoding using of_platform_populate
From: kyrie wu <[email protected]>
This series adds support for multi hardware jpeg decoding, by first adding use of_platform_populate to manage each hardware
information: interrupt, clock, register bases and power. Secondly add decoding work queue to deal with the decoding requests of multi-hardware at the same time. Lastly, add output picture reorder function interface to eliminate the out of order images.
This series has been tested with both MT8195.
Decoding worked for this chip.
Patch 1 Adds jpeg decoder dt-bindings for mt8195
Patches 2 jpeg decoder builds three module for using Multi-HW, export some functions to make them visible by other modules.
Patch 3 use of_platform_populate to manage multi-hardware.
Patch 4 add jpeg decoding timeout function to judge hardware timeout.
Patch 5 add decoding work queue to deal with multi-hardware decoding at the same time.
Patch 6 add output picture reorder function to order images.
Patch 7 refactor jpegdec func interface for HW working.
---
This series patches dependent on:media_stage tree:
[1]
https://git.linuxtv.org/media_stage.git/commit/?id=b3627647f9ea7473d10fb08a95fd7c4133a17ca4
patch1 new jpegdec dt-bindings included files
[2] MM IOMMU binding:
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
[3] MT8195 power domain:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=580579
Changes compared with v1:
- new yaml file for mt8195 jpeg decoder.
- some modifications for patch v1's review comments.
kyrie wu (7):
dt-bindings: mediatek: Add mediatek,mt8195-jpgdec compatible
media: mtk-jpegdec: export jpeg decoder functions
media: mtk-jpegdec: manage jpegdec multi-hardware
media: mtk-jpegdec: add jpegdec timeout func interface
media: mtk-jpegdec: add jpeg decode worker interface
media: mtk-jpegdec: add output pic reorder interface
media: mtk-jpegdec: refactor jpegdec func interface
.../media/mediatek,mt8195-jpegdec.yaml | 166 ++++++++++ drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 286 +++++++++++++++- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 46 +++ .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 311 ++++++++++++++++-- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 3 +- .../platform/mtk-jpeg/mtk_jpeg_dec_reg.h | 1 + 7 files changed, 775 insertions(+), 43 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 1/7 dt-bindings: mediatek: Add mediatek, mt8195-jpgdec compatible
From: kyrie wu <[email protected]>
Add mediatek,mt8195-jpgdec compatible to binding document.
--- .../media/mediatek,mt8195-jpegdec.yaml | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml
Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml new file +166 -0
@@ -0,0 +1,166 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/mediatek,mt8195-jpegdec.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek JPEG Encoder Device Tree Bindings + +maintainers: + - kyrie wu <[email protected]> + +description: |- + MediaTek JPEG Decoder is the JPEG decode hardware present in MediaTek SoCs + +properties: + compatible: + items: + - const: mediatek,mt8195-jpgdec + + power-domains: + maxItems: 1 + + iommus: + maxItems: 6 + description: | + Points to the respective IOMMU block with master port as argument, see + Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml for details. + Ports are according to the HW. + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + + ranges: true + +# Required child node: +patternProperties: + "^jpgdec@[0-9a-f]+$": + type: object + description: | + The jpeg decoder hardware device node which should be added as subnodes to + the main jpeg node. + + properties: + compatible: + const: mediatek,mt8195-jpgdec + + reg: + maxItems: 1 + + mediatek,hw-id: + minItems: 0 + maxItems: 2 + description: | + Current jpegdec hw id. + + iommus: + minItems: 1 + maxItems: 32 + description: | + List of the hardware port in respective IOMMU block for current Socs. + Refer to bindings/iommu/mediatek,iommu.yaml. + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: jpgdec + + power-domains: + maxItems: 1 + + required: + - compatible + - reg + - mediatek,hw-id + - iommus + - interrupts + - clocks + - clock-names + - power-domains + + additionalProperties: false + +required: + - compatible + - power-domains + - iommus + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/memory/mt8195-memory-port.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/clock/mt8195-clk.h> + #include <dt-bindings/power/mt8195-power.h> + + jpgdec_master { + compatible = "mediatek,mt8195-jpgdec"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDEC1>; + iommus = <&iommu_vpp M4U_PORT_L19_JPGDEC_WDMA0>, + <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA0>, + <&iommu_vpp M4U_PORT_L19_JPGDEC_WDMA1>, + <&iommu_vpp M4U_PORT_L19_JPGDEC_BSDMA1>, + <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>, + <&iommu_vpp M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + jpgdec@1a040000 { + compatible = "mediatek,mt8195-jpgdec"; + reg = <0x1a040000 0x10000>;/* JPGDEC_C0 */ + mediatek,hw-id = <0>; + iommus = <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA0>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA0>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>; + interrupts = <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vencsys CLK_VENC_JPGDEC>; + clock-names = "jpgdec"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDEC0>; + }; + + jpgdec@1a050000 { + compatible = "mediatek,mt8195-jpgdec"; + reg = <0x1a050000 0x10000>;/* JPGDEC_C1 */ + mediatek,hw-id = <1>; + iommus = <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA0>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA0>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_WDMA1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BSDMA1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET1>, + <&iommu_vdo M4U_PORT_L19_JPGDEC_BUFF_OFFSET0>; + interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vencsys CLK_VENC_JPGDEC_C1>; + clock-names = "jpgdec"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDEC1>; + }; + + jpgdec@1b040000 { + compatible = "mediatek,mt8195-jpgdec"; + reg = <0x1b040000 0x10000>;/* JPGDEC_C2 */ + mediatek,hw-id = <2>; + iommus = <&iommu_vpp M4U_PORT_L20_JPGDEC_WDMA0>, + <&iommu_vpp M4U_PORT_L20_JPGDEC_BSDMA0>, + <&iommu_vpp M4U_PORT_L20_JPGDEC_WDMA1>, + <&iommu_vpp M4U_PORT_L20_JPGDEC_BSDMA1>, + <&iommu_vpp M4U_PORT_L20_JPGDEC_BUFF_OFFSET1>, + <&iommu_vpp M4U_PORT_L20_JPGDEC_BUFF_OFFSET0>; + interrupts = <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vencsys_core1 CLK_VENC_CORE1_JPGDEC>; + clock-names = "jpgdec"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDEC2>; + }; + };
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 2/7 media: mtk-jpegdec: export jpeg decoder functions
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
mtk jpeg decoder is built as a module, export some functions to make them visible by other modules.
--- drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +6 -0
@@ -189,6 +189,7 @@ int mtk_jpeg_dec_fill_param(struct mtk_jpeg_dec_param *param)return 0 ; } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_fill_param);u32 mtk_jpeg_dec_get_int_status (void __iomem *base) {
@@ -200,6 +201,7 @@ u32 mtk_jpeg_dec_get_int_status(void __iomem *base)return ret; } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_get_int_status);u32 mtk_jpeg_dec_enum_result (u32 irq_result) {
@@ -216,11 +218,13 @@ u32 mtk_jpeg_dec_enum_result(u32 irq_result)return MTK_JPEG_DEC_RESULT_ERROR_UNKNOWN ; } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_enum_result);void mtk_jpeg_dec_start (void __iomem *base) {writel (0 , base +JPGDEC_REG_TRIG ); } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_start);static void mtk_jpeg_dec_soft_reset (void __iomem *base) {
@@ -240,6 +244,7 @@ void mtk_jpeg_dec_reset(void __iomem *base)mtk_jpeg_dec_soft_reset (base);mtk_jpeg_dec_hard_reset (base); } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_reset);static void mtk_jpeg_dec_set_brz_factor (void __iomem *base,u8 yscale_w,u8 yscale_h,u8 uvscale_w,u8 uvscale_h)
@@ -408,3 +413,4 @@ void mtk_jpeg_dec_set_config(void __iomem *base, config->dma_last_mcu);mtk_jpeg_dec_set_pause_mcu_idx (base, config->total_mcu); } +EXPORT_SYMBOL_GPL (mtk_jpeg_dec_set_config);
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 3/7 media: mtk-jpegdec: manage jpegdec multi-hardware
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
manage each hardware information, including irq/clk/power. the hardware includes HW0/HW1/HW2.
--- drivers/media/platform/mtk-jpeg/Makefile | 5 +- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 18 ++ .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 37 ++++ .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 166 ++++++++++++++++++ 4 files changed, 224 insertions(+), 2 deletions(-)
drivers/media/platform/mtk-jpeg/Makefile +3 -2
@@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_VIDEO_MEDIATEK_JPEG) += mtk_jpeg.o \ - mtk-jpeg-enc-hw.o + mtk-jpeg-enc-hw.o \ + mtk-jpeg-dec-hw.o mtk_jpeg-y := mtk_jpeg_core.o \ - mtk_jpeg_dec_hw.o \ mtk_jpeg_dec_parse.o mtk-jpeg-enc-hw-y := mtk_jpeg_enc_hw.o +mtk-jpeg-dec-hw-y := mtk_jpeg_dec_hw.o
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +18 -0
@@ -1686,6 +1686,20 @@ static const struct mtk_jpeg_variant mtk8195_jpegenc_drvdata = { .cap_q_default_fourcc = V4L2_PIX_FMT_JPEG, }; +static const struct mtk_jpeg_variant mtk_jpegdec_drvdata = { + .is_multihw = true, + .clks = mt8173_jpeg_dec_clocks, + .num_clks =ARRAY_SIZE (mt8173_jpeg_dec_clocks), + .formats = mtk_jpeg_dec_formats, + .num_formats =MTK_JPEG_DEC_NUM_FORMATS , + .qops = &mtk_jpeg_dec_qops, + .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 , +}; + #if defined(CONFIG_OF) static const struct of_device_id mtk_jpeg_match[] = { {
@@ -1704,6 +1718,10 @@ static const struct of_device_id mtk_jpeg_match[] = { .compatible = "mediatek,mt8195-jpgenc", .data = &mtk8195_jpegenc_drvdata, }, + { + .compatible = "mediatek,mt8195-jpgdec", + .data = &mtk_jpegdec_drvdata, + }, {}, };
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +37 -0
@@ -103,6 +103,13 @@ enum mtk_jpegenc_hw_id { MTK_JPEGENC_HW_MAX, }; +enum mtk_jpegdec_hw_id { +MTK_JPEGDEC_HW0 , +MTK_JPEGDEC_HW1 , +MTK_JPEGDEC_HW2 , +MTK_JPEGDEC_HW_MAX , +}; +/** * struct mtk_vcodec_clk - Structure used to store vcodec clock information */
@@ -111,6 +118,14 @@ struct mtk_jpegenc_clk {int clk_num; }; +/** +* struct mtk_vcodec_clk - Structure used to store vcodec clock information +*/ +struct mtk_jpegdec_clk { +struct clk_bulk_data *clks; +int clk_num; +}; +/** * struct mtk_jpegenc_comp_dev - JPEG COREX abstraction * @dev: JPEG device
@@ -141,6 +156,25 @@ struct mtk_jpegenc_comp_dev {spinlock_t hw_lock; }; +/** +* struct mtk_jpegdec_comp_dev - JPEG COREX abstraction +* @dev: JPEG device +* @plat_dev: platform device data +* @reg_base: JPEG registers mapping +* @master_dev: mtk_jpeg_dev device +* @jdec_clk: mtk_jpegdec_clk +* @jpegdec_irq: jpeg decode irq num +*/ +struct mtk_jpegdec_comp_dev { +struct device *dev; +struct platform_device *plat_dev; +void __iomem *reg_base; +struct mtk_jpeg_dev *master_dev; +struct mtk_jpegdec_clk jdec_clk; +int jpegdec_irq; +int hw_id; +}; +/** * struct mtk_jpeg_dev - JPEG IP abstraction * @lock: the mutex protecting this structure
@@ -171,6 +205,9 @@ struct mtk_jpeg_dev {void __iomem *reg_encbase[MTK_JPEGENC_HW_MAX ];struct mtk_jpegenc_comp_dev *enc_hw_dev[MTK_JPEGENC_HW_MAX ];wait_queue_head_t enc_hw_wq; + +void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX ]; +struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX ]; };/**
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +166 -0
184 lines not on this page · raw message
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 4/7 media: mtk-jpegdec: add jpegdec timeout func interface
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
Generalizes jpegdec timeout func interfaces to handle HW timeout.
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 2 ++ .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 25 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +2 -0
@@ -173,6 +173,8 @@ struct mtk_jpegdec_comp_dev {struct mtk_jpegdec_clk jdec_clk;int jpegdec_irq;int hw_id; +struct delayed_work job_timeout_work; +struct mtk_jpeg_hw_param hw_param; };/**
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +24 -1
@@ -440,6 +440,24 @@ void mtk_jpeg_dec_set_config(void __iomem *base, }EXPORT_SYMBOL_GPL (mtk_jpeg_dec_set_config); +static void mtk_jpegdec_timeout_work (struct work_struct *work) +{ +enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ; +struct mtk_jpegdec_comp_dev *cjpeg = + container_of(work, struct mtk_jpegdec_comp_dev, + job_timeout_work.work); +struct vb2_v4l2_buffer *src_buf, *dst_buf; + + src_buf = cjpeg->hw_param.src_buffer; + dst_buf = cjpeg->hw_param.dst_buffer; + +mtk_jpeg_dec_reset (cjpeg->reg_base); +clk_disable_unprepare (cjpeg->jdec_clk.clks->clk); +pm_runtime_put (cjpeg->dev); +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state); +} +static irqreturn_t mtk_jpegdec_hw_irq_handler (int irq,void *priv) {struct vb2_v4l2_buffer *src_buf, *dst_buf;
@@ -453,6 +471,8 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)struct mtk_jpegdec_comp_dev *jpeg = priv;struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev; +cancel_delayed_work (&jpeg->job_timeout_work); + irq_status =mtk_jpeg_dec_get_int_status (jpeg->reg_base); dec_irq_ret =mtk_jpeg_dec_enum_result (irq_status);if (dec_irq_ret >=MTK_JPEG_DEC_RESULT_UNDERFLOW )
@@ -531,8 +551,11 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)return -ENOMEM ; dev->plat_dev = pdev; - jpegdec_clk = &dev->jdec_clk; +INIT_DELAYED_WORK (&dev->job_timeout_work, + mtk_jpegdec_timeout_work); + + jpegdec_clk = &dev->jdec_clk; jpegdec_clk->clk_num =devm_clk_bulk_get_all (&pdev->dev, &jpegdec_clk->clks);if (jpegdec_clk->clk_num <0 )
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 5/7 media: mtk-jpegdec: add jpeg decode worker interface
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
Add jpeg decoding worker to ensure that three HWs
run in parallel in MT8195.
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 234 +++++++++++++++++- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 6 + .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 17 ++ 3 files changed, 246 insertions(+), 11 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +223 -11
@@ -1098,6 +1098,180 @@ static void mtk_jpeg_enc_device_run(void *priv) } } +static int mtk_jpegdec_select_hw (struct mtk_jpeg_ctx *ctx) +{ +struct mtk_jpegdec_comp_dev *comp_jpeg; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; +unsigned long flags; +int hw_id =-1 ; +int i; + +spin_lock_irqsave (&jpeg->hw_lock, flags); +for (i =0 ; i <MTK_JPEGDEC_HW_MAX ; i++) { + comp_jpeg = jpeg->dec_hw_dev[i]; +if (comp_jpeg->hw_state ==MTK_JPEG_HW_IDLE ) { + hw_id = i; + comp_jpeg->hw_state =MTK_JPEG_HW_BUSY ; +break ; + } + } +spin_unlock_irqrestore (&jpeg->hw_lock, flags); + +return hw_id; +} + +static int mtk_jpegdec_deselect_hw (struct mtk_jpeg_dev *jpeg,int hw_id) +{ +unsigned long flags; + +spin_lock_irqsave (&jpeg->hw_lock, flags); + jpeg->dec_hw_dev[hw_id]->hw_state = +MTK_JPEG_HW_IDLE ; +spin_unlock_irqrestore (&jpeg->hw_lock, flags); + +return 0 ; +} + +static int mtk_jpegdec_set_hw_param (struct mtk_jpeg_ctx *ctx, +int hw_id, +struct vb2_v4l2_buffer *src_buf, +struct vb2_v4l2_buffer *dst_buf) +{ +struct mtk_jpegdec_comp_dev *jpeg = + ctx->jpeg->dec_hw_dev[hw_id]; + + jpeg->hw_param.curr_ctx = ctx; + jpeg->hw_param.src_buffer = src_buf; + jpeg->hw_param.dst_buffer = dst_buf; + +return 0 ; +} + +static void mtk_jpegdec_worker (struct work_struct *work) +{ + struct mtk_jpeg_ctx *ctx = container_of(work, struct mtk_jpeg_ctx, + jpeg_work); +struct mtk_jpegdec_comp_dev *comp_jpeg[MTK_JPEGDEC_HW_MAX ]; +enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ; +struct mtk_jpeg_src_buf *jpeg_src_buf, *jpeg_dst_buf; +struct vb2_v4l2_buffer *src_buf, *dst_buf; +struct mtk_jpeg_dev *jpeg = ctx->jpeg; +atomic_t *hw_rdy[MTK_JPEGDEC_HW_MAX ]; +int ret, i, hw_id =0 ; +struct mtk_jpeg_bs bs; +struct mtk_jpeg_fb fb; +unsigned long flags; + +for (i =0 ; i <MTK_JPEGDEC_HW_MAX ; i++) { + comp_jpeg[i] = jpeg->dec_hw_dev[i]; + hw_rdy[i] = &comp_jpeg[i]->hw_rdy; + } + +retry_select: + hw_id =mtk_jpegdec_select_hw (ctx); +if (hw_id <0 ) { + ret =wait_event_interruptible_timeout (jpeg->dec_hw_wq, + (atomic_read (hw_rdy[0 ]) || +atomic_read (hw_rdy[1 ]) || +atomic_read (hw_rdy[2 ])) >0 , +MTK_JPEG_HW_TIMEOUT_MSEC ); +if (ret !=0 ) { +dev_err (jpeg->dev,"%s : %d, all HW are busy\n" , + __func__, __LINE__); +v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); +return ; + } + +dev_err (jpeg->dev,"%s : %d, NEW HW IDLE, please retry selcet!!!\n" , + __func__, __LINE__); + goto retry_select; + } + +atomic_dec (&comp_jpeg[hw_id]->hw_rdy); + src_buf =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); +if (!src_buf) { +dev_err (jpeg->dev,"%s : %d, get src_buf fail !!!\n" , + __func__, __LINE__); + goto getbuf_fail; + } + dst_buf =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx); +if (!dst_buf) { +dev_err (jpeg->dev,"%s : %d, get dst_buf fail !!!\n" , + __func__, __LINE__); + goto getbuf_fail; + } + + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (&src_buf->vb2_buf); + jpeg_dst_buf =mtk_jpeg_vb2_to_srcbuf (&dst_buf->vb2_buf); + +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 ; + goto getbuf_fail; + } + + jpeg_src_buf->curr_ctx = ctx; + jpeg_src_buf->frame_num = ctx->total_frame_num; + jpeg_dst_buf->curr_ctx = ctx; + jpeg_dst_buf->frame_num = ctx->total_frame_num; + ctx->total_frame_num++; + +v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx); +v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); + +mtk_jpegdec_set_hw_param (ctx, hw_id, src_buf, dst_buf); + ret =pm_runtime_get_sync (comp_jpeg[hw_id]->dev); +if (ret <0 ) { +dev_err (jpeg->dev,"%s : %d, pm_runtime_get_sync fail !!!\n" , + __func__, __LINE__); + goto dec_end; + } + + ret =clk_prepare_enable (comp_jpeg[hw_id]->jdec_clk.clks->clk); +if (ret) { +dev_err (jpeg->dev,"%s : %d, jpegdec clk_prepare_enable fail\n" , + __func__, __LINE__); + goto clk_end; + } + +schedule_delayed_work (&comp_jpeg[hw_id]->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)) { +dev_err (jpeg->dev,"%s : %d, mtk_jpeg_set_dec_dst fail\n" , + __func__, __LINE__); + goto setdst_end; + } + +spin_lock_irqsave (&comp_jpeg[hw_id]->hw_lock, flags); +mtk_jpeg_dec_reset (comp_jpeg[hw_id]->reg_base); +mtk_jpeg_dec_set_config (jpeg->reg_base, + &jpeg_src_buf->dec_param, + &bs, + &fb); +mtk_jpeg_dec_start (comp_jpeg[hw_id]->reg_base); +v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); +spin_unlock_irqrestore (&comp_jpeg[hw_id]->hw_lock, flags); + +return ; + +setdst_end: +clk_disable_unprepare (comp_jpeg[hw_id]->jdec_clk.clks->clk); +clk_end: +pm_runtime_put (comp_jpeg[hw_id]->dev); +dec_end: +v4l2_m2m_buf_done (src_buf, buf_state); +v4l2_m2m_buf_done (dst_buf, buf_state); +getbuf_fail: +atomic_inc (&comp_jpeg[hw_id]->hw_rdy); +mtk_jpegdec_deselect_hw (jpeg, hw_id); +v4l2_m2m_job_finish (jpeg->m2m_dev, ctx->fh.m2m_ctx); +} +static void mtk_jpeg_dec_device_run (void *priv) {struct mtk_jpeg_ctx *ctx = priv;
@@ -1110,6 +1284,7 @@ static void mtk_jpeg_dec_device_run(void *priv)struct mtk_jpeg_fb fb;int ret; +if (!jpeg->variant->is_multihw) { 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);
@@ -1147,6 +1322,9 @@ static void mtk_jpeg_dec_device_run(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); +}else { +queue_work (jpeg->workqueue, &ctx->jpeg_work); +} }static int mtk_jpeg_dec_job_ready (void *priv)
@@ -1349,7 +1527,7 @@ static int mtk_jpeg_open(struct file *file)struct mtk_jpeg_dev *jpeg =video_drvdata (file);struct video_device *vfd =video_devdata (file);struct mtk_jpeg_ctx *ctx; -int ret =0 ; +int ret =0 , i; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)
@@ -1360,8 +1538,21 @@ static int mtk_jpeg_open(struct file *file) goto free; } -if (jpeg->variant->is_multihw) -INIT_WORK (&ctx->jpeg_work, mtk_jpegenc_worker); +if (jpeg->variant->is_multihw) { +for (i =0 ; i <MTK_JPEGENC_HW_MAX ; i++) { +if (jpeg->enc_hw_dev[i]) { +INIT_WORK (&ctx->jpeg_work, mtk_jpegenc_worker); +break ; + } + } + +for (i =0 ; i <MTK_JPEGDEC_HW_MAX ; i++) { +if (jpeg->dec_hw_dev[i]) { +INIT_WORK (&ctx->jpeg_work, mtk_jpegdec_worker); +break ; + } + } + }INIT_LIST_HEAD (&ctx->dst_done_queue);v4l2_fh_init (&ctx->fh, vfd);
@@ -1455,7 +1646,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg;int jpeg_irq; -int ret; +int ret, i; jpeg =devm_kzalloc (&pdev->dev,sizeof (*jpeg),GFP_KERNEL );if (!jpeg)
@@ -1499,13 +1690,34 @@ static int mtk_jpeg_probe(struct platform_device *pdev) goto err_clk_init; } }else { -init_waitqueue_head (&jpeg->enc_hw_wq); - jpeg->workqueue =alloc_ordered_workqueue (MTK_JPEG_NAME , -WQ_MEM_RECLAIM |WQ_FREEZABLE ); -if (!jpeg->workqueue) { -dev_err (&pdev->dev,"Failed to create jpeg workqueue!\n" ); - ret = -EINVAL ; - goto err_alloc_workqueue; +for (i =0 ; i <MTK_JPEGENC_HW_MAX ; i++) { +if (jpeg->enc_hw_dev[i]) { +init_waitqueue_head (&jpeg->enc_hw_wq); + jpeg->workqueue =alloc_ordered_workqueue (MTK_JPEG_NAME , +WQ_MEM_RECLAIM | +WQ_FREEZABLE ); +if (!jpeg->workqueue) { +dev_err (&pdev->dev,"Failed to create jpegenc workqueue!\n" ); + ret = -EINVAL ; + goto err_alloc_workqueue; + } +break ; + } + } + +for (i =0 ; i <MTK_JPEGDEC_HW_MAX ; i++) { +if (jpeg->dec_hw_dev[i]) { +init_waitqueue_head (&jpeg->dec_hw_wq); + jpeg->workqueue =alloc_ordered_workqueue (MTK_JPEG_NAME , +WQ_MEM_RECLAIM | +WQ_FREEZABLE ); +if (!jpeg->dec_workqueue) { +dev_err (&pdev->dev,"Failed to create jpegdec workqueue!\n" ); + ret = -EINVAL ; + goto err_alloc_workqueue; + } +break ; + } } }
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +6 -0
@@ -175,6 +175,10 @@ struct mtk_jpegdec_comp_dev {int hw_id;struct delayed_work job_timeout_work;struct mtk_jpeg_hw_param hw_param; +atomic_t hw_rdy; +enum mtk_jpeg_hw_state hw_state; +//spinlock protecting the hw device resource +spinlock_t hw_lock; };/**
@@ -210,6 +214,8 @@ struct mtk_jpeg_dev {void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX ];struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX ]; +wait_queue_head_t dec_hw_wq; +struct workqueue_struct *dec_workqueue; };/**
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +17 -0
@@ -446,6 +446,7 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)struct mtk_jpegdec_comp_dev *cjpeg = container_of(work, struct mtk_jpegdec_comp_dev, job_timeout_work.work); +struct mtk_jpeg_dev *master_jpeg = cjpeg->master_dev;struct vb2_v4l2_buffer *src_buf, *dst_buf; src_buf = cjpeg->hw_param.src_buffer;
@@ -454,6 +455,9 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)mtk_jpeg_dec_reset (cjpeg->reg_base);clk_disable_unprepare (cjpeg->jdec_clk.clks->clk);pm_runtime_put (cjpeg->dev); + cjpeg->hw_state =MTK_JPEG_HW_IDLE ; +atomic_inc (&cjpeg->hw_rdy); +wake_up (&master_jpeg->dec_hw_wq);v4l2_m2m_buf_done (src_buf, buf_state);v4l2_m2m_buf_done (dst_buf, buf_state); }
@@ -500,8 +504,18 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)v4l2_m2m_buf_done (src_buf, buf_state);v4l2_m2m_buf_done (dst_buf, buf_state);v4l2_m2m_job_finish (master_jpeg->m2m_dev, ctx->fh.m2m_ctx); +clk_disable_unprepare (jpeg->jdec_clk.clks->clk);pm_runtime_put (ctx->jpeg->dev); +if (ctx->fh.m2m_ctx && + (!list_empty (&ctx->fh.m2m_ctx->out_q_ctx.rdy_queue) || + !list_empty (&ctx->fh.m2m_ctx->cap_q_ctx.rdy_queue))) +queue_work (master_jpeg->workqueue, &ctx->jpeg_work); + + jpeg->hw_state =MTK_JPEG_HW_IDLE ; +wake_up (&master_jpeg->dec_hw_wq); +atomic_inc (&jpeg->hw_rdy); +return IRQ_HANDLED ; }
@@ -551,6 +565,9 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)return -ENOMEM ; dev->plat_dev = pdev; +atomic_set (&dev->hw_rdy,1U ); +spin_lock_init (&dev->hw_lock); + dev->hw_state =MTK_JPEG_HW_IDLE ;INIT_DELAYED_WORK (&dev->job_timeout_work, mtk_jpegdec_timeout_work);
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 6/7 media: mtk-jpegdec: add output pic reorder interface
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
add output reorder func to reorder the output images to ensure the output pic is consistent with the input images.
--- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 52 +++++++++++++++++-- 1 file changed, 48 insertions(+), 4 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +48 -4
@@ -440,6 +440,51 @@ void mtk_jpeg_dec_set_config(void __iomem *base, }EXPORT_SYMBOL_GPL (mtk_jpeg_dec_set_config); +static void mtk_jpegdec_put_buf (struct mtk_jpegdec_comp_dev *jpeg) +{ +struct mtk_jpeg_src_buf *dst_done_buf, *tmp_dst_done_buf; +struct vb2_v4l2_buffer *dst_buffer; +struct list_head *temp_entry; +struct list_head *pos =NULL ; +struct mtk_jpeg_ctx *ctx; +unsigned long flags; + + ctx = jpeg->hw_param.curr_ctx; +if (unlikely (!ctx)) { +dev_err (jpeg->dev,"comp_jpeg ctx fail !!!\n" ); +return ; + } + + dst_buffer = jpeg->hw_param.dst_buffer; +if (!dst_buffer) { +dev_err (jpeg->dev,"comp_jpeg dst_buffer fail !!!\n" ); +return ; + } + + dst_done_buf = container_of(dst_buffer, struct mtk_jpeg_src_buf, b); + +spin_lock_irqsave (&ctx->done_queue_lock, flags); +list_add_tail (&dst_done_buf->list, &ctx->dst_done_queue); +while (!list_empty (&ctx->dst_done_queue) && + (pos != &ctx->dst_done_queue)) { +list_for_each_prev_safe (pos, + temp_entry, + (&ctx->dst_done_queue)) { + tmp_dst_done_buf =list_entry (pos, + struct mtk_jpeg_src_buf, + list); +if (tmp_dst_done_buf->frame_num == + ctx->last_done_frame_num) { +list_del (&tmp_dst_done_buf->list); +v4l2_m2m_buf_done (&tmp_dst_done_buf->b, +VB2_BUF_STATE_DONE ); + ctx->last_done_frame_num++; + } + } + } +spin_unlock_irqrestore (&ctx->done_queue_lock, flags); +} +static void mtk_jpegdec_timeout_work (struct work_struct *work) {enum vb2_buffer_state buf_state =VB2_BUF_STATE_ERROR ;
@@ -447,10 +492,9 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work) container_of(work, struct mtk_jpegdec_comp_dev, job_timeout_work.work);struct mtk_jpeg_dev *master_jpeg = cjpeg->master_dev; -struct vb2_v4l2_buffer *src_buf, *dst_buf; +struct vb2_v4l2_buffer *src_buf; src_buf = cjpeg->hw_param.src_buffer; - dst_buf = cjpeg->hw_param.dst_buffer;mtk_jpeg_dec_reset (cjpeg->reg_base);clk_disable_unprepare (cjpeg->jdec_clk.clks->clk);
@@ -459,7 +503,7 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)atomic_inc (&cjpeg->hw_rdy);wake_up (&master_jpeg->dec_hw_wq);v4l2_m2m_buf_done (src_buf, buf_state); -v4l2_m2m_buf_done (dst_buf, buf_state); +mtk_jpegdec_put_buf (cjpeg); }static irqreturn_t mtk_jpegdec_hw_irq_handler (int irq,void *priv)
@@ -502,7 +546,7 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv) buf_state =VB2_BUF_STATE_DONE ;v4l2_m2m_buf_done (src_buf, buf_state); -v4l2_m2m_buf_done (dst_buf, buf_state); +mtk_jpegdec_put_buf (jpeg);v4l2_m2m_job_finish (master_jpeg->m2m_dev, ctx->fh.m2m_ctx);clk_disable_unprepare (jpeg->jdec_clk.clks->clk);pm_runtime_put (ctx->jpeg->dev);
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v2 7/7 media: mtk-jpegdec: refactor jpegdec func interface
In reply to kyrie.wuFrom: kyrie wu <[email protected]>
refactor the func interface of mtk_jpeg_dec_set_config for decode
--- .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 34 +++++++++++- .../media/platform/mtk-jpeg/mtk_jpeg_core.h | 1 + .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 55 ++++++++++--------- .../media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h | 3 +- .../platform/mtk-jpeg/mtk_jpeg_dec_reg.h | 1 + 5 files changed, 64 insertions(+), 30 deletions(-)
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +31 -3
@@ -295,6 +295,31 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_pix_format_mplane *pix_mp,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 = vq->bufs[buf->index]; + jpeg_src_buf =mtk_jpeg_vb2_to_srcbuf (vb); + jpeg_src_buf->bs_size = buf->m.planes[0 ].bytesused; + +end: +return v4l2_m2m_qbuf (file, fh->m2m_ctx, buf); +} +static int mtk_jpeg_g_fmt_vid_mplane (struct file *file,void *priv,struct v4l2_format *f) {
@@ -619,7 +644,7 @@ static const struct v4l2_ioctl_ops mtk_jpeg_dec_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 = v4l2_m2m_ioctl_qbuf, + .vidioc_qbuf = mtk_jpeg_qbuf, .vidioc_subscribe_event = mtk_jpeg_subscribe_event, .vidioc_g_selection = mtk_jpeg_dec_g_selection,
@@ -1251,6 +1276,7 @@ static void mtk_jpegdec_worker(struct work_struct *work)mtk_jpeg_dec_reset (comp_jpeg[hw_id]->reg_base);mtk_jpeg_dec_set_config (jpeg->reg_base, &jpeg_src_buf->dec_param, + jpeg_src_buf->bs_size, &bs, &fb);mtk_jpeg_dec_start (comp_jpeg[hw_id]->reg_base);
@@ -1310,8 +1336,10 @@ if (!jpeg->variant->is_multihw) {spin_lock_irqsave (&jpeg->hw_lock, flags);mtk_jpeg_dec_reset (jpeg->reg_base);mtk_jpeg_dec_set_config (jpeg->reg_base, - &jpeg_src_buf->dec_param, &bs, &fb); - + &jpeg_src_buf->dec_param, + jpeg_src_buf->bs_size, + &bs, + &fb);mtk_jpeg_dec_start (jpeg->reg_base);spin_unlock_irqrestore (&jpeg->hw_lock, flags);return ;
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +1 -0
@@ -80,6 +80,7 @@ struct mtk_jpeg_variant {struct mtk_jpeg_src_buf {struct vb2_v4l2_buffer b;struct list_head list; +u32 bs_size;struct mtk_jpeg_dec_param dec_param;struct mtk_jpeg_ctx *curr_ctx;
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +29 -26
80 lines not on this page · raw message
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +2 -1
@@ -71,7 +71,8 @@ int mtk_jpeg_dec_fill_param(struct mtk_jpeg_dec_param *param);u32 mtk_jpeg_dec_get_int_status (void __iomem *dec_reg_base);u32 mtk_jpeg_dec_enum_result (u32 irq_result);void mtk_jpeg_dec_set_config (void __iomem *base, -struct mtk_jpeg_dec_param *config, +struct mtk_jpeg_dec_param *cfg, +u32 bitstream_size,struct mtk_jpeg_bs *bs,struct mtk_jpeg_fb *fb);void mtk_jpeg_dec_reset (void __iomem *dec_reg_base);
drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h +1 -0
@@ -45,5 +45,6 @@#define JPGDEC_REG_QT_ID 0x0270#define JPGDEC_REG_INTERRUPT_STATUS 0x0274#define JPGDEC_REG_STATUS 0x0278 +#define JPGDEC_REG_BIT_STREAM_SIZE 0x0344#endif /* _MTK_JPEG_REG_H */
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek