lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 099/287] media: vsp1: Fix offset calculation for plane cropping
    Date
    From: Michael Rodin <mrodin@de.adit-jv.com>

    [ Upstream commit 5f25abec8f21b7527c1223a354d23c270befddb3 ]

    The vertical subsampling factor is currently not considered in the
    offset calculation for plane cropping done in rpf_configure_partition.
    This causes a distortion (shift of the color plane) when formats with
    the vsub factor larger than 1 are used (e.g. NV12, see
    vsp1_video_formats in vsp1_pipe.c). This commit considers vsub factor
    for all planes except plane 0 (luminance).

    Drop generalization of the offset calculation to reduce the binary size.

    Fixes: e5ad37b64de9 ("[media] v4l: vsp1: Add cropping support")
    Signed-off-by: Michael Rodin <mrodin@de.adit-jv.com>
    Signed-off-by: LUU HOAI <hoai.luu.ub@renesas.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/vsp1/vsp1_rpf.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
    index f8005b60b9d2..abaf4dde3802 100644
    --- a/drivers/media/platform/vsp1/vsp1_rpf.c
    +++ b/drivers/media/platform/vsp1/vsp1_rpf.c
    @@ -290,11 +290,11 @@ static void rpf_configure_partition(struct vsp1_entity *entity,
    + crop.left * fmtinfo->bpp[0] / 8;

    if (format->num_planes > 1) {
    + unsigned int bpl = format->plane_fmt[1].bytesperline;
    unsigned int offset;

    - offset = crop.top * format->plane_fmt[1].bytesperline
    - + crop.left / fmtinfo->hsub
    - * fmtinfo->bpp[1] / 8;
    + offset = crop.top / fmtinfo->vsub * bpl
    + + crop.left / fmtinfo->hsub * fmtinfo->bpp[1] / 8;
    mem.addr[1] += offset;
    mem.addr[2] += offset;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 14:01    [W:4.029 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site