Messages in this thread | | | Subject | Re: [PATCH 4/5] media: mtk-vcodec: Add two error cases upon vpu irq handling | From | Dafna Hirschfeld <> | Date | Fri, 6 Aug 2021 09:48:39 +0200 |
| |
On 06.08.21 08:58, Irui Wang (王瑞) wrote: > On Wed, 2021-08-04 at 16:27 +0200, Dafna Hirschfeld wrote: >> 1. Fail if the function mtk_vcodec_fw_map_dm_addr >> returns ERR pointer. >> 2. Fail if the state from the vpu msg is either >> VEN_IPI_MSG_ENC_STATE_ERROR or VEN_IPI_MSG_ENC_STATE_PART >> >> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> >> --- >> drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c >> b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c >> index 32dc844d16f9..234705ba7cd6 100644 >> --- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c >> +++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c >> @@ -17,6 +17,8 @@ static int handle_enc_init_msg(struct venc_vpu_inst >> *vpu, const void *data) >> vpu->vsi = mtk_vcodec_fw_map_dm_addr(vpu->ctx->dev->fw_handler, >> msg->vpu_inst_addr); >> >> + if (IS_ERR(vpu->vsi)) >> + return PTR_ERR(vpu->vsi); >> /* Firmware version field value is unspecified on MT8173. */ >> if (vpu->ctx->dev->venc_pdata->chip == MTK_MT8173) >> return 0; >> @@ -42,6 +44,12 @@ static int handle_enc_encode_msg(struct >> venc_vpu_inst *vpu, const void *data) >> vpu->state = msg->state; >> vpu->bs_size = msg->bs_size; >> vpu->is_key_frm = msg->is_key_frm; >> + if (vpu->state == VEN_IPI_MSG_ENC_STATE_ERROR || >> + vpu->state == VEN_IPI_MSG_ENC_STATE_PART) { >> + mtk_vcodec_err(vpu, "bad ipi-enc-state: %s", >> + vpu->state == >> VEN_IPI_MSG_ENC_STATE_ERROR ? "ERR" : "PART"); >> + return -EINVAL; >> + } > > Hi Dafna, > > This state check is useless, the enc result will check in > "vpu_enc_ipi_handler". >
Hi, thanks for reviewing. I see that the vpu_enc_ipi_handler only test the msg->status and I see that the states are not tested anywhere except of "skip" state in the h264 enc.
Can't there be a scenario where msg->status is ok but the state is error? I am testing the vp8 encoder on chromeos and at some point the encoder interrupts stop arriving so I try to figure out why and report any possible error.
Thanks, Dafna
> Thanks > >> return 0; >> } >>
| |