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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 988A9C30658 for ; Fri, 5 Jul 2024 11:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6xWocI4X738cSv1ET6+TE3qyKGSVjuMegTzyFMwiL9c=; b=lFtAM1MWNoMNyu xvzMoJasY2e2vs7M+c3vRisz134mmE71siyGZ0cNWej0EJH+sJdyxn2x5NiegR+Z5UmQn99KvNntE 3wDh24E9GxXInAZt3BP/YYWapdDernZJb9z6oHp1OlhiY1cmM4K7SiV5fnyou+A/YLohrVX00iesH RUNdMCtfGZ8Gkoa0Rx+T3kJxeyJRhh5L76pzXFAkCUuGltatiTXzQi7DVPTEYr2l4htoufPUah/Fc IOa63fK3m65t2sD5fZkwY+CdvyoKz5eU/xXoE/BOw1r55kcmiqYoYmuteMgx54/XjJP0vBVqwRdbt +/CLU021sLzZ4H8ejycQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPh7l-0000000FnZo-31QA; Fri, 05 Jul 2024 11:29:09 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPh7j-0000000FnZ5-02mv for linux-rockchip@lists.infradead.org; Fri, 05 Jul 2024 11:29:08 +0000 Received: from pyrite.rasen.tech (h175-177-049-156.catv02.itscom.jp [175.177.49.156]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 31235541; Fri, 5 Jul 2024 13:28:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1720178913; bh=rvJu0YPpOjGG4oYRrulYFmVbjRCG1xHH8upqpyVOac0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=B/tLPQYpTwumtlTu9hfUrXD3eY1uNr4eDEb/pkS5nhWc1LDY4b/zlHSG/Jr9OZG6s jpSYyy20O7Wlf4bhK8o0ygMPxHJ0kucpC7NRcQ3DRoa25HatL570Arj5wVGokgXWsq u6RxT6PnT9tqoepcY3EeX7ikYquVNy39hCK2pcb4= Date: Fri, 5 Jul 2024 20:28:55 +0900 From: Paul Elder To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Dafna Hirschfeld , Jacopo Mondi , linux-rockchip@lists.infradead.org Subject: Re: [PATCH v2 1/5] media: rkisp1: Add helper function to swap colour channels Message-ID: References: <20240704154932.6686-1-laurent.pinchart@ideasonboard.com> <20240704154932.6686-2-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240704154932.6686-2-laurent.pinchart@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240705_042907_218556_78D75F79 X-CRM114-Status: GOOD ( 22.92 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Thu, Jul 04, 2024 at 06:49:28PM +0300, Laurent Pinchart wrote: > The BLS parameters passed by userspace are specified for named colour > channels (R, Gr, Gb and B), while the hardware registers reference > positions in the 2x2 CFA pattern (A, B, C and D). > > The BLS values are swapped based on the CFA pattern when writing to or > reading from registers, using hand-roled switch statements. The logic is > duplicated already, and new code will require similar processing. Move > the swap logic to a shared function, using static data to control the > channels order. > > Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder > --- > Changes since v1: > > - Declare swap array with explicit dimensions > - Move i variable declaration to the loop > - Move rkisp1_bls_swap_regs() declaration > --- > .../platform/rockchip/rkisp1/rkisp1-common.c | 14 +++++ > .../platform/rockchip/rkisp1/rkisp1-common.h | 3 + > .../platform/rockchip/rkisp1/rkisp1-params.c | 58 ++++--------------- > .../platform/rockchip/rkisp1/rkisp1-stats.c | 51 +++++----------- > 4 files changed, 43 insertions(+), 83 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c > index f956b90a407a..60c97bb7b18b 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c > @@ -178,3 +178,17 @@ void rkisp1_sd_adjust_crop(struct v4l2_rect *crop, > > rkisp1_sd_adjust_crop_rect(crop, &crop_bounds); > } > + > +void rkisp1_bls_swap_regs(enum rkisp1_fmt_raw_pat_type pattern, > + const u32 input[4], u32 output[4]) > +{ > + static const unsigned int swap[4][4] = { > + [RKISP1_RAW_RGGB] = { 0, 1, 2, 3 }, > + [RKISP1_RAW_GRBG] = { 1, 0, 3, 2 }, > + [RKISP1_RAW_GBRG] = { 2, 3, 0, 1 }, > + [RKISP1_RAW_BGGR] = { 3, 2, 1, 0 }, > + }; > + > + for (unsigned int i = 0; i < 4; ++i) > + output[i] = input[swap[pattern][i]]; > +} > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > index c1689c0fa05a..a52079261579 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > @@ -603,6 +603,9 @@ void rkisp1_sd_adjust_crop_rect(struct v4l2_rect *crop, > void rkisp1_sd_adjust_crop(struct v4l2_rect *crop, > const struct v4l2_mbus_framefmt *bounds); > > +void rkisp1_bls_swap_regs(enum rkisp1_fmt_raw_pat_type pattern, > + const u32 input[4], u32 output[4]); > + > /* > * rkisp1_mbus_info_get_by_code - get the isp info of the media bus code > * > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > index 25aede5e1af5..c56365c7c51f 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > @@ -165,54 +165,20 @@ static void rkisp1_bls_config(struct rkisp1_params *params, > new_control &= RKISP1_CIF_ISP_BLS_ENA; > /* fixed subtraction values */ > if (!arg->enable_auto) { > - const struct rkisp1_cif_isp_bls_fixed_val *pval = > - &arg->fixed_val; > + static const u32 regs[] = { > + RKISP1_CIF_ISP_BLS_A_FIXED, > + RKISP1_CIF_ISP_BLS_B_FIXED, > + RKISP1_CIF_ISP_BLS_C_FIXED, > + RKISP1_CIF_ISP_BLS_D_FIXED, > + }; > + u32 swapped[4]; > > - switch (params->raw_type) { > - case RKISP1_RAW_BGGR: > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_D_FIXED, > - pval->r); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_C_FIXED, > - pval->gr); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_B_FIXED, > - pval->gb); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_A_FIXED, > - pval->b); > - break; > - case RKISP1_RAW_GBRG: > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_C_FIXED, > - pval->r); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_D_FIXED, > - pval->gr); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_A_FIXED, > - pval->gb); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_B_FIXED, > - pval->b); > - break; > - case RKISP1_RAW_GRBG: > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_B_FIXED, > - pval->r); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_A_FIXED, > - pval->gr); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_D_FIXED, > - pval->gb); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_C_FIXED, > - pval->b); > - break; > - case RKISP1_RAW_RGGB: > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_A_FIXED, > - pval->r); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_B_FIXED, > - pval->gr); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_C_FIXED, > - pval->gb); > - rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_D_FIXED, > - pval->b); > - break; > - default: > - break; > - } > + rkisp1_bls_swap_regs(params->raw_type, regs, swapped); > > + rkisp1_write(params->rkisp1, swapped[0], arg->fixed_val.r); > + rkisp1_write(params->rkisp1, swapped[1], arg->fixed_val.gr); > + rkisp1_write(params->rkisp1, swapped[2], arg->fixed_val.gb); > + rkisp1_write(params->rkisp1, swapped[3], arg->fixed_val.b); > } else { > if (arg->en_windows & BIT(1)) { > rkisp1_write(params->rkisp1, RKISP1_CIF_ISP_BLS_H2_START, > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c > index 2795eef91bdd..a502719e916a 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c > @@ -304,48 +304,25 @@ static void rkisp1_stats_get_hst_meas_v12(struct rkisp1_stats *stats, > static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats, > struct rkisp1_stat_buffer *pbuf) > { > + static const u32 regs[] = { > + RKISP1_CIF_ISP_BLS_A_MEASURED, > + RKISP1_CIF_ISP_BLS_B_MEASURED, > + RKISP1_CIF_ISP_BLS_C_MEASURED, > + RKISP1_CIF_ISP_BLS_D_MEASURED, > + }; > struct rkisp1_device *rkisp1 = stats->rkisp1; > const struct rkisp1_mbus_info *in_fmt = rkisp1->isp.sink_fmt; > struct rkisp1_cif_isp_bls_meas_val *bls_val; > + u32 swapped[4]; > + > + rkisp1_bls_swap_regs(in_fmt->bayer_pat, regs, swapped); > > bls_val = &pbuf->params.ae.bls_val; > - if (in_fmt->bayer_pat == RKISP1_RAW_BGGR) { > - bls_val->meas_b = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_A_MEASURED); > - bls_val->meas_gb = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_B_MEASURED); > - bls_val->meas_gr = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_C_MEASURED); > - bls_val->meas_r = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_D_MEASURED); > - } else if (in_fmt->bayer_pat == RKISP1_RAW_GBRG) { > - bls_val->meas_gb = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_A_MEASURED); > - bls_val->meas_b = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_B_MEASURED); > - bls_val->meas_r = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_C_MEASURED); > - bls_val->meas_gr = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_D_MEASURED); > - } else if (in_fmt->bayer_pat == RKISP1_RAW_GRBG) { > - bls_val->meas_gr = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_A_MEASURED); > - bls_val->meas_r = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_B_MEASURED); > - bls_val->meas_b = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_C_MEASURED); > - bls_val->meas_gb = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_D_MEASURED); > - } else if (in_fmt->bayer_pat == RKISP1_RAW_RGGB) { > - bls_val->meas_r = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_A_MEASURED); > - bls_val->meas_gr = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_B_MEASURED); > - bls_val->meas_gb = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_C_MEASURED); > - bls_val->meas_b = > - rkisp1_read(rkisp1, RKISP1_CIF_ISP_BLS_D_MEASURED); > - } > + > + bls_val->meas_r = rkisp1_read(rkisp1, swapped[0]); > + bls_val->meas_gr = rkisp1_read(rkisp1, swapped[1]); > + bls_val->meas_gb = rkisp1_read(rkisp1, swapped[2]); > + bls_val->meas_b = rkisp1_read(rkisp1, swapped[3]); > } > > static const struct rkisp1_stats_ops rkisp1_v10_stats_ops = { > -- > Regards, > > Laurent Pinchart > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip