From patchwork Thu Feb 16 02:19:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9576388 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E841260209 for ; Thu, 16 Feb 2017 02:32:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D51271FE83 for ; Thu, 16 Feb 2017 02:32:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C935624B44; Thu, 16 Feb 2017 02:32:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 424F31FE83 for ; Thu, 16 Feb 2017 02:32:00 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=i6NOUj7tFAV5zVXpas08hmQigPO2UT/suuUCALTixEo=; b=gXLySuFbWKY8CbA6U07nGtBX6D JA5Tp7gYtyPVwjSShTbUdlbI0BbJYcbaaFCgqHTcT8V3kNqAEv9DjTOsiB742AUCEhUox9/oYoLu7 HBI1NnM+NwDaYYRJdyoaaeZSkSob0+3Q1f7HTv9zY+JJ2BokXMTr6B6I0gVJkHQou2UztfrQ6c8Sf kNxfvpCcMxhAdRN69DdqT+o69p8kQ5S5mhYWoKF8wuuSaL5XmjZHDllgHlH1rrq6jpZdTGWyxA7E/ uv16zQKXy0ERQgVXaDoTM8qN6s78IeaLK9iC3C4cOEo51pzYrNHL3wj+uQLuB2Q+hGAxZTprkVLUY ZxnJsRTA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ceBrL-0004X1-Aa; Thu, 16 Feb 2017 02:31:51 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ceBoZ-0000of-Is for linux-arm-kernel@bombadil.infradead.org; Thu, 16 Feb 2017 02:28:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UMK/1hhvEeD4E36Ltlsbs7CyxF80bmqtsMEfvUOr2Ps=; b=vEuCgeP48KNLeGUqQW1/dlQ3b 6OWtfTWTzkPWP4d6VvC8H+du2reg4o3JQzLnJwT14rC9npKZ5mZONqyJoQZoJFEfTgrWPGMFfVW5G Yli2winGTkfgQul+ZdifHpGbIy4nKKARM4oBNiJS1vpAa2aQZB88Fl/DlKK3ZfG+GJniTnl4IJKXz 9hJd+4ohxykKXeWAf3l6XcyzKqSv2+hgjHU5t1M4N89WlSYromxL6zTHCZWB0QIlfr4ClHhSDaD3T qalyAC0jmpvitfsqRnMUqhbQJG29QsHL3SlsqgBH2dW14M/6+cNy3abJlU0STuQ3/MIUkiJ0OfJW3 10MFlFX0A==; Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ceBhT-0000mv-NP for linux-arm-kernel@lists.infradead.org; Thu, 16 Feb 2017 02:21:43 +0000 Received: by mail-pf0-x242.google.com with SMTP id 68so367103pfx.2 for ; Wed, 15 Feb 2017 18:21:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UMK/1hhvEeD4E36Ltlsbs7CyxF80bmqtsMEfvUOr2Ps=; b=ucfzCfxRr1bAjgKA52TWy2DqxV2SYyzYAdK00jde2Xphi3RrOoFSR6G2OoLOSe3QKI r0HlnItpOdkbjSgmmG0YVZ2R/bnkNoZWn5jDua2clJqxc7UfGoyzVPrdH2kOry49aWRB Y6k5fRv5w27O+ymBsdCUToz7kL9Qy+fR4M455WSJnJYlaU/pOltX7T0FWj987/LTlysw TfdBi5AgAVXBnemA78yUw0kpPpcgqOnD5TYP3Tt/I/j5X8s4E3KwICwusMmUpsvVo0MW a3W3DzC2lsTX0ueVYkDv5cNUC/Kdvy94cFcaAFoSTXbEywSvxqzSYlokYY694E2AUQ8y 58GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UMK/1hhvEeD4E36Ltlsbs7CyxF80bmqtsMEfvUOr2Ps=; b=jitDo3wjMIdzDZKQ0G83odln7UjEUQo9AZBbUaz4JIxIAkKqt78DcyjV70QdZ6BjH+ WQ78NbUKfYNivIQM+Pz3k99ZIUnb7H3Uzc5iX0BKO5phObm8+2gnAxXWsPR9cBozqBAG u4up6f1gkrbVhrl4aJR51aCjRKlaCb1qPxfsbPEwwybWPk+Veo5IuCggnjH8p4oJuMqc uVy3wBTXI1/5iFJhpJf9uDWfXLOY6Bnv2eHzgGdjsmbL/lsuTfx6nlaY9K/9UmCNFsus oZlZUqCh44D0uoGpwfH3sIkH4zvsCaSsajau7HB30hTDMblrqV7A0HMmlReNs2mV4EAx XtVQ== X-Gm-Message-State: AMke39kWvWhIhJHsAkzxve3f7EjOOKck7EbA1DweqBkGaklQB2VvjO6WNV965MNPLw0BOA== X-Received: by 10.84.209.194 with SMTP id y60mr22819735plh.115.1487211682956; Wed, 15 Feb 2017 18:21:22 -0800 (PST) Received: from majic.sklembedded.com (c-98-210-181-167.hsd1.ca.comcast.net. [98.210.181.167]) by smtp.googlemail.com with ESMTPSA id t6sm9869352pgt.8.2017.02.15.18.21.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Feb 2017 18:21:21 -0800 (PST) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com, linux@armlinux.org.uk, mchehab@kernel.org, hverkuil@xs4all.nl, nick@shmanahar.org, markus.heiser@darmarIT.de, p.zabel@pengutronix.de, laurent.pinchart+renesas@ideasonboard.com, bparrot@ti.com, geert@linux-m68k.org, arnd@arndb.de, sudipm.mukherjee@gmail.com, minghsiu.tsai@mediatek.com, tiffany.lin@mediatek.com, jean-christophe.trotin@st.com, horms+renesas@verge.net.au, niklas.soderlund+renesas@ragnatech.se, robert.jarzmik@free.fr, songjun.wu@microchip.com, andrew-ct.chen@mediatek.com, gregkh@linuxfoundation.org, shuah@kernel.org, sakari.ailus@linux.intel.com, pavel@ucw.cz Subject: [PATCH v4 34/36] media: imx: csi: add frame skipping support Date: Wed, 15 Feb 2017 18:19:36 -0800 Message-Id: <1487211578-11360-35-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487211578-11360-1-git-send-email-steve_longerbeam@mentor.com> References: <1487211578-11360-1-git-send-email-steve_longerbeam@mentor.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170216_022139_939747_28B5C850 X-CRM114-Status: GOOD ( 24.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, Steve Longerbeam , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philipp Zabel The CSI can skip any out of up to 6 input frames, allowing to reduce the frame rate at the output pads by small fractions. Signed-off-by: Philipp Zabel Signed-off-by: Steve Longerbeam --- drivers/staging/media/imx/imx-media-csi.c | 119 +++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 1d4e746..6284f99 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -9,6 +9,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ +#include #include #include #include @@ -40,6 +41,18 @@ #define H_ALIGN 1 /* multiple of 2 lines */ #define S_ALIGN 1 /* multiple of 2 */ +/* + * struct csi_skip_desc - CSI frame skipping descriptor + * @keep - number of frames kept per max_ratio frames + * @max_ratio - width of skip_smfc, written to MAX_RATIO bitfield + * @skip_smfc - skip pattern written to the SKIP_SMFC bitfield + */ +struct csi_skip_desc { + u8 keep; + u8 max_ratio; + u8 skip_smfc; +}; + struct csi_priv { struct device *dev; struct ipu_soc *ipu; @@ -58,6 +71,7 @@ struct csi_priv { const struct imx_media_pixfmt *cc[CSI_NUM_PADS]; struct v4l2_fract frame_interval; struct v4l2_rect crop; + const struct csi_skip_desc *skip[CSI_NUM_PADS - 1]; /* the video device at IDMAC output pad */ struct imx_media_video_dev *vdev; @@ -512,10 +526,12 @@ static int csi_setup(struct csi_priv *priv) struct v4l2_mbus_config sensor_mbus_cfg; struct v4l2_of_endpoint *sensor_ep; struct v4l2_mbus_framefmt if_fmt; + const struct csi_skip_desc *skip; infmt = &priv->format_mbus[CSI_SINK_PAD]; outfmt = &priv->format_mbus[priv->active_output_pad]; sensor_ep = &priv->sensor->sensor_ep; + skip = priv->skip[priv->active_output_pad - 1]; /* compose mbus_config from sensor endpoint */ sensor_mbus_cfg.type = sensor_ep->bus_type; @@ -540,6 +556,9 @@ static int csi_setup(struct csi_priv *priv) ipu_csi_set_dest(priv->csi, priv->dest); + ipu_csi_set_skip_smfc(priv->csi, skip->skip_smfc, skip->max_ratio - 1, + 0); + ipu_csi_dump(priv->csi); return 0; @@ -603,26 +622,115 @@ static void csi_stop(struct csi_priv *priv) ipu_csi_disable(priv->csi); } +static const struct csi_skip_desc csi_skip[12] = { + { 1, 1, 0x00 }, /* Keep all frames */ + { 5, 6, 0x10 }, /* Skip every sixth frame */ + { 4, 5, 0x08 }, /* Skip every fifth frame */ + { 3, 4, 0x04 }, /* Skip every fourth frame */ + { 2, 3, 0x02 }, /* Skip every third frame */ + { 3, 5, 0x0a }, /* Skip frames 1 and 3 of every 5 */ + { 1, 2, 0x01 }, /* Skip every second frame */ + { 2, 5, 0x0b }, /* Keep frames 1 and 4 of every 5 */ + { 1, 3, 0x03 }, /* Keep one in three frames */ + { 1, 4, 0x07 }, /* Keep one in four frames */ + { 1, 5, 0x0f }, /* Keep one in five frames */ + { 1, 6, 0x1f }, /* Keep one in six frames */ +}; + +static void csi_apply_skip_interval(const struct csi_skip_desc *skip, + struct v4l2_fract *interval) +{ + unsigned int div; + + interval->numerator *= skip->max_ratio; + interval->denominator *= skip->keep; + + /* Reduce fraction to lowest terms */ + div = gcd(interval->numerator, interval->denominator); + if (div > 1) { + interval->numerator /= div; + interval->denominator /= div; + } +} + static int csi_g_frame_interval(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi) { struct csi_priv *priv = v4l2_get_subdevdata(sd); + if (fi->pad >= CSI_NUM_PADS) + return -EINVAL; + fi->interval = priv->frame_interval; + if (fi->pad != CSI_SINK_PAD) + csi_apply_skip_interval(priv->skip[fi->pad - 1], &fi->interval); + return 0; } +/* + * Find the skip pattern to produce the output frame interval closest to the + * requested one, for the given input frame interval. Updates the output frame + * interval to the exact value. + */ +static const struct csi_skip_desc *csi_find_best_skip(struct v4l2_fract *in, + struct v4l2_fract *out) +{ + const struct csi_skip_desc *skip = &csi_skip[0], *best_skip = skip; + u32 min_err = UINT_MAX; + u64 want_us; + int i; + + /* Default to 1:1 ratio */ + if (out->numerator == 0 || out->denominator == 0 || + in->numerator == 0 || in->denominator == 0) + return best_skip; + + want_us = div_u64((u64)USEC_PER_SEC * out->numerator, out->denominator); + + /* Find the reduction closest to the requested time per frame */ + for (i = 0; i < ARRAY_SIZE(csi_skip); i++, skip++) { + u64 tmp, err; + + tmp = div_u64((u64)USEC_PER_SEC * in->numerator * + skip->max_ratio, in->denominator * skip->keep); + + err = abs((s64)tmp - want_us); + if (err < min_err) { + min_err = err; + best_skip = skip; + } + } + + *out = *in; + csi_apply_skip_interval(best_skip, out); + + return best_skip; +} + static int csi_s_frame_interval(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi) { struct csi_priv *priv = v4l2_get_subdevdata(sd); - /* Output pads mirror active input pad, no limits on input pads */ - if (fi->pad == CSI_SRC_PAD_IDMAC || fi->pad == CSI_SRC_PAD_DIRECT) - fi->interval = priv->frame_interval; + if (fi->pad >= CSI_NUM_PADS) + return -EINVAL; + + /* No limits on input pad */ + if (fi->pad == CSI_SINK_PAD) { + priv->frame_interval = fi->interval; + + /* Reset frame skipping ratio to 1:1 */ + priv->skip[0] = &csi_skip[0]; + priv->skip[1] = &csi_skip[0]; + + return 0; + } - priv->frame_interval = fi->interval; + /* Output pads depend on input interval, modified by frame skipping */ + priv->skip[fi->pad - 1] = csi_find_best_skip(&priv->frame_interval, + &fi->interval); return 0; } @@ -1198,6 +1306,9 @@ static int csi_registered(struct v4l2_subdev *sd) &priv->cc[i]); if (ret) goto put_csi; + /* disable frame skipping */ + if (i != CSI_SINK_PAD) + priv->skip[i - 1] = &csi_skip[0]; } priv->fim = imx_media_fim_init(&priv->sd);