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=-13.0 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=ham 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 63BD7C433DF for ; Mon, 3 Aug 2020 19:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0AA6207DF for ; Mon, 3 Aug 2020 19:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728335AbgHCTjN (ORCPT ); Mon, 3 Aug 2020 15:39:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727813AbgHCTjN (ORCPT ); Mon, 3 Aug 2020 15:39:13 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A1F2C06174A for ; Mon, 3 Aug 2020 12:39:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 87AD2292359 Subject: Re: [PATCH 2/2] media: staging: rkisp1: replace 3 fields 'ct_offset_*' with one array 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: <20200707170845.28845-1-dafna.hirschfeld@collabora.com> <20200707170845.28845-3-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: Date: Mon, 3 Aug 2020 16:38:58 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200707170845.28845-3-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 7/7/20 2:08 PM, Dafna Hirschfeld wrote: > The struct rkisp1_cif_isp_ctk_config contains 3 fields > ct_offset_{rgb}. Replace them with one array field 'ct_offset[3]. > > Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-params.c | 9 +++------ > drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 6 ++---- > 2 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c > index 00b102eb67b6..8596ad87a860 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-params.c > +++ b/drivers/staging/media/rkisp1/rkisp1-params.c > @@ -408,12 +408,9 @@ static void rkisp1_ctk_config(struct rkisp1_params *params, > for (j = 0; j < 3; j++) > rkisp1_write(params->rkisp1, arg->coeff[i][j], > RKISP1_CIF_ISP_CT_COEFF_0 + 4 * k++); > - rkisp1_write(params->rkisp1, arg->ct_offset_r, > - RKISP1_CIF_ISP_CT_OFFSET_R); > - rkisp1_write(params->rkisp1, arg->ct_offset_g, > - RKISP1_CIF_ISP_CT_OFFSET_G); > - rkisp1_write(params->rkisp1, arg->ct_offset_b, > - RKISP1_CIF_ISP_CT_OFFSET_B); > + for (i = 0; i < 3; i++) > + rkisp1_write(params->rkisp1, arg->ct_offset[i], > + RKISP1_CIF_ISP_CT_OFFSET_R + i * 4); > } > > static void rkisp1_ctk_enable(struct rkisp1_params *params, bool en) > diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > index a01711a668da..ec624f2579cd 100644 > --- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > +++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h > @@ -420,13 +420,11 @@ struct rkisp1_cif_isp_bdm_config { > * @coeff: color correction matrix. Values are 11-bit signed fixed-point numbers with 4 bit integer > * and 7 bit fractional part, ranging from -8 (0x400) to +7.992 (0x3FF). 0 is > * represented by 0x000 and a coefficient value of 1 as 0x080. > - * @ct_offset_b: offset for the crosstalk correction matrix > + * @ct_offset: Red, Green, Blue offsets for the crosstalk correction matrix > */ > struct rkisp1_cif_isp_ctk_config { > __u16 coeff[3][3]; > - __u16 ct_offset_r; > - __u16 ct_offset_g; > - __u16 ct_offset_b; > + __u16 ct_offset[3]; > } __packed; > > enum rkisp1_cif_isp_goc_mode { >