Messages in this thread | | | Subject | Re: [PATCH 4/7] media: hantro: move postproc enablement for old cores | From | Andrzej Pietrasiewicz <> | Date | Tue, 23 Nov 2021 13:12:04 +0100 |
| |
Hi Jernej,
W dniu 22.11.2021 o 19:46, Jernej Skrabec pisze: > Older G2 cores, like that in Allwinner H6, seem to have issue with > latching postproc register values if this is first thing done in job. > Moving that to the end solves the issue. > > Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com> > --- > drivers/staging/media/hantro/hantro_drv.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > index 8c3de31f51b3..530994ab3024 100644 > --- a/drivers/staging/media/hantro/hantro_drv.c > +++ b/drivers/staging/media/hantro/hantro_drv.c > @@ -130,7 +130,7 @@ void hantro_start_prepare_run(struct hantro_ctx *ctx) > v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req, > &ctx->ctrl_handler); > > - if (!ctx->is_encoder) { > + if (!ctx->is_encoder && !ctx->dev->variant->legacy_regs) { > if (hantro_needs_postproc(ctx, ctx->vpu_dst_fmt)) > hantro_postproc_enable(ctx); > else > @@ -142,6 +142,13 @@ void hantro_end_prepare_run(struct hantro_ctx *ctx) > { > struct vb2_v4l2_buffer *src_buf; > > + if (ctx->dev->variant->legacy_regs && !ctx->is_encoder) {
My personal preference would be to alter the order to match what is in hantro_start_prepare_run(), and add a comment:
+ /* + * Older G2 cores, like that in Allwinner H6, seem to have issue with + * latching postproc register values if this is first thing done in job. + * Moving that to the end solves the issue. + */ + if (!ctx->is_encoder && ctx->dev->variant->legacy_regs) {
With that changed,
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> + if (hantro_needs_postproc(ctx, ctx->vpu_dst_fmt)) > + hantro_postproc_enable(ctx); > + else > + hantro_postproc_disable(ctx); > + } > + > src_buf = hantro_get_src_buf(ctx); > v4l2_ctrl_request_complete(src_buf->vb2_buf.req_obj.req, > &ctx->ctrl_handler); >
| |