lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 378/917] media: meson-ge2d: Fix rotation parameter changes detection in ge2d_s_ctrl()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 4b9e3e8af4b336eefca1f1ee535bc4b6734ed6aa ]

    There is likely a typo here. To be consistent, we should compare
    'fmt.height' with 'ctx->out.pix_fmt.height', not 'ctx->out.pix_fmt.width'.

    Instead of fixing the test, just remove it and copy 'fmt' unconditionally.

    Fixes: 59a635327ca7 ("media: meson: Add M2M driver for the Amlogic GE2D Accelerator Unit")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Acked-by: Neil Armstrong <narmstrong@baylibre.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/media/platform/meson/ge2d/ge2d.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c
    index a1393fefa8aea..9b1e973e78da3 100644
    --- a/drivers/media/platform/meson/ge2d/ge2d.c
    +++ b/drivers/media/platform/meson/ge2d/ge2d.c
    @@ -779,11 +779,7 @@ static int ge2d_s_ctrl(struct v4l2_ctrl *ctrl)
    * If the rotation parameter changes the OUTPUT frames
    * parameters, take them in account
    */
    - if (fmt.width != ctx->out.pix_fmt.width ||
    - fmt.height != ctx->out.pix_fmt.width ||
    - fmt.bytesperline > ctx->out.pix_fmt.bytesperline ||
    - fmt.sizeimage > ctx->out.pix_fmt.sizeimage)
    - ctx->out.pix_fmt = fmt;
    + ctx->out.pix_fmt = fmt;

    break;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:53    [W:4.059 / U:1.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site