Commit 52f68114 authored by kyrie wu's avatar kyrie wu Committed by Hans Verkuil
Browse files

media: mtk-jpegdec: refactor jpegdec func interface 



refactor the func interface of mtk_jpeg_dec_set_config
for decode

Signed-off-by: default avatarkyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: default avatarirui wang <irui.wang@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 79152824

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c

+33 −5
Original line number Diff line number Diff line
@@ -586,6 +586,31 @@ static int mtk_jpeg_enc_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 = 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 const struct v4l2_ioctl_ops mtk_jpeg_enc_ioctl_ops = {

	.vidioc_querycap                = mtk_jpeg_querycap,

	.vidioc_enum_fmt_vid_cap	= mtk_jpeg_enum_fmt_vid_cap,
@@ -626,7 +651,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,
@@ -1210,7 +1235,6 @@ static void mtk_jpegdec_worker(struct work_struct *work) 
	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++;



	mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf);

	ret = pm_runtime_get_sync(comp_jpeg[hw_id]->dev);
@@ -1240,9 +1264,11 @@ static void mtk_jpegdec_worker(struct work_struct *work) 
	}



	spin_lock_irqsave(&comp_jpeg[hw_id]->hw_lock, flags);

	ctx->total_frame_num++;

	mtk_jpeg_dec_reset(comp_jpeg[hw_id]->reg_base);

	mtk_jpeg_dec_set_config(jpeg->reg_base,

	mtk_jpeg_dec_set_config(comp_jpeg[hw_id]->reg_base,

				&jpeg_src_buf->dec_param,

				jpeg_src_buf->bs_size,

				&bs,

				&fb);

	mtk_jpeg_dec_start(comp_jpeg[hw_id]->reg_base);
@@ -1311,8 +1337,10 @@ 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_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/mediatek/jpeg/mtk_jpeg_core.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct mtk_jpeg_src_buf { 
	u32 frame_num;

	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/mediatek/jpeg/mtk_jpeg_dec_hw.c

+29 −26
Original line number Diff line number Diff line
@@ -330,12 +330,14 @@ static void mtk_jpeg_dec_set_bs_write_ptr(void __iomem *base, u32 ptr) 
	writel(ptr, base + JPGDEC_REG_FILE_BRP);

}



static void mtk_jpeg_dec_set_bs_info(void __iomem *base, u32 addr, u32 size)

static void mtk_jpeg_dec_set_bs_info(void __iomem *base, u32 addr, u32 size,

				     u32 bitstream_size)

{

	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);

	writel(size, base + JPGDEC_REG_FILE_TOTAL_SIZE);

	writel(bitstream_size, base + JPGDEC_REG_BIT_STREAM_SIZE);

}



static void mtk_jpeg_dec_set_comp_id(void __iomem *base, u32 id_y, u32 id_u,
@@ -404,39 +406,40 @@ static void mtk_jpeg_dec_set_sampling_factor(void __iomem *base, u32 comp_num, 
}



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)

{

	mtk_jpeg_dec_set_brz_factor(base, 0, 0, config->uv_brz_w, 0);

	mtk_jpeg_dec_set_brz_factor(base, 0, 0, cfg->uv_brz_w, 0);

	mtk_jpeg_dec_set_dec_mode(base, 0);

	mtk_jpeg_dec_set_comp0_du(base, config->unit_num);

	mtk_jpeg_dec_set_total_mcu(base, config->total_mcu);

	mtk_jpeg_dec_set_bs_info(base, bs->str_addr, bs->size);

	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_du_membership(base, config->membership, 1,

				       (config->comp_num == 1) ? 1 : 0);

	mtk_jpeg_dec_set_comp_id(base, config->comp_id[0], config->comp_id[1],

				 config->comp_id[2]);

	mtk_jpeg_dec_set_q_table(base, config->qtbl_num[0],

				 config->qtbl_num[1], config->qtbl_num[2]);

	mtk_jpeg_dec_set_sampling_factor(base, config->comp_num,

					 config->sampling_w[0],

					 config->sampling_h[0],

					 config->sampling_w[1],

					 config->sampling_h[1],

					 config->sampling_w[2],

					 config->sampling_h[2]);

	mtk_jpeg_dec_set_mem_stride(base, config->mem_stride[0],

				    config->mem_stride[1]);

	mtk_jpeg_dec_set_img_stride(base, config->img_stride[0],

				    config->img_stride[1]);

	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],

				 cfg->comp_id[2]);

	mtk_jpeg_dec_set_q_table(base, cfg->qtbl_num[0],

				 cfg->qtbl_num[1], cfg->qtbl_num[2]);

	mtk_jpeg_dec_set_sampling_factor(base, cfg->comp_num,

					 cfg->sampling_w[0],

					 cfg->sampling_h[0],

					 cfg->sampling_w[1],

					 cfg->sampling_h[1],

					 cfg->sampling_w[2],

					 cfg->sampling_h[2]);

	mtk_jpeg_dec_set_mem_stride(base, cfg->mem_stride[0],

				    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],

				   fb->plane_addr[1], fb->plane_addr[2]);

	mtk_jpeg_dec_set_dst_bank1(base, 0, 0, 0);

	mtk_jpeg_dec_set_dma_group(base, config->dma_mcu, config->dma_group,

				   config->dma_last_mcu);

	mtk_jpeg_dec_set_pause_mcu_idx(base, config->total_mcu);

	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);

}

EXPORT_SYMBOL_GPL(mtk_jpeg_dec_set_config);

drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h

+2 −1
Original line number Diff line number Diff line
@@ -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/mediatek/jpeg/mtk_jpeg_dec_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */