hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: mtk-vcodec: venc: support SCP firmware 

Support the new extended firmware used by MT8183's encoder.

[acourbot: refactor, cleanup and split]
[hverkuil: fixed some checkpatch alignment warnings]

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Co-developed-by: Alexandre Courbot <acourbot@chromium.org>
Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Yunfei Dong 2020-08-21 12:35:55 +02:00 committed by Mauro Carvalho Chehab
parent c7244811b1
commit 0dc4b32861
8 changed files with 202 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
View File

@ -300,6 +300,19 @@ struct mtk_vcodec_ctx {
};
/**
* struct mtk_vcodec_enc_pdata - compatible data for each IC
*
* @uses_ext: whether the encoder uses the extended firmware messaging format
* @has_lt_irq: whether the encoder uses the LT irq
*/
struct mtk_vcodec_enc_pdata {
bool uses_ext;
bool has_lt_irq;
};
#define MTK_ENC_CTX_IS_EXT(ctx) ((ctx)->dev->venc_pdata->uses_ext)
/**
* struct mtk_vcodec_dev - driver data
* @v4l2_dev: V4L2 device to register video devices for.
@ -348,6 +361,7 @@ struct mtk_vcodec_dev {
spinlock_t irqlock;
struct mtk_vcodec_ctx *curr_ctx;
void __iomem *reg_base[NUM_MAX_VCODEC_REG_BASE];
const struct mtk_vcodec_enc_pdata *venc_pdata;
struct mtk_vcodec_fw *fw_handler;

58
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
View File

@ -221,7 +221,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
struct resource *res;
phandle rproc_phandle;
enum mtk_vcodec_fw_type fw_type;
int i, j, ret;
int ret;
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
if (!dev)
@ -253,21 +253,20 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
if (IS_ERR(dev->fw_handler))
return PTR_ERR(dev->fw_handler);
dev->venc_pdata = of_device_get_match_data(&pdev->dev);
ret = mtk_vcodec_init_enc_pm(dev);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to get mt vcodec clock source!");
goto err_enc_pm;
}
for (i = VENC_SYS, j = 0; i < NUM_MAX_VCODEC_REG_BASE; i++, j++) {
res = platform_get_resource(pdev, IORESOURCE_MEM, j);
dev->reg_base[i] = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR((__force void *)dev->reg_base[i])) {
ret = PTR_ERR((__force void *)dev->reg_base[i]);
goto err_res;
}
mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[i]);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dev->reg_base[VENC_SYS] = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR((__force void *)dev->reg_base[VENC_SYS])) {
ret = PTR_ERR((__force void *)dev->reg_base[VENC_SYS]);
goto err_res;
}
mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_SYS]);
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (res == NULL) {
@ -287,21 +286,32 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
ret = -EINVAL;
goto err_res;
}
disable_irq(dev->enc_irq);
dev->enc_lt_irq = platform_get_irq(pdev, 1);
ret = devm_request_irq(&pdev->dev,
dev->enc_lt_irq, mtk_vcodec_enc_lt_irq_handler,
0, pdev->name, dev);
if (ret) {
dev_err(&pdev->dev,
"Failed to install dev->enc_lt_irq %d (%d)",
dev->enc_lt_irq, ret);
ret = -EINVAL;
goto err_res;
if (dev->venc_pdata->has_lt_irq) {
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
dev->reg_base[VENC_LT_SYS] = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR((__force void *)dev->reg_base[VENC_LT_SYS])) {
ret = PTR_ERR((__force void *)dev->reg_base[VENC_LT_SYS]);
goto err_res;
}
mtk_v4l2_debug(2, "reg[%d] base=0x%p", i, dev->reg_base[VENC_LT_SYS]);
dev->enc_lt_irq = platform_get_irq(pdev, 1);
ret = devm_request_irq(&pdev->dev,
dev->enc_lt_irq,
mtk_vcodec_enc_lt_irq_handler,
0, pdev->name, dev);
if (ret) {
dev_err(&pdev->dev,
"Failed to install dev->enc_lt_irq %d (%d)",
dev->enc_lt_irq, ret);
ret = -EINVAL;
goto err_res;
}
disable_irq(dev->enc_lt_irq); /* VENC_LT */
}
disable_irq(dev->enc_irq);
disable_irq(dev->enc_lt_irq); /* VENC_LT */
mutex_init(&dev->enc_mutex);
mutex_init(&dev->dev_mutex);
spin_lock_init(&dev->irqlock);
@ -382,8 +392,12 @@ err_enc_pm:
return ret;
}
static const struct mtk_vcodec_enc_pdata mt8173_pdata = {
.has_lt_irq = true,
};
static const struct of_device_id mtk_vcodec_enc_match[] = {
{.compatible = "mediatek,mt8173-vcodec-enc",},
{.compatible = "mediatek,mt8173-vcodec-enc", .data = &mt8173_pdata},
{},
};
MODULE_DEVICE_TABLE(of, mtk_vcodec_enc_match);

53
drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
View File

@ -24,6 +24,16 @@ static const char h264_filler_marker[] = {0x0, 0x0, 0x0, 0x1, 0xc};
#define H264_FILLER_MARKER_SIZE ARRAY_SIZE(h264_filler_marker)
#define VENC_PIC_BITSTREAM_BYTE_CNT 0x0098
/*
* enum venc_h264_frame_type - h264 encoder output bitstream frame type
*/
enum venc_h264_frame_type {
VENC_H264_IDR_FRM,
VENC_H264_I_FRM,
VENC_H264_P_FRM,
VENC_H264_B_FRM,
};
/*
* enum venc_h264_vpu_work_buf - h264 encoder buffer index
*/
@ -138,6 +148,7 @@ struct venc_h264_inst {
struct mtk_vcodec_mem pps_buf;
bool work_buf_allocated;
unsigned int frm_cnt;
unsigned int skip_frm_cnt;
unsigned int prepend_hdr;
struct venc_vpu_inst vpu_inst;
struct venc_h264_vsi *vsi;
@ -327,6 +338,22 @@ static unsigned int h264_enc_wait_venc_done(struct venc_h264_inst *inst)
return irq_status;
}
static int h264_frame_type(struct venc_h264_inst *inst)
{
if ((inst->vsi->config.gop_size != 0 &&
(inst->frm_cnt % inst->vsi->config.gop_size) == 0) ||
(inst->frm_cnt == 0 && inst->vsi->config.gop_size == 0)) {
/* IDR frame */
return VENC_H264_IDR_FRM;
} else if ((inst->vsi->config.intra_period != 0 &&
(inst->frm_cnt % inst->vsi->config.intra_period) == 0) ||
(inst->frm_cnt == 0 && inst->vsi->config.intra_period == 0)) {
/* I frame */
return VENC_H264_I_FRM;
} else {
return VENC_H264_P_FRM; /* Note: B frames are not supported */
}
}
static int h264_encode_sps(struct venc_h264_inst *inst,
struct mtk_vcodec_mem *bs_buf,
unsigned int *bs_size)
@ -337,7 +364,7 @@ static int h264_encode_sps(struct venc_h264_inst *inst,
mtk_vcodec_debug_enter(inst);
ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL,
bs_buf, bs_size);
bs_buf, bs_size, NULL);
if (ret)
return ret;
@ -364,7 +391,7 @@ static int h264_encode_pps(struct venc_h264_inst *inst,
mtk_vcodec_debug_enter(inst);
ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL,
bs_buf, bs_size);
bs_buf, bs_size, NULL);
if (ret)
return ret;
@ -410,11 +437,18 @@ static int h264_encode_frame(struct venc_h264_inst *inst,
{
int ret = 0;
unsigned int irq_status;
struct venc_frame_info frame_info;
mtk_vcodec_debug_enter(inst);
mtk_vcodec_debug(inst, "frm_cnt = %d\n ", inst->frm_cnt);
frame_info.frm_count = inst->frm_cnt;
frame_info.skip_frm_count = inst->skip_frm_cnt;
frame_info.frm_type = h264_frame_type(inst);
mtk_vcodec_debug(inst, "frm_count = %d,skip_frm_count =%d,frm_type=%d.\n",
frame_info.frm_count, frame_info.skip_frm_count,
frame_info.frm_type);
ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf,
bs_buf, bs_size);
bs_buf, bs_size, &frame_info);
if (ret)
return ret;
@ -428,6 +462,7 @@ static int h264_encode_frame(struct venc_h264_inst *inst,
inst->work_bufs[VENC_H264_VPU_WORK_BUF_SKIP_FRAME].va,
*bs_size);
++inst->frm_cnt;
++inst->skip_frm_cnt;
return ret;
}
@ -464,6 +499,7 @@ static void h264_encode_filler(struct venc_h264_inst *inst, void *buf,
static int h264_enc_init(struct mtk_vcodec_ctx *ctx)
{
const bool is_ext = MTK_ENC_CTX_IS_EXT(ctx);
int ret = 0;
struct venc_h264_inst *inst;
@ -473,7 +509,7 @@ static int h264_enc_init(struct mtk_vcodec_ctx *ctx)
inst->ctx = ctx;
inst->vpu_inst.ctx = ctx;
inst->vpu_inst.id = IPI_VENC_H264;
inst->vpu_inst.id = is_ext ? SCP_IPI_VENC_H264 : IPI_VENC_H264;
inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx, VENC_SYS);
mtk_vcodec_debug_enter(inst);
@ -629,7 +665,12 @@ static int h264_enc_set_param(void *handle,
inst->prepend_hdr = 1;
mtk_vcodec_debug(inst, "set prepend header mode");
break;
case VENC_SET_PARAM_FORCE_INTRA:
case VENC_SET_PARAM_GOP_SIZE:
case VENC_SET_PARAM_INTRA_PERIOD:
inst->frm_cnt = 0;
inst->skip_frm_cnt = 0;
fallthrough;
default:
ret = vpu_enc_set_param(&inst->vpu_inst, type, enc_prm);
break;

3
drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
View File

@ -302,7 +302,8 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst,
mtk_vcodec_debug(inst, "->frm_cnt=%d", inst->frm_cnt);
ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size);
ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size,
NULL);
if (ret)
return ret;

13
drivers/media/platform/mtk-vcodec/venc_drv_if.h
View File

@ -92,6 +92,19 @@ struct venc_enc_param {
unsigned int gop_size;
};
/**
* struct venc_frame_info - per-frame information to pass to the firmware.
*
* @frm_count: sequential number for this frame
* @skip_frm_count: number of frames skipped so far while decoding
* @frm_type: type of the frame, from enum venc_h264_frame_type
*/
struct venc_frame_info {
unsigned int frm_count; /* per frame update */
unsigned int skip_frm_count; /* per frame update */
unsigned int frm_type; /* per frame update */
};
/*
* struct venc_frm_buf - frame buffer information used in venc_if_encode()
* @fb_addr: plane frame buffer addresses

18
drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
View File

@ -62,6 +62,11 @@ struct venc_ap_ipi_msg_set_param {
uint32_t data[8];
};
struct venc_ap_ipi_msg_set_param_ext {
struct venc_ap_ipi_msg_set_param base;
uint32_t data_ext[24];
};
/**
* struct venc_ap_ipi_msg_enc - AP to VPU enc cmd structure
* @msg_id: message id (AP_IPIMSG_XXX_ENC_ENCODE)
@ -82,6 +87,19 @@ struct venc_ap_ipi_msg_enc {
uint32_t bs_size;
};
/**
* struct venc_ap_ipi_msg_enc_ext - AP to SCP extended enc cmd structure
*
* @base: base msg structure
* @data_item: number of items in the data array
* @data[8]: data array to store the set parameters
*/
struct venc_ap_ipi_msg_enc_ext {
struct venc_ap_ipi_msg_enc base;
uint32_t data_item;
uint32_t data[32];
};
/**
* struct venc_ap_ipi_msg_deinit - AP to VPU deinit cmd structure
* @msg_id: message id (AP_IPIMSG_XXX_ENC_DEINIT)

97
drivers/media/platform/mtk-vcodec/venc_vpu_if.c
View File

@ -116,49 +116,81 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
return 0;
}
static unsigned int venc_enc_param_crop_right(struct venc_vpu_inst *vpu,
struct venc_enc_param *enc_prm)
{
unsigned int img_crop_right = enc_prm->buf_width - enc_prm->width;
return img_crop_right % 16;
}
static unsigned int venc_enc_param_crop_bottom(struct venc_enc_param *enc_prm)
{
return round_up(enc_prm->height, 16) - enc_prm->height;
}
static unsigned int venc_enc_param_num_mb(struct venc_enc_param *enc_prm)
{
return DIV_ROUND_UP(enc_prm->width, 16) *
DIV_ROUND_UP(enc_prm->height, 16);
}
int vpu_enc_set_param(struct venc_vpu_inst *vpu,
enum venc_set_param_type id,
struct venc_enc_param *enc_param)
{
struct venc_ap_ipi_msg_set_param out;
const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx);
size_t msg_size = is_ext ?
sizeof(struct venc_ap_ipi_msg_set_param_ext) :
sizeof(struct venc_ap_ipi_msg_set_param);
struct venc_ap_ipi_msg_set_param_ext out;
mtk_vcodec_debug(vpu, "id %d ->", id);
memset(&out, 0, sizeof(out));
out.msg_id = AP_IPIMSG_ENC_SET_PARAM;
out.vpu_inst_addr = vpu->inst_addr;
out.param_id = id;
out.base.msg_id = AP_IPIMSG_ENC_SET_PARAM;
out.base.vpu_inst_addr = vpu->inst_addr;
out.base.param_id = id;
switch (id) {
case VENC_SET_PARAM_ENC:
out.data_item = 0;
if (is_ext) {
out.base.data_item = 3;
out.base.data[0] =
venc_enc_param_crop_right(vpu, enc_param);
out.base.data[1] =
venc_enc_param_crop_bottom(enc_param);
out.base.data[2] = venc_enc_param_num_mb(enc_param);
} else {
out.base.data_item = 0;
}
break;
case VENC_SET_PARAM_FORCE_INTRA:
out.data_item = 0;
out.base.data_item = 0;
break;
case VENC_SET_PARAM_ADJUST_BITRATE:
out.data_item = 1;
out.data[0] = enc_param->bitrate;
out.base.data_item = 1;
out.base.data[0] = enc_param->bitrate;
break;
case VENC_SET_PARAM_ADJUST_FRAMERATE:
out.data_item = 1;
out.data[0] = enc_param->frm_rate;
out.base.data_item = 1;
out.base.data[0] = enc_param->frm_rate;
break;
case VENC_SET_PARAM_GOP_SIZE:
out.data_item = 1;
out.data[0] = enc_param->gop_size;
out.base.data_item = 1;
out.base.data[0] = enc_param->gop_size;
break;
case VENC_SET_PARAM_INTRA_PERIOD:
out.data_item = 1;
out.data[0] = enc_param->intra_period;
out.base.data_item = 1;
out.base.data[0] = enc_param->intra_period;
break;
case VENC_SET_PARAM_SKIP_FRAME:
out.data_item = 0;
out.base.data_item = 0;
break;
default:
mtk_vcodec_err(vpu, "id %d not supported", id);
return -EINVAL;
}
if (vpu_enc_send_msg(vpu, &out, sizeof(out))) {
if (vpu_enc_send_msg(vpu, &out, msg_size)) {
mtk_vcodec_err(vpu,
"AP_IPIMSG_ENC_SET_PARAM %d fail", id);
return -EINVAL;
@ -172,33 +204,44 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,
int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode,
struct venc_frm_buf *frm_buf,
struct mtk_vcodec_mem *bs_buf,
unsigned int *bs_size)
unsigned int *bs_size,
struct venc_frame_info *frame_info)
{
struct venc_ap_ipi_msg_enc out;
const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx);
size_t msg_size = is_ext ?
sizeof(struct venc_ap_ipi_msg_enc_ext) :
sizeof(struct venc_ap_ipi_msg_enc);
struct venc_ap_ipi_msg_enc_ext out;
mtk_vcodec_debug(vpu, "bs_mode %d ->", bs_mode);
memset(&out, 0, sizeof(out));
out.msg_id = AP_IPIMSG_ENC_ENCODE;
out.vpu_inst_addr = vpu->inst_addr;
out.bs_mode = bs_mode;
out.base.msg_id = AP_IPIMSG_ENC_ENCODE;
out.base.vpu_inst_addr = vpu->inst_addr;
out.base.bs_mode = bs_mode;
if (frm_buf) {
if ((frm_buf->fb_addr[0].dma_addr % 16 == 0) &&
(frm_buf->fb_addr[1].dma_addr % 16 == 0) &&
(frm_buf->fb_addr[2].dma_addr % 16 == 0)) {
out.input_addr[0] = frm_buf->fb_addr[0].dma_addr;
out.input_addr[1] = frm_buf->fb_addr[1].dma_addr;
out.input_addr[2] = frm_buf->fb_addr[2].dma_addr;
out.base.input_addr[0] = frm_buf->fb_addr[0].dma_addr;
out.base.input_addr[1] = frm_buf->fb_addr[1].dma_addr;
out.base.input_addr[2] = frm_buf->fb_addr[2].dma_addr;
} else {
mtk_vcodec_err(vpu, "dma_addr not align to 16");
return -EINVAL;
}
}
if (bs_buf) {
out.bs_addr = bs_buf->dma_addr;
out.bs_size = bs_buf->size;
out.base.bs_addr = bs_buf->dma_addr;
out.base.bs_size = bs_buf->size;
}
if (vpu_enc_send_msg(vpu, &out, sizeof(out))) {
if (is_ext && frame_info) {
out.data_item = 3;
out.data[0] = frame_info->frm_count;
out.data[1] = frame_info->skip_frm_count;
out.data[2] = frame_info->frm_type;
}
if (vpu_enc_send_msg(vpu, &out, msg_size)) {
mtk_vcodec_err(vpu, "AP_IPIMSG_ENC_ENCODE %d fail",
bs_mode);
return -EINVAL;

3
drivers/media/platform/mtk-vcodec/venc_vpu_if.h
View File

@ -45,7 +45,8 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,
int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode,
struct venc_frm_buf *frm_buf,
struct mtk_vcodec_mem *bs_buf,
unsigned int *bs_size);
unsigned int *bs_size,
struct venc_frame_info *frame_info);
int vpu_enc_deinit(struct venc_vpu_inst *vpu);
#endif