From 3394abd73c89d5ba70b043ce9222446a3ac2a527 Mon Sep 17 00:00:00 2001 From: Aman Gupta Date: Fri, 23 Aug 2019 16:29:07 -0700 Subject: [PATCH] staging: bcm2835-codec: remove unnecessary padding on encoder input The ISP and ENCODE roles have the same underlying hardware. Neither requires vertical alignment. Signed-off-by: Aman Gupta --- .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c index 6ef7b163749530..d4a31d0259ccb5 100644 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -1050,12 +1050,12 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f, f->fmt.pix_mp.height = MIN_H; /* - * For codecs the buffer must have a vertical alignment of 16 + * For decoders the buffer must have a vertical alignment of 16 * lines. * The selection will reflect any cropping rectangle when only * some of the pixels are active. */ - if (ctx->dev->role != ISP) + if (ctx->dev->role == DECODE) f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16); } f->fmt.pix_mp.num_planes = 1;