| Message ID | 20240625125611.29145-1-jianhua.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/1] media: mediatek: jpeg: support 34bits | expand |
Il 25/06/24 14:56, Jianhua Lin ha scritto: > the iommu HW supported 34bits iova space(16GB), > but mediatek jpeg enc/dec driver still is 32bit, > then need to set the bit32/bit33 iova to jpeg HW. > > Signed-off-by: Jianhua Lin <jianhua.lin@mediatek.com> > --- > Changes compared with v1: > - used of_property_read_bool instead. > - used the ternary operator instead. > - added comment to explain the multiplier. > - cleaned up coding style warning max line length. > > .../platform/mediatek/jpeg/mtk_jpeg_core.c | 10 +++- > .../platform/mediatek/jpeg/mtk_jpeg_core.h | 2 + > .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 59 +++++++++++++++---- > .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.h | 1 + > .../platform/mediatek/jpeg/mtk_jpeg_dec_reg.h | 8 +++ > .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 45 ++++++++++++-- > .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.h | 11 +++- > 7 files changed, 117 insertions(+), 19 deletions(-) > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > index ac48658e2de4..5e3053f99dda 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > @@ -1030,6 +1030,7 @@ static void mtk_jpeg_dec_device_run(void *priv) > spin_lock_irqsave(&jpeg->hw_lock, flags); > mtk_jpeg_dec_reset(jpeg->reg_base); > mtk_jpeg_dec_set_config(jpeg->reg_base, > + jpeg->support_34bit, > &jpeg_src_buf->dec_param, > jpeg_src_buf->bs_size, > &bs, > @@ -1317,6 +1318,11 @@ static int mtk_jpeg_probe(struct platform_device *pdev) > return -EINVAL; > } > > + if (of_property_read_bool(pdev->dev.of_node, "mediatek,34bits")) This is per-SoC, and if one SoC supports 34-bits, it always does: this means that you don't need this property. Add it to mtk8195_jpegdec_drvdata and mtk8195_jpegenc_drvdata. > + jpeg->support_34bit = true; > + > + dev_info(&pdev->dev, "use 34bits: %d", jpeg->support_34bit); Also, this print is not necessary; if you really really want it (but I don't see the sense of that), please use dev_dbg(). > + > if (!jpeg->variant->multi_core) { > ret = mtk_jpeg_single_core_init(pdev, jpeg); > if (ret) { > @@ -1564,7 +1570,8 @@ static irqreturn_t mtk_jpeg_enc_done(struct mtk_jpeg_dev *jpeg) > src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); > dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); > > - result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base); > + result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base, > + ctx->jpeg->support_34bit); jpeg->variant->support_34bits > vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size); > > buf_state = VB2_BUF_STATE_DONE; > @@ -1764,6 +1771,7 @@ static void mtk_jpegdec_worker(struct work_struct *work) > ctx->total_frame_num++; > mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base); > mtk_jpeg_dec_set_config(comp_jpeg[hw_id]->reg_base, > + jpeg->support_34bit, > &jpeg_src_buf->dec_param, > jpeg_src_buf->bs_size, > &bs, > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > index 8ba6e757e11a..42f9af8d2e2a 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > @@ -209,6 +209,7 @@ struct mtk_jpegdec_comp_dev { > * @reg_decbase: jpg decode register base addr > * @dec_hw_dev: jpg decode hardware device > * @hw_index: jpg hw index > + * @support_34bit: flag to check if support dma_address 34bit > */ > struct mtk_jpeg_dev { > struct mutex lock; > @@ -231,6 +232,7 @@ struct mtk_jpeg_dev { > void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX]; > struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX]; > atomic_t hw_index; > + bool support_34bit; > }; > > /** > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > index 4a6ee211e18f..931eb99c44b7 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > @@ -270,7 +270,7 @@ void mtk_jpeg_dec_reset(void __iomem *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) > + u8 yscale_h, u8 uvscale_w, u8 uvscale_h) I suppose this was accidental.... > { > u32 val; > > @@ -279,23 +279,43 @@ static void mtk_jpeg_dec_set_brz_factor(void __iomem *base, u8 yscale_w, > writel(val, base + JPGDEC_REG_BRZ_FACTOR); > } > > -static void mtk_jpeg_dec_set_dst_bank0(void __iomem *base, u32 addr_y, > - u32 addr_u, u32 addr_v) > +static void mtk_jpeg_dec_set_dst_bank0(void __iomem *base, bool support_34bit, > + dma_addr_t addr_y, dma_addr_t addr_u, dma_addr_t addr_v) > { > + u32 val; > + > mtk_jpeg_verify_align(addr_y, 16, JPGDEC_REG_DEST_ADDR0_Y); > writel(addr_y, base + JPGDEC_REG_DEST_ADDR0_Y); > mtk_jpeg_verify_align(addr_u, 16, JPGDEC_REG_DEST_ADDR0_U); > writel(addr_u, base + JPGDEC_REG_DEST_ADDR0_U); > mtk_jpeg_verify_align(addr_v, 16, JPGDEC_REG_DEST_ADDR0_V); > writel(addr_v, base + JPGDEC_REG_DEST_ADDR0_V); > + if (support_34bit) { > + val = upper_32_bits(addr_y) & 0x3; So you want the first 2 bits of the upper 32 bits of addr_y? #define DESCRIPTION_OF_THOSE_TWO_BITS GENMASK(1, 0) u32 upper; upper = upper_32_bits(addr_y); writel(FIELD_PREP(DESCRIPTION_OF_THOSE_TWO_BITS, upper), ...... etc) > + writel(val, base + JPGDEC_REG_DEST_ADDR0_Y_EXT); > + val = upper_32_bits(addr_u) & 0x3; > + writel(val, base + JPGDEC_REG_DEST_ADDR0_U_EXT); > + val = upper_32_bits(addr_v) & 0x3; > + writel(val, base + JPGDEC_REG_DEST_ADDR0_V_EXT); > + } > } > > -static void mtk_jpeg_dec_set_dst_bank1(void __iomem *base, u32 addr_y, > - u32 addr_u, u32 addr_v) > +static void mtk_jpeg_dec_set_dst_bank1(void __iomem *base, bool support_34bit, > + dma_addr_t addr_y, dma_addr_t addr_u, dma_addr_t addr_v) > { > + u32 val; > + > writel(addr_y, base + JPGDEC_REG_DEST_ADDR1_Y); > writel(addr_u, base + JPGDEC_REG_DEST_ADDR1_U); > writel(addr_v, base + JPGDEC_REG_DEST_ADDR1_V); > + if (support_34bit) { > + val = upper_32_bits(addr_y) & 0x3; same here > + writel(val, base + JPGDEC_REG_DEST_ADDR1_Y_EXT); > + val = upper_32_bits(addr_u) & 0x3; > + writel(val, base + JPGDEC_REG_DEST_ADDR1_U_EXT); > + val = upper_32_bits(addr_v) & 0x3; > + writel(val, base + JPGDEC_REG_DEST_ADDR1_V_EXT); > + } > } > > static void mtk_jpeg_dec_set_mem_stride(void __iomem *base, u32 stride_y, > @@ -322,18 +342,31 @@ static void mtk_jpeg_dec_set_dec_mode(void __iomem *base, u32 mode) > writel(mode & 0x03, base + JPGDEC_REG_OPERATION_MODE); > } > > -static void mtk_jpeg_dec_set_bs_write_ptr(void __iomem *base, u32 ptr) > +static void mtk_jpeg_dec_set_bs_write_ptr(void __iomem *base, > + bool support_34bit, dma_addr_t ptr) > { > + u32 val; > + > mtk_jpeg_verify_align(ptr, 16, JPGDEC_REG_FILE_BRP); > writel(ptr, base + JPGDEC_REG_FILE_BRP); > + if (support_34bit) { > + val = upper_32_bits(ptr) & 0x3; and same here > + writel(val, base + JPGDEC_REG_FILE_BRP_EXT); > + } > } > > -static void mtk_jpeg_dec_set_bs_info(void __iomem *base, u32 addr, u32 size, > - u32 bitstream_size) > +static void mtk_jpeg_dec_set_bs_info(void __iomem *base, bool support_34bit, > + dma_addr_t addr, u32 size, u32 bitstream_size) > { > + u32 val; > + > mtk_jpeg_verify_align(addr, 16, JPGDEC_REG_FILE_ADDR); > mtk_jpeg_verify_align(size, 128, JPGDEC_REG_FILE_TOTAL_SIZE); > writel(addr, base + JPGDEC_REG_FILE_ADDR); > + if (support_34bit) { > + val = upper_32_bits(addr) & 0x3; ditto > + writel(val, base + JPGDEC_REG_FILE_ADDR_EXT); > + } > writel(size, base + JPGDEC_REG_FILE_TOTAL_SIZE); > writel(bitstream_size, base + JPGDEC_REG_BIT_STREAM_SIZE); > } > @@ -404,6 +437,7 @@ static void mtk_jpeg_dec_set_sampling_factor(void __iomem *base, u32 comp_num, > } > > void mtk_jpeg_dec_set_config(void __iomem *base, > + bool support_34bits, > struct mtk_jpeg_dec_param *cfg, > u32 bitstream_size, > struct mtk_jpeg_bs *bs, > @@ -413,8 +447,9 @@ void mtk_jpeg_dec_set_config(void __iomem *base, > mtk_jpeg_dec_set_dec_mode(base, 0); > mtk_jpeg_dec_set_comp0_du(base, cfg->unit_num); > mtk_jpeg_dec_set_total_mcu(base, cfg->total_mcu); > - mtk_jpeg_dec_set_bs_info(base, bs->str_addr, bs->size, bitstream_size); > - mtk_jpeg_dec_set_bs_write_ptr(base, bs->end_addr); > + mtk_jpeg_dec_set_bs_info(base, support_34bits, bs->str_addr, > + bs->size, bitstream_size); > + mtk_jpeg_dec_set_bs_write_ptr(base, support_34bits, bs->end_addr); > mtk_jpeg_dec_set_du_membership(base, cfg->membership, 1, > (cfg->comp_num == 1) ? 1 : 0); > mtk_jpeg_dec_set_comp_id(base, cfg->comp_id[0], cfg->comp_id[1], > @@ -432,9 +467,9 @@ void mtk_jpeg_dec_set_config(void __iomem *base, > cfg->mem_stride[1]); > mtk_jpeg_dec_set_img_stride(base, cfg->img_stride[0], > cfg->img_stride[1]); > - mtk_jpeg_dec_set_dst_bank0(base, fb->plane_addr[0], > + mtk_jpeg_dec_set_dst_bank0(base, support_34bits, fb->plane_addr[0], > fb->plane_addr[1], fb->plane_addr[2]); > - mtk_jpeg_dec_set_dst_bank1(base, 0, 0, 0); > + mtk_jpeg_dec_set_dst_bank1(base, support_34bits, 0, 0, 0); > mtk_jpeg_dec_set_dma_group(base, cfg->dma_mcu, cfg->dma_group, > cfg->dma_last_mcu); > mtk_jpeg_dec_set_pause_mcu_idx(base, cfg->total_mcu); > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h > index 8c31c6b12417..2948c9c300a4 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h > @@ -71,6 +71,7 @@ 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, > + bool support_34bits, > struct mtk_jpeg_dec_param *cfg, > u32 bitstream_size, > struct mtk_jpeg_bs *bs, > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h > index 27b7711ca341..e94f52de7c69 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h > @@ -46,5 +46,13 @@ > #define JPGDEC_REG_INTERRUPT_STATUS 0x0274 > #define JPGDEC_REG_STATUS 0x0278 > #define JPGDEC_REG_BIT_STREAM_SIZE 0x0344 > +#define JPGDEC_REG_DEST_ADDR0_Y_EXT 0x0360 > +#define JPGDEC_REG_DEST_ADDR0_U_EXT 0x0364 > +#define JPGDEC_REG_DEST_ADDR0_V_EXT 0x0368 > +#define JPGDEC_REG_DEST_ADDR1_Y_EXT 0x036c > +#define JPGDEC_REG_DEST_ADDR1_U_EXT 0x0370 > +#define JPGDEC_REG_DEST_ADDR1_V_EXT 0x0374 > +#define JPGDEC_REG_FILE_ADDR_EXT 0x0378 > +#define JPGDEC_REG_FILE_BRP_EXT 0x037c > > #endif /* _MTK_JPEG_REG_H */ > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > index f8fa3b841ccf..0c654afd987e 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > @@ -62,9 +62,15 @@ void mtk_jpeg_enc_reset(void __iomem *base) > } > EXPORT_SYMBOL_GPL(mtk_jpeg_enc_reset); > > -u32 mtk_jpeg_enc_get_file_size(void __iomem *base) > +u32 mtk_jpeg_enc_get_file_size(void __iomem *base, bool support_34bit) > { > - return readl(base + JPEG_ENC_DMA_ADDR0) - > + /* > + * The dma addr0 to be shifted left by 2 bits > + * for support greater than 4G address. > + */ > + u32 value = (support_34bit) ? 4 : 1; u8 shift = support_34bits ? 2 : 0 return (readl(base + JPEG_ENC_DMA_ADDR0) << shift) - readl....... > + > + return readl(base + JPEG_ENC_DMA_ADDR0) * value - > readl(base + JPEG_ENC_DST_ADDR0); > } > EXPORT_SYMBOL_GPL(mtk_jpeg_enc_get_file_size); > @@ -75,6 +81,13 @@ void mtk_jpeg_enc_start(void __iomem *base) > > value = readl(base + JPEG_ENC_CTRL); > value |= JPEG_ENC_CTRL_INT_EN_BIT | JPEG_ENC_CTRL_ENABLE_BIT; > + /* > + * Enable hw auto padding for height is not 16 alignment, > + * to ensure decoder downscales is correct. > + */ This is not part of the 34-bits support, is it?! Goes to a different commit. > + value |= JPEG_ENC_CTRL_RDMA_PADDING_EN; > + value |= JPEG_ENC_CTRL_RDMA_RIGHT_PADDING_EN; > + value &= ~JPEG_ENC_CTRL_RDMA_PADDING_0_EN; > writel(value, base + JPEG_ENC_CTRL); > } > EXPORT_SYMBOL_GPL(mtk_jpeg_enc_start); Regards, Angelo
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c index ac48658e2de4..5e3053f99dda 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1030,6 +1030,7 @@ static void mtk_jpeg_dec_device_run(void *priv) spin_lock_irqsave(&jpeg->hw_lock, flags); mtk_jpeg_dec_reset(jpeg->reg_base); mtk_jpeg_dec_set_config(jpeg->reg_base, + jpeg->support_34bit, &jpeg_src_buf->dec_param, jpeg_src_buf->bs_size, &bs, @@ -1317,6 +1318,11 @@ static int mtk_jpeg_probe(struct platform_device *pdev) return -EINVAL; } + if (of_property_read_bool(pdev->dev.of_node, "mediatek,34bits")) + jpeg->support_34bit = true; + + dev_info(&pdev->dev, "use 34bits: %d", jpeg->support_34bit); + if (!jpeg->variant->multi_core) { ret = mtk_jpeg_single_core_init(pdev, jpeg); if (ret) { @@ -1564,7 +1570,8 @@ static irqreturn_t mtk_jpeg_enc_done(struct mtk_jpeg_dev *jpeg) src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx); dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx); - result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base); + result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base, + ctx->jpeg->support_34bit); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size); buf_state = VB2_BUF_STATE_DONE; @@ -1764,6 +1771,7 @@ static void mtk_jpegdec_worker(struct work_struct *work) ctx->total_frame_num++; mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base); mtk_jpeg_dec_set_config(comp_jpeg[hw_id]->reg_base, + jpeg->support_34bit, &jpeg_src_buf->dec_param, jpeg_src_buf->bs_size, &bs, diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h index 8ba6e757e11a..42f9af8d2e2a 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h @@ -209,6 +209,7 @@ struct mtk_jpegdec_comp_dev { * @reg_decbase: jpg decode register base addr * @dec_hw_dev: jpg decode hardware device * @hw_index: jpg hw index + * @support_34bit: flag to check if support dma_address 34bit */ struct mtk_jpeg_dev { struct mutex lock; @@ -231,6 +232,7 @@ struct mtk_jpeg_dev { void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX]; struct mtk_jpegdec_comp_dev *dec_hw_dev[MTK_JPEGDEC_HW_MAX]; atomic_t hw_index; + bool support_34bit; }; /** diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c index 4a6ee211e18f..931eb99c44b7 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c @@ -270,7 +270,7 @@ void mtk_jpeg_dec_reset(void __iomem *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) + u8 yscale_h, u8 uvscale_w, u8 uvscale_h) { u32 val; @@ -279,23 +279,43 @@ static void mtk_jpeg_dec_set_brz_factor(void __iomem *base, u8 yscale_w, writel(val, base + JPGDEC_REG_BRZ_FACTOR); } -static void mtk_jpeg_dec_set_dst_bank0(void __iomem *base, u32 addr_y, - u32 addr_u, u32 addr_v) +static void mtk_jpeg_dec_set_dst_bank0(void __iomem *base, bool support_34bit, + dma_addr_t addr_y, dma_addr_t addr_u, dma_addr_t addr_v) { + u32 val; + mtk_jpeg_verify_align(addr_y, 16, JPGDEC_REG_DEST_ADDR0_Y); writel(addr_y, base + JPGDEC_REG_DEST_ADDR0_Y); mtk_jpeg_verify_align(addr_u, 16, JPGDEC_REG_DEST_ADDR0_U); writel(addr_u, base + JPGDEC_REG_DEST_ADDR0_U); mtk_jpeg_verify_align(addr_v, 16, JPGDEC_REG_DEST_ADDR0_V); writel(addr_v, base + JPGDEC_REG_DEST_ADDR0_V); + if (support_34bit) { + val = upper_32_bits(addr_y) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR0_Y_EXT); + val = upper_32_bits(addr_u) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR0_U_EXT); + val = upper_32_bits(addr_v) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR0_V_EXT); + } } -static void mtk_jpeg_dec_set_dst_bank1(void __iomem *base, u32 addr_y, - u32 addr_u, u32 addr_v) +static void mtk_jpeg_dec_set_dst_bank1(void __iomem *base, bool support_34bit, + dma_addr_t addr_y, dma_addr_t addr_u, dma_addr_t addr_v) { + u32 val; + writel(addr_y, base + JPGDEC_REG_DEST_ADDR1_Y); writel(addr_u, base + JPGDEC_REG_DEST_ADDR1_U); writel(addr_v, base + JPGDEC_REG_DEST_ADDR1_V); + if (support_34bit) { + val = upper_32_bits(addr_y) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR1_Y_EXT); + val = upper_32_bits(addr_u) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR1_U_EXT); + val = upper_32_bits(addr_v) & 0x3; + writel(val, base + JPGDEC_REG_DEST_ADDR1_V_EXT); + } } static void mtk_jpeg_dec_set_mem_stride(void __iomem *base, u32 stride_y, @@ -322,18 +342,31 @@ static void mtk_jpeg_dec_set_dec_mode(void __iomem *base, u32 mode) writel(mode & 0x03, base + JPGDEC_REG_OPERATION_MODE); } -static void mtk_jpeg_dec_set_bs_write_ptr(void __iomem *base, u32 ptr) +static void mtk_jpeg_dec_set_bs_write_ptr(void __iomem *base, + bool support_34bit, dma_addr_t ptr) { + u32 val; + mtk_jpeg_verify_align(ptr, 16, JPGDEC_REG_FILE_BRP); writel(ptr, base + JPGDEC_REG_FILE_BRP); + if (support_34bit) { + val = upper_32_bits(ptr) & 0x3; + writel(val, base + JPGDEC_REG_FILE_BRP_EXT); + } } -static void mtk_jpeg_dec_set_bs_info(void __iomem *base, u32 addr, u32 size, - u32 bitstream_size) +static void mtk_jpeg_dec_set_bs_info(void __iomem *base, bool support_34bit, + dma_addr_t addr, u32 size, u32 bitstream_size) { + u32 val; + mtk_jpeg_verify_align(addr, 16, JPGDEC_REG_FILE_ADDR); mtk_jpeg_verify_align(size, 128, JPGDEC_REG_FILE_TOTAL_SIZE); writel(addr, base + JPGDEC_REG_FILE_ADDR); + if (support_34bit) { + val = upper_32_bits(addr) & 0x3; + writel(val, base + JPGDEC_REG_FILE_ADDR_EXT); + } writel(size, base + JPGDEC_REG_FILE_TOTAL_SIZE); writel(bitstream_size, base + JPGDEC_REG_BIT_STREAM_SIZE); } @@ -404,6 +437,7 @@ static void mtk_jpeg_dec_set_sampling_factor(void __iomem *base, u32 comp_num, } void mtk_jpeg_dec_set_config(void __iomem *base, + bool support_34bits, struct mtk_jpeg_dec_param *cfg, u32 bitstream_size, struct mtk_jpeg_bs *bs, @@ -413,8 +447,9 @@ void mtk_jpeg_dec_set_config(void __iomem *base, mtk_jpeg_dec_set_dec_mode(base, 0); mtk_jpeg_dec_set_comp0_du(base, cfg->unit_num); mtk_jpeg_dec_set_total_mcu(base, cfg->total_mcu); - mtk_jpeg_dec_set_bs_info(base, bs->str_addr, bs->size, bitstream_size); - mtk_jpeg_dec_set_bs_write_ptr(base, bs->end_addr); + mtk_jpeg_dec_set_bs_info(base, support_34bits, bs->str_addr, + bs->size, bitstream_size); + mtk_jpeg_dec_set_bs_write_ptr(base, support_34bits, bs->end_addr); mtk_jpeg_dec_set_du_membership(base, cfg->membership, 1, (cfg->comp_num == 1) ? 1 : 0); mtk_jpeg_dec_set_comp_id(base, cfg->comp_id[0], cfg->comp_id[1], @@ -432,9 +467,9 @@ void mtk_jpeg_dec_set_config(void __iomem *base, cfg->mem_stride[1]); mtk_jpeg_dec_set_img_stride(base, cfg->img_stride[0], cfg->img_stride[1]); - mtk_jpeg_dec_set_dst_bank0(base, fb->plane_addr[0], + mtk_jpeg_dec_set_dst_bank0(base, support_34bits, fb->plane_addr[0], fb->plane_addr[1], fb->plane_addr[2]); - mtk_jpeg_dec_set_dst_bank1(base, 0, 0, 0); + mtk_jpeg_dec_set_dst_bank1(base, support_34bits, 0, 0, 0); mtk_jpeg_dec_set_dma_group(base, cfg->dma_mcu, cfg->dma_group, cfg->dma_last_mcu); mtk_jpeg_dec_set_pause_mcu_idx(base, cfg->total_mcu); diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h index 8c31c6b12417..2948c9c300a4 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h @@ -71,6 +71,7 @@ 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, + bool support_34bits, struct mtk_jpeg_dec_param *cfg, u32 bitstream_size, struct mtk_jpeg_bs *bs, diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h index 27b7711ca341..e94f52de7c69 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h @@ -46,5 +46,13 @@ #define JPGDEC_REG_INTERRUPT_STATUS 0x0274 #define JPGDEC_REG_STATUS 0x0278 #define JPGDEC_REG_BIT_STREAM_SIZE 0x0344 +#define JPGDEC_REG_DEST_ADDR0_Y_EXT 0x0360 +#define JPGDEC_REG_DEST_ADDR0_U_EXT 0x0364 +#define JPGDEC_REG_DEST_ADDR0_V_EXT 0x0368 +#define JPGDEC_REG_DEST_ADDR1_Y_EXT 0x036c +#define JPGDEC_REG_DEST_ADDR1_U_EXT 0x0370 +#define JPGDEC_REG_DEST_ADDR1_V_EXT 0x0374 +#define JPGDEC_REG_FILE_ADDR_EXT 0x0378 +#define JPGDEC_REG_FILE_BRP_EXT 0x037c #endif /* _MTK_JPEG_REG_H */ diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c index f8fa3b841ccf..0c654afd987e 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c @@ -62,9 +62,15 @@ void mtk_jpeg_enc_reset(void __iomem *base) } EXPORT_SYMBOL_GPL(mtk_jpeg_enc_reset); -u32 mtk_jpeg_enc_get_file_size(void __iomem *base) +u32 mtk_jpeg_enc_get_file_size(void __iomem *base, bool support_34bit) { - return readl(base + JPEG_ENC_DMA_ADDR0) - + /* + * The dma addr0 to be shifted left by 2 bits + * for support greater than 4G address. + */ + u32 value = (support_34bit) ? 4 : 1; + + return readl(base + JPEG_ENC_DMA_ADDR0) * value - readl(base + JPEG_ENC_DST_ADDR0); } EXPORT_SYMBOL_GPL(mtk_jpeg_enc_get_file_size); @@ -75,6 +81,13 @@ void mtk_jpeg_enc_start(void __iomem *base) value = readl(base + JPEG_ENC_CTRL); value |= JPEG_ENC_CTRL_INT_EN_BIT | JPEG_ENC_CTRL_ENABLE_BIT; + /* + * Enable hw auto padding for height is not 16 alignment, + * to ensure decoder downscales is correct. + */ + value |= JPEG_ENC_CTRL_RDMA_PADDING_EN; + value |= JPEG_ENC_CTRL_RDMA_RIGHT_PADDING_EN; + value &= ~JPEG_ENC_CTRL_RDMA_PADDING_0_EN; writel(value, base + JPEG_ENC_CTRL); } EXPORT_SYMBOL_GPL(mtk_jpeg_enc_start); @@ -84,14 +97,25 @@ void mtk_jpeg_set_enc_src(struct mtk_jpeg_ctx *ctx, void __iomem *base, { int i; dma_addr_t dma_addr; + u32 val; + bool support_34bit = ctx->jpeg->support_34bit; for (i = 0; i < src_buf->num_planes; i++) { dma_addr = vb2_dma_contig_plane_dma_addr(src_buf, i) + src_buf->planes[i].data_offset; - if (!i) + if (!i) { writel(dma_addr, base + JPEG_ENC_SRC_LUMA_ADDR); - else + if (support_34bit) { + val = upper_32_bits(dma_addr) & 0x3; + writel(val, base + JPEG_ENC_SRC_LUMA_ADDR_EXT); + } + } else { writel(dma_addr, base + JPEG_ENC_SRC_CHROMA_ADDR); + if (support_34bit) { + val = upper_32_bits(dma_addr) & 0x3; + writel(val, base + JPEG_ENC_SRC_CHRO_ADDR_EXT); + } + } } } EXPORT_SYMBOL_GPL(mtk_jpeg_set_enc_src); @@ -103,6 +127,8 @@ void mtk_jpeg_set_enc_dst(struct mtk_jpeg_ctx *ctx, void __iomem *base, size_t size; u32 dma_addr_offset; u32 dma_addr_offsetmask; + u32 val; + bool support_34bit = ctx->jpeg->support_34bit; dma_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0); dma_addr_offset = ctx->enable_exif ? MTK_JPEG_MAX_EXIF_SIZE : 0; @@ -112,7 +138,15 @@ void mtk_jpeg_set_enc_dst(struct mtk_jpeg_ctx *ctx, void __iomem *base, writel(dma_addr_offset & ~0xf, base + JPEG_ENC_OFFSET_ADDR); writel(dma_addr_offsetmask & 0xf, base + JPEG_ENC_BYTE_OFFSET_MASK); writel(dma_addr & ~0xf, base + JPEG_ENC_DST_ADDR0); + if (support_34bit) { + val = upper_32_bits(dma_addr) & 0x3; + writel(val, base + JPEG_ENC_DEST_ADDR0_EXT); + } writel((dma_addr + size) & ~0xf, base + JPEG_ENC_STALL_ADDR0); + if (support_34bit) { + val = upper_32_bits(dma_addr + size) & 0x3; + writel(val, base + JPEG_ENC_STALL_ADDR0_EXT); + } } EXPORT_SYMBOL_GPL(mtk_jpeg_set_enc_dst); @@ -278,7 +312,8 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv) if (!(irq_status & JPEG_ENC_INT_STATUS_DONE)) dev_warn(jpeg->dev, "Jpg Enc occurs unknown Err."); - result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base); + result_size = mtk_jpeg_enc_get_file_size(jpeg->reg_base, + ctx->jpeg->support_34bit); vb2_set_plane_payload(&dst_buf->vb2_buf, 0, result_size); buf_state = VB2_BUF_STATE_DONE; v4l2_m2m_buf_done(src_buf, buf_state); diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h index 61c60e4e58ea..cebc6c8fdecd 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.h @@ -68,6 +68,15 @@ #define JPEG_ENC_DCM_CTRL 0x300 #define JPEG_ENC_CODEC_SEL 0x314 #define JPEG_ENC_ULTRA_THRES 0x318 +#define JPEG_ENC_SRC_LUMA_ADDR_EXT 0x584 +#define JPEG_ENC_SRC_CHRO_ADDR_EXT 0x588 +#define JPEG_ENC_Q_TBL_ADDR_EXT 0x58C +#define JPEG_ENC_DEST_ADDR0_EXT 0x590 +#define JPEG_ENC_STALL_ADDR0_EXT 0x594 + +#define JPEG_ENC_CTRL_RDMA_PADDING_EN (1 << 20) +#define JPEG_ENC_CTRL_RDMA_RIGHT_PADDING_EN (1 << 29) +#define JPEG_ENC_CTRL_RDMA_PADDING_0_EN (1 << 30) /** * struct mtk_jpeg_enc_qlt - JPEG encoder quality data @@ -80,7 +89,7 @@ struct mtk_jpeg_enc_qlt { }; void mtk_jpeg_enc_reset(void __iomem *base); -u32 mtk_jpeg_enc_get_file_size(void __iomem *base); +u32 mtk_jpeg_enc_get_file_size(void __iomem *base, bool support_34bit); void mtk_jpeg_enc_start(void __iomem *enc_reg_base); void mtk_jpeg_set_enc_src(struct mtk_jpeg_ctx *ctx, void __iomem *base, struct vb2_buffer *src_buf);
the iommu HW supported 34bits iova space(16GB), but mediatek jpeg enc/dec driver still is 32bit, then need to set the bit32/bit33 iova to jpeg HW. Signed-off-by: Jianhua Lin <jianhua.lin@mediatek.com> --- Changes compared with v1: - used of_property_read_bool instead. - used the ternary operator instead. - added comment to explain the multiplier. - cleaned up coding style warning max line length. .../platform/mediatek/jpeg/mtk_jpeg_core.c | 10 +++- .../platform/mediatek/jpeg/mtk_jpeg_core.h | 2 + .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 59 +++++++++++++++---- .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.h | 1 + .../platform/mediatek/jpeg/mtk_jpeg_dec_reg.h | 8 +++ .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 45 ++++++++++++-- .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.h | 11 +++- 7 files changed, 117 insertions(+), 19 deletions(-)