* [PATCH] media: vsp1: Fix BRx conditional path in WPF
@ 2018-03-26 13:29 Kieran Bingham
2018-03-26 13:39 ` Kieran Bingham
2018-03-26 17:21 ` Laurent Pinchart
0 siblings, 2 replies; 3+ messages in thread
From: Kieran Bingham @ 2018-03-26 13:29 UTC (permalink / raw)
To: Laurent Pinchart, mchehab, linux-media, linux-renesas-soc
Cc: Kieran Bingham, Kieran Bingham, stable, open list
When a BRx is provided by a pipeline, the WPF must determine the master
layer. Currently the condition to check this identifies pipe->bru ||
pipe->num_inputs > 1.
The code then moves on to dereference pipe->bru, thus the check fails
static analysers on the possibility that pipe->num_inputs could be
greater than 1 without pipe->bru being set.
The reality is that the pipeline must have a BRx to support more than
one input, thus this could never cause a fault - however it also
identifies that the num_inputs > 1 check is redundant.
Remove the redundant check - and always configure the master layer
appropriately when we have a BRx configured in our pipeline.
Fixes: 6134148f6098 ("v4l: vsp1: Add support for the BRS entity")
Cc: stable@vger.kernel.org
Suggested-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index f7f3b4b2c2de..8bd6b2f1af15 100644
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -452,7 +452,7 @@ static void wpf_configure(struct vsp1_entity *entity,
: VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);
}
- if (pipe->bru || pipe->num_inputs > 1)
+ if (pipe->bru)
srcrpf |= pipe->bru->type == VSP1_ENTITY_BRU
? VI6_WPF_SRCRPF_VIRACT_MST
: VI6_WPF_SRCRPF_VIRACT2_MST;
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] media: vsp1: Fix BRx conditional path in WPF
2018-03-26 13:29 [PATCH] media: vsp1: Fix BRx conditional path in WPF Kieran Bingham
@ 2018-03-26 13:39 ` Kieran Bingham
2018-03-26 17:21 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Kieran Bingham @ 2018-03-26 13:39 UTC (permalink / raw)
To: Kieran Bingham, Laurent Pinchart, mchehab, linux-media,
linux-renesas-soc
Cc: Kieran Bingham, stable, open list
Sorry,
This should have been from my +renesas to support Renesas' statistics and
filtering of course.
On 26/03/18 14:29, Kieran Bingham wrote:
> When a BRx is provided by a pipeline, the WPF must determine the master
> layer. Currently the condition to check this identifies pipe->bru ||
> pipe->num_inputs > 1.
>
> The code then moves on to dereference pipe->bru, thus the check fails
> static analysers on the possibility that pipe->num_inputs could be
> greater than 1 without pipe->bru being set.
>
> The reality is that the pipeline must have a BRx to support more than
> one input, thus this could never cause a fault - however it also
> identifies that the num_inputs > 1 check is redundant.
>
> Remove the redundant check - and always configure the master layer
> appropriately when we have a BRx configured in our pipeline.
>
> Fixes: 6134148f6098 ("v4l: vsp1: Add support for the BRS entity")
> Cc: stable@vger.kernel.org
>
> Suggested-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
And thus:
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
> index f7f3b4b2c2de..8bd6b2f1af15 100644
> --- a/drivers/media/platform/vsp1/vsp1_wpf.c
> +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
> @@ -452,7 +452,7 @@ static void wpf_configure(struct vsp1_entity *entity,
> : VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);
> }
>
> - if (pipe->bru || pipe->num_inputs > 1)
> + if (pipe->bru)
> srcrpf |= pipe->bru->type == VSP1_ENTITY_BRU
> ? VI6_WPF_SRCRPF_VIRACT_MST
> : VI6_WPF_SRCRPF_VIRACT2_MST;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] media: vsp1: Fix BRx conditional path in WPF
2018-03-26 13:29 [PATCH] media: vsp1: Fix BRx conditional path in WPF Kieran Bingham
2018-03-26 13:39 ` Kieran Bingham
@ 2018-03-26 17:21 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2018-03-26 17:21 UTC (permalink / raw)
To: Kieran Bingham
Cc: mchehab, linux-media, linux-renesas-soc, Kieran Bingham, stable,
open list
Hi Kieran,
Thank you for the patch.
On Monday, 26 March 2018 16:29:17 EEST Kieran Bingham wrote:
> When a BRx is provided by a pipeline, the WPF must determine the master
> layer. Currently the condition to check this identifies pipe->bru ||
> pipe->num_inputs > 1.
>
> The code then moves on to dereference pipe->bru, thus the check fails
> static analysers on the possibility that pipe->num_inputs could be
> greater than 1 without pipe->bru being set.
>
> The reality is that the pipeline must have a BRx to support more than
> one input, thus this could never cause a fault - however it also
> identifies that the num_inputs > 1 check is redundant.
>
> Remove the redundant check - and always configure the master layer
> appropriately when we have a BRx configured in our pipeline.
>
> Fixes: 6134148f6098 ("v4l: vsp1: Add support for the BRS entity")
> Cc: stable@vger.kernel.org
>
> Suggested-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Looking at commit 5d0beeec59e303c76160ddd67fa73dcfc5d76de0 I think your patch
is correct.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
and taken in my tree.
> ---
> drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c
> b/drivers/media/platform/vsp1/vsp1_wpf.c index f7f3b4b2c2de..8bd6b2f1af15
> 100644
> --- a/drivers/media/platform/vsp1/vsp1_wpf.c
> +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
> @@ -452,7 +452,7 @@ static void wpf_configure(struct vsp1_entity *entity,
> : VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);
> }
>
> - if (pipe->bru || pipe->num_inputs > 1)
> + if (pipe->bru)
> srcrpf |= pipe->bru->type == VSP1_ENTITY_BRU
> ? VI6_WPF_SRCRPF_VIRACT_MST
> : VI6_WPF_SRCRPF_VIRACT2_MST;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-26 17:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-26 13:29 [PATCH] media: vsp1: Fix BRx conditional path in WPF Kieran Bingham
2018-03-26 13:39 ` Kieran Bingham
2018-03-26 17:21 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).