lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 031/164] media: vsp1: Fix BRx conditional path in WPF
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kieran Bingham <kieran.bingham@ideasonboard.com>

    commit 639fa43d59e5a41ca8c55592cd5c1021fea2ab83 upstream.

    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+renesas@ideasonboard.com>
    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/platform/vsp1/vsp1_wpf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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_en
    : 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;

    \
     
     \ /
      Last update: 2018-04-22 17:36    [W:2.628 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site