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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 10287C54E4A for ; Fri, 8 May 2020 04:19:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D322D2082E for ; Fri, 8 May 2020 04:19:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FGIV/ShY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D322D2082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=J+a2CmTVkVs+QgDV07JzTfaOm0y05Uf7opDPIax68Yw=; b=FGIV/ShYqyvT88 dw3CnYNarw9Jx2TBLo2plcSrb+D66sPcfQwKD51AtpimLEbRqOtfvOoPCqYm7OcecUAmmqezSLWtA FEvZxsX/D7tlUHRpE2D/ATygM7PvqknPurx5U+9YTZC+rmVfxYl9XMhPvVCB1dyB/LNbSL3kxt8jg sAKPCmQBHElA9OyRS0BixjH4OFv+C/2KdKoPWSyNRaJFE9kVNDuiD0Kux49QYxu78y5leF1F1/LrR P74VA5q8JHlu9b02u5A9suFu2uwy0U63aVJpA7Vp1QW3kZPnRBb3gk+fEvPw5FSlDUqING5EkZo3m ToN/J5M1yk78iC4cljZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWuTa-00020b-Es; Fri, 08 May 2020 04:19:06 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWuTW-0001zy-SH; Fri, 08 May 2020 04:19:04 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id B110A2A2D84 Message-ID: Subject: Re: [PATCH v3 3/4] media: rockchip: rga: Introduce color fmt macros and refactor CSC mode logic From: Ezequiel Garcia To: Paul Kocialkowski , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Date: Fri, 08 May 2020 01:18:49 -0300 In-Reply-To: <20200430164245.1630174-4-paul.kocialkowski@bootlin.com> References: <20200430164245.1630174-1-paul.kocialkowski@bootlin.com> <20200430164245.1630174-4-paul.kocialkowski@bootlin.com> Organization: Collabora User-Agent: Evolution 3.36.0-1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200507_211903_045756_47AF9665 X-CRM114-Status: GOOD ( 14.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Verkuil , Mauro Carvalho Chehab , Thomas Petazzoni , Heiko Stuebner , Rob Herring Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2020-04-30 at 18:42 +0200, Paul Kocialkowski wrote: > This introduces two macros: RGA_COLOR_FMT_IS_YUV and RGA_COLOR_FMT_IS_RGB > which allow quick checking of the colorspace familily of a RGA color format. > > These macros are then used to refactor the logic for CSC mode selection. > The two nested tests for input colorspace are simplified into a single one, > with a logical and, making the whole more readable. > > Signed-off-by: Paul Kocialkowski Reviewed-by: Ezequiel Garcia Thanks a lot for the nice cleanup. > --- > drivers/media/platform/rockchip/rga/rga-hw.c | 23 +++++++++----------- > drivers/media/platform/rockchip/rga/rga-hw.h | 5 +++++ > 2 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c > index 4be6dcf292ff..5607ee8d1917 100644 > --- a/drivers/media/platform/rockchip/rga/rga-hw.c > +++ b/drivers/media/platform/rockchip/rga/rga-hw.c > @@ -200,22 +200,19 @@ static void rga_cmd_set_trans_info(struct rga_ctx *ctx) > dst_info.data.format = ctx->out.fmt->hw_format; > dst_info.data.swap = ctx->out.fmt->color_swap; > > - if (ctx->in.fmt->hw_format >= RGA_COLOR_FMT_YUV422SP) { > - if (ctx->out.fmt->hw_format < RGA_COLOR_FMT_YUV422SP) { > - switch (ctx->in.colorspace) { > - case V4L2_COLORSPACE_REC709: > - src_info.data.csc_mode = > - RGA_SRC_CSC_MODE_BT709_R0; > - break; > - default: > - src_info.data.csc_mode = > - RGA_SRC_CSC_MODE_BT601_R0; > - break; > - } > + if (RGA_COLOR_FMT_IS_YUV(ctx->in.fmt->hw_format) && > + RGA_COLOR_FMT_IS_RGB(ctx->out.fmt->hw_format)) { > + switch (ctx->in.colorspace) { > + case V4L2_COLORSPACE_REC709: > + src_info.data.csc_mode = RGA_SRC_CSC_MODE_BT709_R0; > + break; > + default: > + src_info.data.csc_mode = RGA_SRC_CSC_MODE_BT601_R0; > + break; > } > } > > - if (ctx->out.fmt->hw_format >= RGA_COLOR_FMT_YUV422SP) { > + if (RGA_COLOR_FMT_IS_YUV(ctx->out.fmt->hw_format)) { > switch (ctx->out.colorspace) { > case V4L2_COLORSPACE_REC709: > dst_info.data.csc_mode = RGA_SRC_CSC_MODE_BT709_R0; > diff --git a/drivers/media/platform/rockchip/rga/rga-hw.h b/drivers/media/platform/rockchip/rga/rga-hw.h > index 96cb0314dfa7..e8917e5630a4 100644 > --- a/drivers/media/platform/rockchip/rga/rga-hw.h > +++ b/drivers/media/platform/rockchip/rga/rga-hw.h > @@ -95,6 +95,11 @@ > #define RGA_COLOR_FMT_CP_8BPP 15 > #define RGA_COLOR_FMT_MASK 15 > > +#define RGA_COLOR_FMT_IS_YUV(fmt) \ > + (((fmt) >= RGA_COLOR_FMT_YUV422SP) && ((fmt) < RGA_COLOR_FMT_CP_1BPP)) > +#define RGA_COLOR_FMT_IS_RGB(fmt) \ > + ((fmt) < RGA_COLOR_FMT_YUV422SP) > + > #define RGA_COLOR_NONE_SWAP 0 > #define RGA_COLOR_RB_SWAP 1 > #define RGA_COLOR_ALPHA_SWAP 2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel