Re: [PATCH v2 1/2] media: chips-media: wave5: Fix conditional in start_streaming

[Nicolas Dufresne]

Hi,

Le mercredi 29 octobre 2025 à 10:08 -0500, Brandon Brnich a écrit :
> Hi Nicolas,
> 
> On 10/28/2025 11:42 AM, Nicolas Dufresne wrote:
> > Le mardi 21 octobre 2025 à 15:46 -0500, Brandon Brnich a écrit :
> > > When STREAMON(CAP) is called after STREAMON(OUT), the driver was failing to
> > > switch states from VPU_INST_STATE_OPEN to VPU_INST_STATE_INIT_SEQ and
> > > VPU_INST_STATE_PIC_RUN because the capture queue streaming boolean had not
> > > yet been set to true. This led to a hang in the encoder since the state
> > > was stuck in VPU_INST_STATE_OPEN. During the second call to
> > > start_streaming, the sequence initialization and frame buffer allocation
> > > should occur.
> > > 
> > > Signed-off-by: Brandon Brnich <b-brnich@xxxxxx>
> > 
> > Reviewed-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx>
> 
> I just saw I received a messaged from the CI bot on an alignment error 
> on my conditional statement below. Would you like me to submit a v3 or 
> will this be fixed up before being pulled to media tree? I can submit a 
> new version today if required.

Late response, I'll fix while applying.

cheers,
Nicolas

> 
> Best,
> Brandon
> 
> > 
> > > ---
> > >   drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 3 ++-
> > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > 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 1978551a28fa..0a2eab372913 100644
> > > --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> > > +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> > > @@ -1367,7 +1367,8 @@ static int wave5_vpu_enc_start_streaming(struct
> > > vb2_queue *q, unsigned int count
> > >   		if (ret)
> > >   			goto return_buffers;
> > >   	}
> > > -	if (inst->state == VPU_INST_STATE_OPEN && m2m_ctx-
> > > > cap_q_ctx.q.streaming) {
> > > +	if (inst->state == VPU_INST_STATE_OPEN && (m2m_ctx-
> > > > cap_q_ctx.q.streaming ||
> > > +		q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)) {
> > >   		ret = initialize_sequence(inst);
> > >   		if (ret) {
> > >   			dev_warn(inst->dev->dev, "Sequence not found: %d\n",
> > > ret);
>

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