From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF4A1C433E8 for ; Mon, 13 Jul 2020 11:13:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9D19206F0 for ; Mon, 13 Jul 2020 11:13:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729588AbgGMLNF (ORCPT ); Mon, 13 Jul 2020 07:13:05 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:37010 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727890AbgGMLNF (ORCPT ); Mon, 13 Jul 2020 07:13:05 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 1B05B2A0D5F Subject: Re: [PATCH 3/4] media: staging: rkisp1: set pads array of the resizer to size 2 To: Dafna Hirschfeld , linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com Cc: ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org References: <20200629065754.26621-1-dafna.hirschfeld@collabora.com> <20200629065754.26621-4-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: <09105e4b-7c02-28fd-58cc-ca947d6c5185@collabora.com> Date: Mon, 13 Jul 2020 08:12:57 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200629065754.26621-4-dafna.hirschfeld@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 6/29/20 3:57 AM, Dafna Hirschfeld wrote: > Currently the 'pads' and 'pad_cfg' arries of the rkisp1_resizer > are of size 'RKISP1_ISP_PAD_MAX' which is 4. But the resizer > has only two pads. This patch change the size of the arries to 2 > by adding and using 'RKISP1_RSZ_PAD_MAX' similar to the way it is > done in the isp entity. s/arries/arrays s/This patch change/Change Hans, could you correct these when picking it up? > > Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-common.h | 5 +++-- > drivers/staging/media/rkisp1/rkisp1-resizer.c | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h > index b7dc523dd8f0..4185487c520c 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-common.h > +++ b/drivers/staging/media/rkisp1/rkisp1-common.h > @@ -49,6 +49,7 @@ > enum rkisp1_rsz_pad { > RKISP1_RSZ_PAD_SINK, > RKISP1_RSZ_PAD_SRC, > + RKISP1_RSZ_PAD_MAX > }; > > enum rkisp1_stream_id { > @@ -216,8 +217,8 @@ struct rkisp1_resizer { > struct v4l2_subdev sd; > enum rkisp1_stream_id id; > struct rkisp1_device *rkisp1; > - struct media_pad pads[RKISP1_ISP_PAD_MAX]; > - struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; > + struct media_pad pads[RKISP1_RSZ_PAD_MAX]; > + struct v4l2_subdev_pad_config pad_cfg[RKISP1_RSZ_PAD_MAX]; > const struct rkisp1_rsz_config *config; > enum v4l2_pixel_encoding pixel_enc; > struct mutex ops_lock; > diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c > index 26fb41053f56..d8ebe4422e77 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c > +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c > @@ -735,7 +735,7 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz) > rsz->pixel_enc = RKISP1_DEF_PIXEL_ENC; > > mutex_init(&rsz->ops_lock); > - ret = media_entity_pads_init(&sd->entity, 2, pads); > + ret = media_entity_pads_init(&sd->entity, RKISP1_RSZ_PAD_MAX, pads); > if (ret) > return ret; > >