diff mbox series

media: amphion: reinit vpu if reqbufs output 0

Message ID 20230613074846.25964-1-ming.qian@nxp.com
State New
Headers
Series media: amphion: reinit vpu if reqbufs output 0 |

Commit Message

Ming Qian June 13, 2023, 7:48 a.m. UTC 
  according to v4l2 stateful decoder document 4.5.1.3. State Machine,
the state should change from seek to initialization
if call VIDIOC_REQBUFS(OUTPUT, 0).

so reinit the vpu decoder if reqbufs output 0

Fixes: 6de8d628df6e ("media: amphion: add v4l2 m2m vpu decoder stateful driver")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vdec.c     | 2 --
 drivers/media/platform/amphion/vpu_v4l2.c | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

Comments

Nicolas Dufresne June 28, 2023, 2:14 p.m. UTC | #1 
Hi,

Le mardi 13 juin 2023 à 15:48 +0800, Ming Qian a écrit :
> according to v4l2 stateful decoder document 4.5.1.3. State Machine,
> the state should change from seek to initialization
> if call VIDIOC_REQBUFS(OUTPUT, 0).
> 
> so reinit the vpu decoder if reqbufs output 0
> 
> Fixes: 6de8d628df6e ("media: amphion: add v4l2 m2m vpu decoder stateful driver")
> Signed-off-by: Ming Qian <ming.qian@nxp.com>
> 

No regressions seen with this change so far.

Tested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

And also:

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

thanks,
Nicolas
 
> ---
>  drivers/media/platform/amphion/vdec.c     | 2 --
>  drivers/media/platform/amphion/vpu_v4l2.c | 7 ++++++-
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
> index 6515f3cdb7a7..56c4deea4494 100644
> --- a/drivers/media/platform/amphion/vdec.c
> +++ b/drivers/media/platform/amphion/vdec.c
> @@ -1453,9 +1453,7 @@ static void vdec_release(struct vpu_inst *inst)
>  {
>  	if (inst->id != VPU_INST_NULL_ID)
>  		vpu_trace(inst->dev, "[%d]\n", inst->id);
> -	vpu_inst_lock(inst);
>  	vdec_stop(inst, true);
> -	vpu_inst_unlock(inst);
>  }
>  
>  static void vdec_cleanup(struct vpu_inst *inst)
> diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
> index 810e93d2c954..8c9028df3bf4 100644
> --- a/drivers/media/platform/amphion/vpu_v4l2.c
> +++ b/drivers/media/platform/amphion/vpu_v4l2.c
> @@ -489,6 +489,11 @@ static int vpu_vb2_queue_setup(struct vb2_queue *vq,
>  	for (i = 0; i < cur_fmt->mem_planes; i++)
>  		psize[i] = vpu_get_fmt_plane_size(cur_fmt, i);
>  
> +	if (V4L2_TYPE_IS_OUTPUT(vq->type) && inst->state == VPU_CODEC_STATE_SEEK) {
> +		vpu_trace(inst->dev, "reinit when VIDIOC_REQBUFS(OUTPUT, 0)\n");
> +		call_void_vop(inst, release);
> +	}
> +
>  	return 0;
>  }
>  
> @@ -773,9 +778,9 @@ int vpu_v4l2_close(struct file *file)
>  		v4l2_m2m_ctx_release(inst->fh.m2m_ctx);
>  		inst->fh.m2m_ctx = NULL;
>  	}
> +	call_void_vop(inst, release);
>  	vpu_inst_unlock(inst);
>  
> -	call_void_vop(inst, release);
>  	vpu_inst_unregister(inst);
>  	vpu_inst_put(inst);
>
diff mbox series

Patch

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index 6515f3cdb7a7..56c4deea4494 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -1453,9 +1453,7 @@  static void vdec_release(struct vpu_inst *inst)
 {
 	if (inst->id != VPU_INST_NULL_ID)
 		vpu_trace(inst->dev, "[%d]\n", inst->id);
-	vpu_inst_lock(inst);
 	vdec_stop(inst, true);
-	vpu_inst_unlock(inst);
 }
 
 static void vdec_cleanup(struct vpu_inst *inst)
diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 810e93d2c954..8c9028df3bf4 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -489,6 +489,11 @@  static int vpu_vb2_queue_setup(struct vb2_queue *vq,
 	for (i = 0; i < cur_fmt->mem_planes; i++)
 		psize[i] = vpu_get_fmt_plane_size(cur_fmt, i);
 
+	if (V4L2_TYPE_IS_OUTPUT(vq->type) && inst->state == VPU_CODEC_STATE_SEEK) {
+		vpu_trace(inst->dev, "reinit when VIDIOC_REQBUFS(OUTPUT, 0)\n");
+		call_void_vop(inst, release);
+	}
+
 	return 0;
 }
 
@@ -773,9 +778,9 @@  int vpu_v4l2_close(struct file *file)
 		v4l2_m2m_ctx_release(inst->fh.m2m_ctx);
 		inst->fh.m2m_ctx = NULL;
 	}
+	call_void_vop(inst, release);
 	vpu_inst_unlock(inst);
 
-	call_void_vop(inst, release);
 	vpu_inst_unregister(inst);
 	vpu_inst_put(inst);