Hi Jacopo,
Thank you for the patch.
On Mon, Jun 09, 2025 at 09:01:44PM +0200, Jacopo Mondi wrote:
> According section "62.3.7.1 "Operation Control Setting
"According to"
> IP set VSPX+FCPVX" of the R-Car Gen4 Hardware Manual, FCPX has to
> be reset when stopping the image processing.
That's only when stopping "image process of VSPX+FCPVX immediately".
Note the "immediately", which involves resetting the VSP too. The code
below waits for the pipeline to stop at the end of the frame. Resetting
the FCP doesn't seem to be required in that case.
> Softawre reset the FCPX after the vsp1 pipe has stopped.
s/Softawre/Software/
> Signed-off-by: Jacopo Mondi <jacopo.mondi+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/renesas/vsp1/vsp1_pipe.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
> index a6e5e10f3ef275c1b081c3d957e6cf356332afce..c6f2417aabc479384012ab8ab99556029ede1f44 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_pipe.c
> @@ -499,6 +499,7 @@ bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe)
> int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
> {
> struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
> + u32 version = vsp1->version & VI6_IP_VERSION_MODEL_MASK;
> struct vsp1_entity *entity;
> unsigned long flags;
> int ret;
> @@ -515,8 +516,7 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
> spin_unlock_irqrestore(&pipe->irqlock, flags);
> }
>
> - if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) ==
> - VI6_IP_VERSION_MODEL_VSPD_GEN3)
> + if (version == VI6_IP_VERSION_MODEL_VSPD_GEN3)
> ret |= rcar_fcp_soft_reset(vsp1->fcp);
>
> } else {
> @@ -529,6 +529,9 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
> ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),
> msecs_to_jiffies(500));
> ret = ret == 0 ? -ETIMEDOUT : 0;
> +
> + if (version == VI6_IP_VERSION_MODEL_VSPX_GEN4)
> + ret |= rcar_fcp_soft_reset(vsp1->fcp);
> }
>
> list_for_each_entry(entity, &pipe->entities, list_pipe) {
--
Regards,
Laurent Pinchart
