Re: [PATCH v1 2/7] media: chips-media: wave5: Set inst->std during default format initialization

[Nicolas Dufresne]

Le vendredi 26 juin 2026 à 10:22 +0900, Jackson.lee a écrit :
> From: Jackson Lee <jackson.lee@xxxxxxxxxxxxxxx>
> 
> When the encoder is opened, wave5_set_default_format() sets up the
> default capture format (e.g. H.264) but does not initialize inst->std.
> As a result, inst->std remains zero, which does not match any valid
> encoder codec.
> 
> If STREAMON is called before the user explicitly calls S_FMT on the
> capture queue — as v4l2-compliance does in testBlockingDQBuf — the
> codec/product check in wave5_vpu_enc_init_seq() fails with
> "Unsupported encoder-codec & product combination" because inst->std
> is neither W_HEVC_ENC nor W_AVC_ENC, returning -EOPNOTSUPP.
> 
> Fix this by setting inst->std via wave5_to_vpu_std() in
> wave5_set_default_format(), so that the codec type is always consistent
> with the default capture pixel format from the moment the instance is
> opened.
> 
> Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Jackson Lee <jackson.lee@xxxxxxxxxxxxxxx>
> Signed-off-by: Nas Chung <nas.chung@xxxxxxxxxxxxxxx>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx>

> ---
>  drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> index e6c94b6f2671..f9fcdf4c224b 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> @@ -1494,7 +1494,8 @@ static const struct vb2_ops wave5_vpu_enc_vb2_ops = {
>  	.stop_streaming = wave5_vpu_enc_stop_streaming,
>  };
>  
> -static void wave5_set_default_format(struct v4l2_pix_format_mplane *src_fmt,
> +static void wave5_set_default_format(struct vpu_instance *inst,
> +				     struct v4l2_pix_format_mplane *src_fmt,
>  				     struct v4l2_pix_format_mplane *dst_fmt)
>  {
>  	src_fmt->pixelformat = enc_fmt_list[VPU_FMT_TYPE_RAW][0].v4l2_pix_fmt;
> @@ -1506,6 +1507,7 @@ static void wave5_set_default_format(struct v4l2_pix_format_mplane *src_fmt,
>  	wave5_update_pix_fmt(dst_fmt, VPU_FMT_TYPE_CODEC,
>  			     W5_DEF_ENC_PIC_WIDTH, W5_DEF_ENC_PIC_HEIGHT,
>  			     &enc_frmsize[VPU_FMT_TYPE_CODEC]);
> +	inst->std = wave5_to_vpu_std(dst_fmt->pixelformat, inst->type);
>  }
>  
>  static int wave5_vpu_enc_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
> @@ -1770,7 +1772,7 @@ static int wave5_vpu_open_enc(struct file *filp)
>  	inst->v4l2_fh.ctrl_handler = v4l2_ctrl_hdl;
>  	v4l2_ctrl_handler_setup(v4l2_ctrl_hdl);
>  
> -	wave5_set_default_format(&inst->src_fmt, &inst->dst_fmt);
> +	wave5_set_default_format(inst, &inst->src_fmt, &inst->dst_fmt);
>  	inst->conf_win.width = inst->dst_fmt.width;
>  	inst->conf_win.height = inst->dst_fmt.height;
>  	inst->colorspace = V4L2_COLORSPACE_REC709;

Attachment: signature.asc
Description: This is a digitally signed message part