lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 009/254] media: staging: rkisp1: isp: do not set invalid mbus code for pad
    Date
    From: Helen Koike <helen.koike@collabora.com>

    [ Upstream commit 100f720aabab3d5f58f67c508186041b3c797a9b ]

    When setting source pad, check if the given mbus code is indeed valid
    for source pad, if not, then set the default code.
    Same for sink pad.

    Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
    Reported-by: Wojciech Zabolotny <wzab01@gmail.com>
    Signed-off-by: Helen Koike <helen.koike@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/rkisp1/rkisp1-isp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
    index 328c7ea609717..db892620a5675 100644
    --- a/drivers/staging/media/rkisp1/rkisp1-isp.c
    +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
    @@ -683,7 +683,7 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,

    src_fmt->code = format->code;
    mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code);
    - if (!mbus_info) {
    + if (!mbus_info || !(mbus_info->direction & RKISP1_DIR_SRC)) {
    src_fmt->code = RKISP1_DEF_SRC_PAD_FMT;
    mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code);
    }
    @@ -767,7 +767,7 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp,
    which);
    sink_fmt->code = format->code;
    mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);
    - if (!mbus_info) {
    + if (!mbus_info || !(mbus_info->direction & RKISP1_DIR_SINK)) {
    sink_fmt->code = RKISP1_DEF_SINK_PAD_FMT;
    mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-04-16 17:06    [W:2.904 / U:1.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site