From patchwork Tue Sep 15 09:04:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 11775875 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF72492C for ; Tue, 15 Sep 2020 09:05:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB4BF21D7A for ; Tue, 15 Sep 2020 09:05:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="A+F2K0kf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726311AbgIOJFK (ORCPT ); Tue, 15 Sep 2020 05:05:10 -0400 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:41797 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726208AbgIOJFI (ORCPT ); Tue, 15 Sep 2020 05:05:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1600160708; x=1631696708; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=DH9KRJzkxhuMNPBchnQyI12kl0tRUGhcYDUgZ1rYYe0=; b=A+F2K0kfvY0Jar6j+x50euNwZH6B75E2ESxf+g2JoG/HGqAk5ociO3la /JR1My8OIzWm1iNP2iCLWGjjO/zG10VUYDcV5HEH8e39fvZ/uwC9MvmPw XsFlzjFBSXBSzqk2hZ42YrKikzVnZ/y1obzfdZuIJCobn2S5U+7c/DECl YIqB1mKlpAh7pChTgn9toel3e1CB9F0VAdETaQdXP0qgrut0a/JEXesbf R8isoWhKCrJ69x5EoDcXkgsdbLtlfKPT7sH0M5Gie8uhimyY2QfQv9AlD y9w5GZjH+zYnx2qNYt8QIzWDJ7QVu6wzeEsZn7SGk5KYsjr2Csc0yh122 Q==; IronPort-SDR: 8H0qUWzygEg56JrtTL6VVtOIxnCOFNR/q4aaB3MpoPKvsArAcqDjOIwrd4ccDl2RikxUl/ONvx qaxKWbJQudxV2/3WlUVbWFgNGD0c+uWB+t8XISD4ZhkDlc3M9xBUYdVaWv0ysNIzq8m4uBjvMH VkrE610alwoofUkyZiOjZJ6/OMFXQKeYcIog6/TzUeq5mMG9b6YbtR4sESO2+wMIQ7ILY2YjX/ 8H1eiAn+JvAcFXzvM7itIl9M17yz4rIS6XwDKuHIvbUDy31StTy19c/wmAwsjGtKLZylRYduR4 UiI= X-IronPort-AV: E=Sophos;i="5.76,429,1592895600"; d="scan'208";a="86900386" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Sep 2020 02:05:03 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 15 Sep 2020 02:05:02 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 15 Sep 2020 02:04:39 -0700 From: Eugen Hristev To: , , CC: , , "Eugen Hristev" , Sakari Ailus Subject: [PATCH v2 1/2] media: imx274: remove binning enum Date: Tue, 15 Sep 2020 12:04:41 +0300 Message-ID: <20200915090442.52322-1-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Binning enum is unused. Remove from driver. Suggested-by: Sakari Ailus Signed-off-by: Eugen Hristev Reviewed-by: Luca Ceresoli --- Changes in v2: - new patch drivers/media/i2c/imx274.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index e6aa9f32b6a8..69221c2c192c 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -65,7 +65,6 @@ */ #define IMX274_MIN_EXPOSURE_TIME (4 * 260 / 72) -#define IMX274_DEFAULT_BINNING IMX274_BINNING_OFF #define IMX274_MAX_WIDTH (3840) #define IMX274_MAX_HEIGHT (2160) #define IMX274_MAX_FRAME_RATE (120) @@ -145,12 +144,6 @@ static const struct regmap_config imx274_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -enum imx274_binning { - IMX274_BINNING_OFF, - IMX274_BINNING_2_1, - IMX274_BINNING_3_1, -}; - /* * Parameters for each imx274 readout mode. * @@ -1837,7 +1830,7 @@ static int imx274_probe(struct i2c_client *client) mutex_init(&imx274->lock); /* initialize format */ - imx274->mode = &imx274_modes[IMX274_DEFAULT_BINNING]; + imx274->mode = &imx274_modes[0]; imx274->crop.width = IMX274_MAX_WIDTH; imx274->crop.height = IMX274_MAX_HEIGHT; imx274->format.width = imx274->crop.width / imx274->mode->bin_ratio; From patchwork Tue Sep 15 09:04:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 11775877 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D211592C for ; Tue, 15 Sep 2020 09:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ADC2E218AC for ; Tue, 15 Sep 2020 09:05:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="G3OSgb6P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726353AbgIOJFV (ORCPT ); Tue, 15 Sep 2020 05:05:21 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:17843 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbgIOJFT (ORCPT ); Tue, 15 Sep 2020 05:05:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1600160718; x=1631696718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V/BSQqibqorIMq/EJ5p3iRt9qa3GhZrD2bYI1ikaWrM=; b=G3OSgb6PC0nC0Rbm1m5aSokADRGxw6+V8sloJU1xu/XUffvJES39iruA k4oFSi5wgvgo8ngBkMCiWFZcGca5wZ4/fS7ltQ5BuJaqaUzicSk2pyg6e /5sEa8e+AwZzOUlhnTd9zEcUCq/9Mh45rJew47SNGgpoWblywKPePYBuH /3hbSn1z5XMCT3/Gjv6OGLIGByfR8owDt6TG6uoO/nCC8xdevaIMmgHst W82twzKjURv8P/ivi4c53xonp6Gs0sHfirbvVrlpgpQ5zxr5ITxauqCBv nt664h2vtUNGXlrdRpJUIRTFHgrZ3zjmtqVZjRmWjH+V0/Ez7UxIzBn3j Q==; IronPort-SDR: C4SfAl61A1PpKRgvKMc1O1hiRLFU/cGcOgS85TIba7nAc1Wtw33LpraWpigw/VevNb7KY7e8m2 aJH5qavxP64ljv2b+lxPnu5XOQvO3nU73wsQz1o3mWOCovw8Has+yIaPFj26swDeX1U/UZDeLE djfz15fWCzD0u9Y7wVulnU63KS5G6D/RBj6kzQ1iZjEQVgSqgDjDsT+aQ1brUUiRoG/wjanch8 BiI4XkPBBHn3QUyxKjy+I15CJwbTB9hbGcZ7cgDz5ikS1KWiKIFUMuexx2MP0HRGCW2ouOv03d oas= X-IronPort-AV: E=Sophos;i="5.76,429,1592895600"; d="scan'208";a="91030353" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Sep 2020 02:05:09 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 15 Sep 2020 02:05:00 -0700 Received: from ROB-ULT-M18282.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 15 Sep 2020 02:04:55 -0700 From: Eugen Hristev To: , , CC: , , "Eugen Hristev" Subject: [PATCH v2 2/2] media: imx274: add support for sensor mode6, 1280x540 Date: Tue, 15 Sep 2020 12:04:42 +0300 Message-ID: <20200915090442.52322-2-eugen.hristev@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915090442.52322-1-eugen.hristev@microchip.com> References: <20200915090442.52322-1-eugen.hristev@microchip.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add support for the mode 6 for the sensor, this mode uses 3/8 subsampling and 3 horizontal binning. Aspect ratio is changed. Split the bin_ratio variable into two parts, one for width and one for height, as the ratio is no longer preserved when doing subsampling in this mode. Signed-off-by: Eugen Hristev Reviewed-by: Luca Ceresoli --- Changes in v2: - changed ratios to u8 instead of int - changed dbg message to show ratio x ratio instead of ratio:ratio - fixed typo in comment 1920 instead of 1620 drivers/media/i2c/imx274.c | 84 +++++++++++++++++++++++++++++++------- 1 file changed, 70 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index 69221c2c192c..0a2a14789ea2 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -151,7 +151,8 @@ static const struct regmap_config imx274_regmap_config = { * implemented modes. * * @init_regs: registers to initialize the mode - * @bin_ratio: downscale factor (e.g. 3 for 3:1 binning) + * @wbin_ratio: width downscale factor (e.g. 3 for 1280; 3 = 3840/1280) + * @hbin_ratio: height downscale factor (e.g. 3 for 720; 3 = 2160/720) * @min_frame_len: Minimum frame length for each mode (see "Frame Rate * Adjustment (CSI-2)" in the datasheet) * @min_SHR: Minimum SHR register value (see "Shutter Setting (CSI-2)" in the @@ -162,7 +163,8 @@ static const struct regmap_config imx274_regmap_config = { */ struct imx274_mode { const struct reg_8 *init_regs; - unsigned int bin_ratio; + u8 wbin_ratio; + u8 hbin_ratio; int min_frame_len; int min_SHR; int max_fps; @@ -325,6 +327,46 @@ static const struct reg_8 imx274_mode5_1280x720_raw10[] = { {IMX274_TABLE_END, 0x00} }; +/* + * Vertical 2/8 subsampling horizontal 3 binning + * imx274 mode6(refer to datasheet) register configuration with + * 1280x540 resolution, raw10 data and mipi four lane output + */ +static const struct reg_8 imx274_mode6_1280x540_raw10[] = { + {0x3004, 0x04}, /* mode setting */ + {0x3005, 0x31}, + {0x3006, 0x00}, + {0x3007, 0x02}, /* mode setting */ + + {0x3018, 0xA2}, /* output XVS, HVS */ + + {0x306B, 0x05}, + {0x30E2, 0x04}, /* mode setting */ + + {0x30EE, 0x01}, + {0x3342, 0x0A}, + {0x3343, 0x00}, + {0x3344, 0x16}, + {0x3345, 0x00}, + {0x33A6, 0x01}, + {0x3528, 0x0E}, + {0x3554, 0x1F}, + {0x3555, 0x01}, + {0x3556, 0x01}, + {0x3557, 0x01}, + {0x3558, 0x01}, + {0x3559, 0x00}, + {0x355A, 0x00}, + {0x35BA, 0x0E}, + {0x366A, 0x1B}, + {0x366B, 0x1A}, + {0x366C, 0x19}, + {0x366D, 0x17}, + {0x3A41, 0x04}, + + {IMX274_TABLE_END, 0x00} +}; + /* * imx274 first step register configuration for * starting stream @@ -438,7 +480,8 @@ static const struct reg_8 imx274_tp_regs[] = { static const struct imx274_mode imx274_modes[] = { { /* mode 1, 4K */ - .bin_ratio = 1, + .wbin_ratio = 1, /* 3840 */ + .hbin_ratio = 1, /* 2160 */ .init_regs = imx274_mode1_3840x2160_raw10, .min_frame_len = 4550, .min_SHR = 12, @@ -447,7 +490,8 @@ static const struct imx274_mode imx274_modes[] = { }, { /* mode 3, 1080p */ - .bin_ratio = 2, + .wbin_ratio = 2, /* 1920 */ + .hbin_ratio = 2, /* 1080 */ .init_regs = imx274_mode3_1920x1080_raw10, .min_frame_len = 2310, .min_SHR = 8, @@ -456,13 +500,24 @@ static const struct imx274_mode imx274_modes[] = { }, { /* mode 5, 720p */ - .bin_ratio = 3, + .wbin_ratio = 3, /* 1280 */ + .hbin_ratio = 3, /* 720 */ .init_regs = imx274_mode5_1280x720_raw10, .min_frame_len = 2310, .min_SHR = 8, .max_fps = 120, .nocpiop = 112, }, + { + /* mode 6, 540p */ + .wbin_ratio = 3, /* 1280 */ + .hbin_ratio = 4, /* 540 */ + .init_regs = imx274_mode6_1280x540_raw10, + .min_frame_len = 2310, + .min_SHR = 4, + .max_fps = 120, + .nocpiop = 112, + }, }; /* @@ -885,12 +940,13 @@ static int __imx274_change_compose(struct stimx274 *imx274, } for (i = 0; i < ARRAY_SIZE(imx274_modes); i++) { - unsigned int ratio = imx274_modes[i].bin_ratio; + u8 wratio = imx274_modes[i].wbin_ratio; + u8 hratio = imx274_modes[i].hbin_ratio; int goodness = imx274_binning_goodness( imx274, - cur_crop->width / ratio, *width, - cur_crop->height / ratio, *height, + cur_crop->width / wratio, *width, + cur_crop->height / hratio, *height, flags); if (goodness >= best_goodness) { @@ -899,14 +955,14 @@ static int __imx274_change_compose(struct stimx274 *imx274, } } - *width = cur_crop->width / best_mode->bin_ratio; - *height = cur_crop->height / best_mode->bin_ratio; + *width = cur_crop->width / best_mode->wbin_ratio; + *height = cur_crop->height / best_mode->hbin_ratio; if (which == V4L2_SUBDEV_FORMAT_ACTIVE) imx274->mode = best_mode; - dev_dbg(dev, "%s: selected %u:1 binning\n", - __func__, best_mode->bin_ratio); + dev_dbg(dev, "%s: selected %ux%u binning\n", + __func__, best_mode->wbin_ratio, best_mode->hbin_ratio); tgt_fmt->width = *width; tgt_fmt->height = *height; @@ -1833,8 +1889,8 @@ static int imx274_probe(struct i2c_client *client) imx274->mode = &imx274_modes[0]; imx274->crop.width = IMX274_MAX_WIDTH; imx274->crop.height = IMX274_MAX_HEIGHT; - imx274->format.width = imx274->crop.width / imx274->mode->bin_ratio; - imx274->format.height = imx274->crop.height / imx274->mode->bin_ratio; + imx274->format.width = imx274->crop.width / imx274->mode->wbin_ratio; + imx274->format.height = imx274->crop.height / imx274->mode->hbin_ratio; imx274->format.field = V4L2_FIELD_NONE; imx274->format.code = MEDIA_BUS_FMT_SRGGB10_1X10; imx274->format.colorspace = V4L2_COLORSPACE_SRGB;