mbox series

[v2,00/13] AV1 stateless decoder for RK3588

Message ID 20230103170058.810597-1-benjamin.gaignard@collabora.com
Headers show
Series AV1 stateless decoder for RK3588 | expand

Message

Benjamin Gaignard Jan. 3, 2023, 5 p.m. UTC
This series implement AV1 stateless decoder for RK3588 SoC.
The hardware support 8 and 10 bits bitstreams up to 7680x4320.
AV1 feature like film grain or scaling are done by the postprocessor.
The driver can produce NV12_4L4, NV12_10LE40_4L4, NV12 and P010 pixels formats.
Even if Rockchip have named the hardware VPU981 it looks like a VC9000 but 
with a different registers mapping.

It is based on Daniel's "[PATCH v4] media: Add AV1 uAPI" [1] patches and
Sebastian's device-tree patches for RK3588.

The full branch can be found here:
https://gitlab.collabora.com/linux/for-upstream/-/commits/rk3588_av1_decoder_v2

Fluster score is: 200/239 while testing AV1-TEST-VECTORS with GStreamer-AV1-V4L2SL-Gst1.0.
The failing tests are:
- the 2 tests with 2 spatial layers: few errors in luma/chroma values
- tests with resolution < hardware limit (64x64)
- 10bits film grain test: bad macroblocks while decoding, the same 8bits
  test is working fine.

Changes in v2:
- Remove useless +1 in sbs computation. 
- Describe NV12_10LE40_4L4 pixels format.
- Post-processor could generate P010.
- Fix comments done on v1.
- The last patch make sure that only post-processed formats are used when film
  grain feature is enabled.

Benjamin

[1] https://lore.kernel.org/linux-media/20230103154832.6982-1-daniel.almeida@collabora.com/T/#u
 
Benjamin Gaignard (12):
  dt-bindings: media: rockchip-vpu: Add rk3588 vpu compatible
  media: Add NV12_10LE40_4L4 pixel format
  media: verisilicon: Get bit depth for V4L2_PIX_FMT_NV12_10LE40_4L4
  media: verisilicon: Add AV1 decoder mode and controls
  media: verisilicon: Save bit depth for AV1 decoder
  media: verisilicon: Check AV1 bitstreams bit depth
  media: verisilicon: Compute motion vectors size for AV1 frames
  media: verisilicon: Add AV1 entropy helpers
  media: verisilicon: Add Rockchip AV1 decoder
  media: verisilicon: Add film grain feature to AV1 driver
  media: verisilicon: Enable AV1 decoder on rk3588
  media: verisilicon: Conditionnaly ignore native formats

Nicolas Dufresne (1):
  v4l2-common: Add support for fractional bpp

 .../bindings/media/rockchip-vpu.yaml          |    1 +
 .../media/v4l/pixfmt-yuv-planar.rst           |    4 +
 drivers/media/platform/verisilicon/Makefile   |    3 +
 drivers/media/platform/verisilicon/hantro.h   |    8 +
 .../media/platform/verisilicon/hantro_drv.c   |   65 +
 .../media/platform/verisilicon/hantro_hw.h    |  103 +
 .../platform/verisilicon/hantro_postproc.c    |    7 +
 .../media/platform/verisilicon/hantro_v4l2.c  |   52 +-
 .../verisilicon/rockchip_av1_entropymode.c    | 4546 +++++++++++++++++
 .../verisilicon/rockchip_av1_entropymode.h    |  272 +
 .../verisilicon/rockchip_av1_filmgrain.c      |  401 ++
 .../verisilicon/rockchip_av1_filmgrain.h      |   36 +
 .../verisilicon/rockchip_vpu981_hw_av1_dec.c  | 2278 +++++++++
 .../verisilicon/rockchip_vpu981_regs.h        |  477 ++
 .../platform/verisilicon/rockchip_vpu_hw.c    |  119 +
 drivers/media/v4l2-core/v4l2-common.c         |  149 +-
 drivers/media/v4l2-core/v4l2-ioctl.c          |    1 +
 include/media/v4l2-common.h                   |    2 +
 include/uapi/linux/videodev2.h                |    1 +
 19 files changed, 8438 insertions(+), 87 deletions(-)
 create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_entropymode.c
 create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_entropymode.h
 create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_filmgrain.c
 create mode 100644 drivers/media/platform/verisilicon/rockchip_av1_filmgrain.h
 create mode 100644 drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c
 create mode 100644 drivers/media/platform/verisilicon/rockchip_vpu981_regs.h

Comments

Ezequiel Garcia Jan. 4, 2023, 7:33 p.m. UTC | #1
Hi Benjamin,

Thanks for the patch.

On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
> The driver supports 8 and 10 bits bitstreams, make sure to discard
> other cases.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> ---
>  drivers/media/platform/verisilicon/hantro_drv.c | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
> index 8e93710dcfed..16539e89935c 100644
> --- a/drivers/media/platform/verisilicon/hantro_drv.c
> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
> @@ -282,7 +282,13 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
>                 /* We only support profile 0 */
>                 if (dec_params->profile != 0)
>                         return -EINVAL;
> +       } else if (ctrl->id == V4L2_CID_STATELESS_AV1_SEQUENCE) {
> +               const struct v4l2_ctrl_av1_sequence *sequence = ctrl->p_new.p_av1_sequence;
> +
> +               if (sequence->bit_depth != 8 && sequence->bit_depth != 10)
> +                       return -EINVAL;
>         }
> +
>         return 0;
>  }
>
> @@ -333,7 +339,13 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
>
>         switch (ctrl->id) {
>         case V4L2_CID_STATELESS_AV1_SEQUENCE:
> -               ctx->bit_depth = ctrl->p_new.p_av1_sequence->bit_depth;
> +               int bit_depth = ctrl->p_new.p_av1_sequence->bit_depth;
> +
> +               if (vb2_is_streaming(v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx)))
> +                       if (ctx->bit_depth != bit_depth)
> +                               return -EINVAL;
> +

Please use the v4l2_ctrl_grab API. Can you send a separate series to address
this for the other codecs?

Thanks a lot!
Ezequiel

> +               ctx->bit_depth = bit_depth;
>                 break;
>         default:
>                 return -EINVAL;
> --
> 2.34.1
>
Benjamin Gaignard Jan. 5, 2023, 7:52 a.m. UTC | #2
Le 04/01/2023 à 20:33, Ezequiel Garcia a écrit :
> Hi Benjamin,
>
> Thanks for the patch.
>
> On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
> <benjamin.gaignard@collabora.com> wrote:
>> The driver supports 8 and 10 bits bitstreams, make sure to discard
>> other cases.
>>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
>> ---
>>   drivers/media/platform/verisilicon/hantro_drv.c | 14 +++++++++++++-
>>   1 file changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
>> index 8e93710dcfed..16539e89935c 100644
>> --- a/drivers/media/platform/verisilicon/hantro_drv.c
>> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
>> @@ -282,7 +282,13 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
>>                  /* We only support profile 0 */
>>                  if (dec_params->profile != 0)
>>                          return -EINVAL;
>> +       } else if (ctrl->id == V4L2_CID_STATELESS_AV1_SEQUENCE) {
>> +               const struct v4l2_ctrl_av1_sequence *sequence = ctrl->p_new.p_av1_sequence;
>> +
>> +               if (sequence->bit_depth != 8 && sequence->bit_depth != 10)
>> +                       return -EINVAL;
>>          }
>> +
>>          return 0;
>>   }
>>
>> @@ -333,7 +339,13 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
>>
>>          switch (ctrl->id) {
>>          case V4L2_CID_STATELESS_AV1_SEQUENCE:
>> -               ctx->bit_depth = ctrl->p_new.p_av1_sequence->bit_depth;
>> +               int bit_depth = ctrl->p_new.p_av1_sequence->bit_depth;
>> +
>> +               if (vb2_is_streaming(v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx)))
>> +                       if (ctx->bit_depth != bit_depth)
>> +                               return -EINVAL;
>> +
> Please use the v4l2_ctrl_grab API. Can you send a separate series to address
> this for the other codecs?

I have tried to use v4l2_ctrl_grab API but when you grab a control you can set it anymore
and V4L2_CID_STATELESS_AV1_SEQUENCE is send for each frame so it blocks everything.

Benjamin

>
> Thanks a lot!
> Ezequiel
>
>> +               ctx->bit_depth = bit_depth;
>>                  break;
>>          default:
>>                  return -EINVAL;
>> --
>> 2.34.1
>>
Ezequiel Garcia Jan. 8, 2023, 9:12 p.m. UTC | #3
On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
> AV1 film grain feature requires to use the postprocessor to produce
> valid frames. In such case the driver shouldn't propose native pixels
> format but only post-processed pixels format.
> If a codec set need_postproc field in hantro_ctx structure to true
> native pixel formats will be ignored.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> ---
>  drivers/media/platform/verisilicon/hantro.h   |  3 ++
>  .../media/platform/verisilicon/hantro_drv.c   |  5 ++
>  .../platform/verisilicon/hantro_postproc.c    |  4 ++
>  .../media/platform/verisilicon/hantro_v4l2.c  | 46 +++++++++++++------
>  4 files changed, 45 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h
> index a98cb40a8d3b..7a5357e810fb 100644
> --- a/drivers/media/platform/verisilicon/hantro.h
> +++ b/drivers/media/platform/verisilicon/hantro.h
> @@ -231,6 +231,8 @@ struct hantro_dev {
>   * @ctrl_handler:      Control handler used to register controls.
>   * @jpeg_quality:      User-specified JPEG compression quality.
>   * @bit_depth:         Bit depth of current frame
> + * @need_postproc:     Set to true if the bitstream features require to
> + *                     use the post-processor.
>   *
>   * @codec_ops:         Set of operations related to codec mode.
>   * @postproc:          Post-processing context.
> @@ -258,6 +260,7 @@ struct hantro_ctx {
>         struct v4l2_ctrl_handler ctrl_handler;
>         int jpeg_quality;
>         int bit_depth;
> +       bool need_postproc;
>
>         const struct hantro_codec_ops *codec_ops;
>         struct hantro_postproc_ctx postproc;
> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
> index 4fc6dea16ae6..8d7055c0bf3b 100644
> --- a/drivers/media/platform/verisilicon/hantro_drv.c
> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
> @@ -346,6 +346,11 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
>                                 return -EINVAL;
>
>                 ctx->bit_depth = bit_depth;
> +
> +               if (ctrl->p_new.p_av1_sequence->flags
> +                   & V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT)
> +                       ctx->need_postproc = true;
> +
>                 break;
>         default:
>                 return -EINVAL;
> diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c
> index 7dc39519a2ee..293e5612e2ce 100644
> --- a/drivers/media/platform/verisilicon/hantro_postproc.c
> +++ b/drivers/media/platform/verisilicon/hantro_postproc.c
> @@ -57,6 +57,10 @@ bool hantro_needs_postproc(const struct hantro_ctx *ctx,
>  {
>         if (ctx->is_encoder)
>                 return false;
> +
> +       if (ctx->need_postproc)
> +               return true;
> +
>         return fmt->postprocessed;
>  }
>
> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
> index bbe79dbd2cd9..5c381766cca3 100644
> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
> @@ -38,6 +38,11 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts)
>  {
>         const struct hantro_fmt *formats;
>
> +       if (ctx->need_postproc) {
> +               *num_fmts = 0;
> +               return NULL;
> +       }
> +
>         if (ctx->is_encoder) {
>                 formats = ctx->dev->variant->enc_fmts;
>                 *num_fmts = ctx->dev->variant->num_enc_fmts;
> @@ -132,6 +137,15 @@ hantro_get_default_fmt(const struct hantro_ctx *ctx, bool bitstream)
>                     hantro_check_depth_match(ctx, &formats[i]))
>                         return &formats[i];
>         }
> +
> +       formats = hantro_get_postproc_formats(ctx, &num_fmts);
> +       for (i = 0; i < num_fmts; i++) {
> +               if (bitstream == (formats[i].codec_mode !=
> +                                 HANTRO_MODE_NONE) &&
> +                   hantro_check_depth_match(ctx, &formats[i]))
> +                       return &formats[i];
> +       }
> +
>         return NULL;
>  }
>
> @@ -261,19 +275,6 @@ static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
>         return 0;
>  }
>
> -static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> -                                  struct v4l2_format *f)
> -{
> -       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> -       struct hantro_ctx *ctx = fh_to_ctx(priv);
> -
> -       vpu_debug(4, "f->type = %d\n", f->type);
> -
> -       *pix_mp = ctx->dst_fmt;
> -
> -       return 0;
> -}
> -
>  static int hantro_try_fmt(const struct hantro_ctx *ctx,
>                           struct v4l2_pix_format_mplane *pix_mp,
>                           enum v4l2_buf_type type)
> @@ -353,6 +354,25 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
>         return 0;
>  }
>
> +static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> +                                  struct v4l2_format *f)
> +{
> +       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> +       struct hantro_ctx *ctx = fh_to_ctx(priv);
> +       int ret;
> +
> +       vpu_debug(4, "f->type = %d\n", f->type);
> +
> +       ret = hantro_try_fmt(ctx, pix_mp, f->type);
> +       if (ret)
> +               return ret;
> +
> +       ctx->vpu_dst_fmt = hantro_find_format(ctx, pix_mp->pixelformat);
> +       ctx->dst_fmt = *pix_mp;
> +

This looks like the g_fmt is setting some state in the context,
this looks incorrect.

Thanks,
Ezequiel
Benjamin Gaignard Jan. 9, 2023, 9:05 a.m. UTC | #4
Le 08/01/2023 à 22:12, Ezequiel Garcia a écrit :
> On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
> <benjamin.gaignard@collabora.com> wrote:
>> AV1 film grain feature requires to use the postprocessor to produce
>> valid frames. In such case the driver shouldn't propose native pixels
>> format but only post-processed pixels format.
>> If a codec set need_postproc field in hantro_ctx structure to true
>> native pixel formats will be ignored.
>>
>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
>> ---
>>   drivers/media/platform/verisilicon/hantro.h   |  3 ++
>>   .../media/platform/verisilicon/hantro_drv.c   |  5 ++
>>   .../platform/verisilicon/hantro_postproc.c    |  4 ++
>>   .../media/platform/verisilicon/hantro_v4l2.c  | 46 +++++++++++++------
>>   4 files changed, 45 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h
>> index a98cb40a8d3b..7a5357e810fb 100644
>> --- a/drivers/media/platform/verisilicon/hantro.h
>> +++ b/drivers/media/platform/verisilicon/hantro.h
>> @@ -231,6 +231,8 @@ struct hantro_dev {
>>    * @ctrl_handler:      Control handler used to register controls.
>>    * @jpeg_quality:      User-specified JPEG compression quality.
>>    * @bit_depth:         Bit depth of current frame
>> + * @need_postproc:     Set to true if the bitstream features require to
>> + *                     use the post-processor.
>>    *
>>    * @codec_ops:         Set of operations related to codec mode.
>>    * @postproc:          Post-processing context.
>> @@ -258,6 +260,7 @@ struct hantro_ctx {
>>          struct v4l2_ctrl_handler ctrl_handler;
>>          int jpeg_quality;
>>          int bit_depth;
>> +       bool need_postproc;
>>
>>          const struct hantro_codec_ops *codec_ops;
>>          struct hantro_postproc_ctx postproc;
>> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
>> index 4fc6dea16ae6..8d7055c0bf3b 100644
>> --- a/drivers/media/platform/verisilicon/hantro_drv.c
>> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
>> @@ -346,6 +346,11 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
>>                                  return -EINVAL;
>>
>>                  ctx->bit_depth = bit_depth;
>> +
>> +               if (ctrl->p_new.p_av1_sequence->flags
>> +                   & V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT)
>> +                       ctx->need_postproc = true;
>> +
>>                  break;
>>          default:
>>                  return -EINVAL;
>> diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c
>> index 7dc39519a2ee..293e5612e2ce 100644
>> --- a/drivers/media/platform/verisilicon/hantro_postproc.c
>> +++ b/drivers/media/platform/verisilicon/hantro_postproc.c
>> @@ -57,6 +57,10 @@ bool hantro_needs_postproc(const struct hantro_ctx *ctx,
>>   {
>>          if (ctx->is_encoder)
>>                  return false;
>> +
>> +       if (ctx->need_postproc)
>> +               return true;
>> +
>>          return fmt->postprocessed;
>>   }
>>
>> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
>> index bbe79dbd2cd9..5c381766cca3 100644
>> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
>> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
>> @@ -38,6 +38,11 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts)
>>   {
>>          const struct hantro_fmt *formats;
>>
>> +       if (ctx->need_postproc) {
>> +               *num_fmts = 0;
>> +               return NULL;
>> +       }
>> +
>>          if (ctx->is_encoder) {
>>                  formats = ctx->dev->variant->enc_fmts;
>>                  *num_fmts = ctx->dev->variant->num_enc_fmts;
>> @@ -132,6 +137,15 @@ hantro_get_default_fmt(const struct hantro_ctx *ctx, bool bitstream)
>>                      hantro_check_depth_match(ctx, &formats[i]))
>>                          return &formats[i];
>>          }
>> +
>> +       formats = hantro_get_postproc_formats(ctx, &num_fmts);
>> +       for (i = 0; i < num_fmts; i++) {
>> +               if (bitstream == (formats[i].codec_mode !=
>> +                                 HANTRO_MODE_NONE) &&
>> +                   hantro_check_depth_match(ctx, &formats[i]))
>> +                       return &formats[i];
>> +       }
>> +
>>          return NULL;
>>   }
>>
>> @@ -261,19 +275,6 @@ static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
>>          return 0;
>>   }
>>
>> -static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
>> -                                  struct v4l2_format *f)
>> -{
>> -       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
>> -       struct hantro_ctx *ctx = fh_to_ctx(priv);
>> -
>> -       vpu_debug(4, "f->type = %d\n", f->type);
>> -
>> -       *pix_mp = ctx->dst_fmt;
>> -
>> -       return 0;
>> -}
>> -
>>   static int hantro_try_fmt(const struct hantro_ctx *ctx,
>>                            struct v4l2_pix_format_mplane *pix_mp,
>>                            enum v4l2_buf_type type)
>> @@ -353,6 +354,25 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
>>          return 0;
>>   }
>>
>> +static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
>> +                                  struct v4l2_format *f)
>> +{
>> +       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
>> +       struct hantro_ctx *ctx = fh_to_ctx(priv);
>> +       int ret;
>> +
>> +       vpu_debug(4, "f->type = %d\n", f->type);
>> +
>> +       ret = hantro_try_fmt(ctx, pix_mp, f->type);
>> +       if (ret)
>> +               return ret;
>> +
>> +       ctx->vpu_dst_fmt = hantro_find_format(ctx, pix_mp->pixelformat);
>> +       ctx->dst_fmt = *pix_mp;
>> +
> This looks like the g_fmt is setting some state in the context,
> this looks incorrect.

Indeed only a call to hantro_try_fmt() is needed here.
I will fix that in v3.

Benjamin

>
> Thanks,
> Ezequiel
Ezequiel Garcia Jan. 10, 2023, 7:28 p.m. UTC | #5
Hi Benjamin,

On Mon, Jan 9, 2023 at 6:05 AM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
>
> Le 08/01/2023 à 22:12, Ezequiel Garcia a écrit :
> > On Tue, Jan 3, 2023 at 2:01 PM Benjamin Gaignard
> > <benjamin.gaignard@collabora.com> wrote:
> >> AV1 film grain feature requires to use the postprocessor to produce
> >> valid frames. In such case the driver shouldn't propose native pixels
> >> format but only post-processed pixels format.
> >> If a codec set need_postproc field in hantro_ctx structure to true
> >> native pixel formats will be ignored.
> >>
> >> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> >> ---
> >>   drivers/media/platform/verisilicon/hantro.h   |  3 ++
> >>   .../media/platform/verisilicon/hantro_drv.c   |  5 ++
> >>   .../platform/verisilicon/hantro_postproc.c    |  4 ++
> >>   .../media/platform/verisilicon/hantro_v4l2.c  | 46 +++++++++++++------
> >>   4 files changed, 45 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h
> >> index a98cb40a8d3b..7a5357e810fb 100644
> >> --- a/drivers/media/platform/verisilicon/hantro.h
> >> +++ b/drivers/media/platform/verisilicon/hantro.h
> >> @@ -231,6 +231,8 @@ struct hantro_dev {
> >>    * @ctrl_handler:      Control handler used to register controls.
> >>    * @jpeg_quality:      User-specified JPEG compression quality.
> >>    * @bit_depth:         Bit depth of current frame
> >> + * @need_postproc:     Set to true if the bitstream features require to
> >> + *                     use the post-processor.
> >>    *
> >>    * @codec_ops:         Set of operations related to codec mode.
> >>    * @postproc:          Post-processing context.
> >> @@ -258,6 +260,7 @@ struct hantro_ctx {
> >>          struct v4l2_ctrl_handler ctrl_handler;
> >>          int jpeg_quality;
> >>          int bit_depth;
> >> +       bool need_postproc;
> >>
> >>          const struct hantro_codec_ops *codec_ops;
> >>          struct hantro_postproc_ctx postproc;
> >> diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
> >> index 4fc6dea16ae6..8d7055c0bf3b 100644
> >> --- a/drivers/media/platform/verisilicon/hantro_drv.c
> >> +++ b/drivers/media/platform/verisilicon/hantro_drv.c
> >> @@ -346,6 +346,11 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl)
> >>                                  return -EINVAL;
> >>
> >>                  ctx->bit_depth = bit_depth;
> >> +
> >> +               if (ctrl->p_new.p_av1_sequence->flags
> >> +                   & V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT)
> >> +                       ctx->need_postproc = true;
> >> +

As discussed with Nicolas in IRC, I believe this should be handled differently.
This case is similar to
https://lore.kernel.org/all/f26407dbf3efc6cc046daaabdbe75c516743a187.camel@collabora.com/
and also similar to
https://elixir.bootlin.com/linux/latest/source/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c#L582.

Setting the SPS control changes the possible pixel formats, so the S_CTRL ioctl
should reset the format.

This means try_fmt should probably either check the (newly) SPS value
or some context fields (ctx->bit_depth, ctx->av1_film_grain, etc.).

Thanks,
Ezeqiuel

> >>                  break;
> >>          default:
> >>                  return -EINVAL;
> >> diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c
> >> index 7dc39519a2ee..293e5612e2ce 100644
> >> --- a/drivers/media/platform/verisilicon/hantro_postproc.c
> >> +++ b/drivers/media/platform/verisilicon/hantro_postproc.c
> >> @@ -57,6 +57,10 @@ bool hantro_needs_postproc(const struct hantro_ctx *ctx,
> >>   {
> >>          if (ctx->is_encoder)
> >>                  return false;
> >> +
> >> +       if (ctx->need_postproc)
> >> +               return true;
> >> +
> >>          return fmt->postprocessed;
> >>   }
> >>
> >> diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c
> >> index bbe79dbd2cd9..5c381766cca3 100644
> >> --- a/drivers/media/platform/verisilicon/hantro_v4l2.c
> >> +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c
> >> @@ -38,6 +38,11 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts)
> >>   {
> >>          const struct hantro_fmt *formats;
> >>
> >> +       if (ctx->need_postproc) {
> >> +               *num_fmts = 0;
> >> +               return NULL;
> >> +       }
> >> +
> >>          if (ctx->is_encoder) {
> >>                  formats = ctx->dev->variant->enc_fmts;
> >>                  *num_fmts = ctx->dev->variant->num_enc_fmts;
> >> @@ -132,6 +137,15 @@ hantro_get_default_fmt(const struct hantro_ctx *ctx, bool bitstream)
> >>                      hantro_check_depth_match(ctx, &formats[i]))
> >>                          return &formats[i];
> >>          }
> >> +
> >> +       formats = hantro_get_postproc_formats(ctx, &num_fmts);
> >> +       for (i = 0; i < num_fmts; i++) {
> >> +               if (bitstream == (formats[i].codec_mode !=
> >> +                                 HANTRO_MODE_NONE) &&
> >> +                   hantro_check_depth_match(ctx, &formats[i]))
> >> +                       return &formats[i];
> >> +       }
> >> +
> >>          return NULL;
> >>   }
> >>
> >> @@ -261,19 +275,6 @@ static int vidioc_g_fmt_out_mplane(struct file *file, void *priv,
> >>          return 0;
> >>   }
> >>
> >> -static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> >> -                                  struct v4l2_format *f)
> >> -{
> >> -       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> >> -       struct hantro_ctx *ctx = fh_to_ctx(priv);
> >> -
> >> -       vpu_debug(4, "f->type = %d\n", f->type);
> >> -
> >> -       *pix_mp = ctx->dst_fmt;
> >> -
> >> -       return 0;
> >> -}
> >> -
> >>   static int hantro_try_fmt(const struct hantro_ctx *ctx,
> >>                            struct v4l2_pix_format_mplane *pix_mp,
> >>                            enum v4l2_buf_type type)
> >> @@ -353,6 +354,25 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx,
> >>          return 0;
> >>   }
> >>
> >> +static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv,
> >> +                                  struct v4l2_format *f)
> >> +{
> >> +       struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
> >> +       struct hantro_ctx *ctx = fh_to_ctx(priv);
> >> +       int ret;
> >> +
> >> +       vpu_debug(4, "f->type = %d\n", f->type);
> >> +
> >> +       ret = hantro_try_fmt(ctx, pix_mp, f->type);
> >> +       if (ret)
> >> +               return ret;
> >> +
> >> +       ctx->vpu_dst_fmt = hantro_find_format(ctx, pix_mp->pixelformat);
> >> +       ctx->dst_fmt = *pix_mp;
> >> +
> > This looks like the g_fmt is setting some state in the context,
> > this looks incorrect.
>
> Indeed only a call to hantro_try_fmt() is needed here.
> I will fix that in v3.
>
> Benjamin
>
> >
> > Thanks,
> > Ezequiel