Hi Tomi,
Thank you for the patch.
On Thu, Feb 16, 2023 at 11:41:15AM +0200, Tomi Valkeinen wrote:
> Print underrun interrupts with ratelimited print.
>
> Note that we don't enable the underrun interrupt. If we have underruns,
> we don't want to get flooded with interrupts about them. It's enough to
> see that an underrun happened at the end of a frame.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@xxxxxxxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
again :-) I've taken the patch in my tree.
> ---
> Changes in v4:
> - Store underrun count in pipe
>
> drivers/media/platform/renesas/vsp1/vsp1_drm.c | 3 +++
> drivers/media/platform/renesas/vsp1/vsp1_drv.c | 11 ++++++++++-
> drivers/media/platform/renesas/vsp1/vsp1_pipe.h | 2 ++
> drivers/media/platform/renesas/vsp1/vsp1_regs.h | 2 ++
> 4 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drm.c b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> index c6f25200982c..5da1bc991750 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drm.c
> @@ -710,6 +710,9 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
> return 0;
> }
>
> + /* Reset the underrun counter */
> + pipe->underrun_count = 0;
> +
> drm_pipe->width = cfg->width;
> drm_pipe->height = cfg->height;
> pipe->interlaced = cfg->interlaced;
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_drv.c b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> index 5710152d6511..ab8209e5b07a 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_drv.c
> @@ -45,7 +45,8 @@
>
> static irqreturn_t vsp1_irq_handler(int irq, void *data)
> {
> - u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE;
> + u32 mask = VI6_WPF_IRQ_STA_DFE | VI6_WPF_IRQ_STA_FRE |
> + VI6_WPF_IRQ_STA_UND;
> struct vsp1_device *vsp1 = data;
> irqreturn_t ret = IRQ_NONE;
> unsigned int i;
> @@ -60,6 +61,14 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
> status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));
> vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);
>
> + if ((status & VI6_WPF_IRQ_STA_UND) && wpf->entity.pipe) {
> + wpf->entity.pipe->underrun_count++;
> +
> + dev_warn_ratelimited(vsp1->dev,
> + "Underrun occurred at WPF%u (total underruns %u)\n",
> + i, wpf->entity.pipe->underrun_count);
> + }
> +
> if (status & VI6_WPF_IRQ_STA_DFE) {
> vsp1_pipeline_frame_end(wpf->entity.pipe);
> ret = IRQ_HANDLED;
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_pipe.h b/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
> index ae646c9ef337..674b5748d929 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
> @@ -148,6 +148,8 @@ struct vsp1_pipeline {
> unsigned int partitions;
> struct vsp1_partition *partition;
> struct vsp1_partition *part_table;
> +
> + u32 underrun_count;
> };
>
> void vsp1_pipeline_reset(struct vsp1_pipeline *pipe);
> diff --git a/drivers/media/platform/renesas/vsp1/vsp1_regs.h b/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> index d94343ae57a1..7eca82e0ba7e 100644
> --- a/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_regs.h
> @@ -32,10 +32,12 @@
> #define VI6_STATUS_SYS_ACT(n) BIT((n) + 8)
>
> #define VI6_WPF_IRQ_ENB(n) (0x0048 + (n) * 12)
> +#define VI6_WPF_IRQ_ENB_UNDE BIT(16)
> #define VI6_WPF_IRQ_ENB_DFEE BIT(1)
> #define VI6_WPF_IRQ_ENB_FREE BIT(0)
>
> #define VI6_WPF_IRQ_STA(n) (0x004c + (n) * 12)
> +#define VI6_WPF_IRQ_STA_UND BIT(16)
> #define VI6_WPF_IRQ_STA_DFE BIT(1)
> #define VI6_WPF_IRQ_STA_FRE BIT(0)
>
--
Regards,
Laurent Pinchart
