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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66529C433F5 for ; Wed, 6 Oct 2021 09:36:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5203B61040 for ; Wed, 6 Oct 2021 09:36:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237941AbhJFJis convert rfc822-to-8bit (ORCPT ); Wed, 6 Oct 2021 05:38:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbhJFJir (ORCPT ); Wed, 6 Oct 2021 05:38:47 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A4ADC061749 for ; Wed, 6 Oct 2021 02:36:55 -0700 (PDT) Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mY3M1-0006PB-OZ; Wed, 06 Oct 2021 11:36:49 +0200 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1mY3Lz-00081L-Vx; Wed, 06 Oct 2021 11:36:47 +0200 Message-ID: <568f79774cc148c58b9045da7b94b4e9e500810b.camel@pengutronix.de> Subject: Re: [PATCH] i.MX6: Support 16-bit BT.1120 video input From: Philipp Zabel To: Krzysztof =?UTF-8?Q?Ha=C5=82asa?= , Steve Longerbeam Cc: Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org Date: Wed, 06 Oct 2021 11:36:47 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Krzysztof, On Wed, 2021-10-06 at 08:13 +0200, Krzysztof Hałasa wrote: > Confirmed to work with ADV7610 HDMI receiver. > > Signed-off-by: Krzysztof Hałasa > > diff --git a/drivers/gpu/ipu-v3/ipu-csi.c b/drivers/gpu/ipu-v3/ipu-csi.c > index 658c173bebdf..2893b68f1f7a 100644 > --- a/drivers/gpu/ipu-v3/ipu-csi.c > +++ b/drivers/gpu/ipu-v3/ipu-csi.c > @@ -261,10 +261,24 @@ static int mbus_code_to_bus_cfg(struct ipu_csi_bus_config *cfg, u32 mbus_code, > cfg->data_width = IPU_CSI_DATA_WIDTH_8; > break; > case MEDIA_BUS_FMT_UYVY8_1X16: > + if (mbus_type == V4L2_MBUS_BT656) { > + cfg->data_fmt = CSI_SENS_CONF_DATA_FMT_YUV422_UYVY; > + cfg->data_width = IPU_CSI_DATA_WIDTH_8; > + } else { > + cfg->data_fmt = CSI_SENS_CONF_DATA_FMT_BAYER; > + cfg->data_width = IPU_CSI_DATA_WIDTH_16; > + } > + cfg->mipi_dt = MIPI_DT_YUV422; > + break; > case MEDIA_BUS_FMT_YUYV8_1X16: > - cfg->data_fmt = CSI_SENS_CONF_DATA_FMT_BAYER; > + if (mbus_type == V4L2_MBUS_BT656) { > + cfg->data_fmt = CSI_SENS_CONF_DATA_FMT_YUV422_YUYV; > + cfg->data_width = IPU_CSI_DATA_WIDTH_8; > + } else { > + cfg->data_fmt = CSI_SENS_CONF_DATA_FMT_BAYER; > + cfg->data_width = IPU_CSI_DATA_WIDTH_16; > + } > cfg->mipi_dt = MIPI_DT_YUV422; > - cfg->data_width = IPU_CSI_DATA_WIDTH_16; > break; > case MEDIA_BUS_FMT_SBGGR8_1X8: > case MEDIA_BUS_FMT_SGBRG8_1X8: > @@ -352,7 +366,7 @@ static int fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg, > const struct v4l2_mbus_config *mbus_cfg, > const struct v4l2_mbus_framefmt *mbus_fmt) > { > - int ret; > + int ret, is_bt1120; > > memset(csicfg, 0, sizeof(*csicfg)); > > @@ -373,11 +387,18 @@ static int fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg, > break; > case V4L2_MBUS_BT656: > csicfg->ext_vsync = 0; > + /* UYVY10_1X20 etc. should be supported as well */ > + is_bt1120 = mbus_fmt->code == MEDIA_BUS_FMT_UYVY8_1X16 || > + mbus_fmt->code == MEDIA_BUS_FMT_YUYV8_1X16; > if (V4L2_FIELD_HAS_BOTH(mbus_fmt->field) || > mbus_fmt->field == V4L2_FIELD_ALTERNATE) > - csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_INTERLACED; > + csicfg->clk_mode = is_bt1120 ? > + IPU_CSI_CLK_MODE_CCIR1120_INTERLACED_SDR : > + IPU_CSI_CLK_MODE_CCIR656_INTERLACED; > else > - csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_PROGRESSIVE; > + csicfg->clk_mode = is_bt1120 ? > + IPU_CSI_CLK_MODE_CCIR1120_PROGRESSIVE_SDR : > + IPU_CSI_CLK_MODE_CCIR656_PROGRESSIVE; > break; > case V4L2_MBUS_CSI2_DPHY: > /* > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 45f9d797b9da..ba93512f8c71 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -139,6 +139,8 @@ static inline bool is_parallel_16bit_bus(struct v4l2_fwnode_endpoint *ep) > * Check for conditions that require the IPU to handle the > * data internally as generic data, aka passthrough mode: > * - raw bayer media bus formats, or > + * - BT.656 and BT.1120 (8/10-bit YUV422) data can always be processed > + * on-the-fly (converted to YUV420) This comment seems misleading. The CSI converts to YUV 4:4:4 internally. > * - the CSI is receiving from a 16-bit parallel bus, or > * - the CSI is receiving from an 8-bit parallel bus and the incoming > * media bus format is other than UYVY8_2X8/YUYV8_2X8. > @@ -147,6 +149,9 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep, > struct v4l2_mbus_framefmt *infmt, > const struct imx_media_pixfmt *incc) > { > + if (ep->bus_type == V4L2_MBUS_BT656) // including BT.1120 > + return 0; > + > return incc->bayer || is_parallel_16bit_bus(ep) || > (is_parallel_bus(ep) && > infmt->code != MEDIA_BUS_FMT_UYVY8_2X8 && regards Philipp