From patchwork Fri Feb 28 16:55:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 11412885 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 2F3DC13A4 for ; Fri, 28 Feb 2020 16:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 035F7246B9 for ; Fri, 28 Feb 2020 16:55:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vn2nzyRA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727039AbgB1QzO (ORCPT ); Fri, 28 Feb 2020 11:55:14 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53229 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726956AbgB1QzN (ORCPT ); Fri, 28 Feb 2020 11:55:13 -0500 Received: by mail-wm1-f66.google.com with SMTP id p9so3914791wmc.2; Fri, 28 Feb 2020 08:55:10 -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 :mime-version:content-transfer-encoding; bh=fL0yF0gmxXmJgVJQnDs+0h4iOtZEAKPKLqFiGHnUisA=; b=Vn2nzyRAY0HB6q5BNhhr/lxp8EqsjKo5RAHwxpJDxIXjV7ZWbO/1BuKWSpmlkrDPXK mg0Yz+Hq04RARqspdE8Yxa+qreTfjx92o6n7lWX+pGoIpFwhEz/mqf9g8rHOO/w8Q2L7 MpWGLOhPe/qLtROviwOQQfwYAyE3PIXZikvMi2e1xjjsGdQSTmDn7o2aJbjbDwcK9ip6 fAjV6LDwwuH6tS3BjrCBMjQRYQyeNltw+r2PTuNHddnTvxW7CwniMaPFL9zIgAKv5AAR V5ltRfakO2Nuktc8URBqNbJfKISqSHMKpIcqmWH+S7hC5//hcMXE1iNiNq0G21KmVz0i Ephg== 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:mime-version:content-transfer-encoding; bh=fL0yF0gmxXmJgVJQnDs+0h4iOtZEAKPKLqFiGHnUisA=; b=VTqfcAPVO53z4058fTrDQNV2+JTyikDC8xQ8wHnmtompjAXfL4PEIY3zWyNr/9BqJJ ssfv4blzPlUG6GP50QM4kOLWJn88cuqiQhgeqorq7PtjMnWGMdfkLT9UftV3CyA/JuTZ Nb2umlCgsKl53hnWoyFeK3z7PXSU9qrrygyRRxotwNeTamoP4EYjtKdEX/xupgvdBEJ/ Lpb8MCvllVMz7Deg3h1jiN2bmxZHWs/3YCRAj1YnGbRdNnXh6n9QziKb8cx9MF8oK401 ZogFTQ4dXxj6Wu9DFY5FlRWLzVilT7+UZdfrgvyZTMDM5bOin5YdTC6dJwOT2afMqKyw wktg== X-Gm-Message-State: APjAAAUTjnAG5241cuRB/CfTzF+H1FbZbN5rHocm+IoHWmLMGJNg7P0S sLpvlBbWt2CoOIGO+Hk27Mk= X-Google-Smtp-Source: APXvYqycJccY3lafmF1B4l6QbWFBn+oaCZ8Dno8IMFEn85E44gPop4298/IK2Yz9XlzYBS2nioWIcw== X-Received: by 2002:a1c:7907:: with SMTP id l7mr5465264wme.37.1582908909935; Fri, 28 Feb 2020 08:55:09 -0800 (PST) Received: from prasmi.home ([2a00:23c8:2510:d000:3855:fd13:6b76:a11b]) by smtp.gmail.com with ESMTPSA id s1sm13300071wro.66.2020.02.28.08.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 08:55:09 -0800 (PST) From: Lad Prabhakar X-Google-Original-From: Lad Prabhakar To: Mauro Carvalho Chehab , Dave Stevenson Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Lad Prabhakar Subject: [PATCH 2/3] media: i2c: imx219: Add support for SRGGB8_1X8 format Date: Fri, 28 Feb 2020 16:55:02 +0000 Message-Id: <20200228165503.18054-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228165503.18054-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20200228165503.18054-1-prabhakar.mahadev-lad.rj@bp.renesas.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org imx219 sensor is capable for RAW8/RAW10 modes, this commit adds support for SRGGB8_1X8 format. Signed-off-by: Lad Prabhakar --- drivers/media/i2c/imx219.c | 122 +++++++++++++++++++++++++++++-------- 1 file changed, 96 insertions(+), 26 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 8b48e148f2d0..1388c9bc00bb 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -90,6 +90,9 @@ #define IMX219_REG_ORIENTATION 0x0172 +#define IMX219_CSI_DATA_FORMAT_A_0_7 0x018c +#define IMX219_CSI_DATA_FORMAT_A_8_15 0x018d + /* Test Pattern Control */ #define IMX219_REG_TEST_PATTERN 0x0600 #define IMX219_TEST_PATTERN_DISABLE 0 @@ -135,6 +138,16 @@ struct imx219_mode { struct imx219_reg_list reg_list; }; +struct imx219_pixfmt { + u32 code; + u32 colorspace; +}; + +static const struct imx219_pixfmt imx219_formats[] = { + { MEDIA_BUS_FMT_SRGGB8_1X8, V4L2_COLORSPACE_SRGB, }, + { MEDIA_BUS_FMT_SRGGB10_1X10, V4L2_COLORSPACE_SRGB }, +}; + /* * Register sets lifted off the i2C interface from the Raspberry Pi firmware * driver. @@ -168,8 +181,6 @@ static const struct imx219_reg mode_3280x2464_regs[] = { {0x0171, 0x01}, {0x0174, 0x00}, {0x0175, 0x00}, - {0x018c, 0x0a}, - {0x018d, 0x0a}, {0x0301, 0x05}, {0x0303, 0x01}, {0x0304, 0x03}, @@ -230,8 +241,6 @@ static const struct imx219_reg mode_1920_1080_regs[] = { {0x0171, 0x01}, {0x0174, 0x00}, {0x0175, 0x00}, - {0x018c, 0x0a}, - {0x018d, 0x0a}, {0x0301, 0x05}, {0x0303, 0x01}, {0x0304, 0x03}, @@ -290,8 +299,6 @@ static const struct imx219_reg mode_1640_1232_regs[] = { {0x0171, 0x01}, {0x0174, 0x01}, {0x0175, 0x01}, - {0x018c, 0x0a}, - {0x018d, 0x0a}, {0x0301, 0x05}, {0x0303, 0x01}, {0x0304, 0x03}, @@ -413,6 +420,8 @@ struct imx219 { struct v4l2_subdev sd; struct media_pad pad; + struct v4l2_mbus_framefmt fmt; + struct clk *xclk; /* system clock to IMX219 */ u32 xclk_freq; @@ -519,19 +528,26 @@ static int imx219_write_regs(struct imx219 *imx219, } /* Get bayer order based on flip setting. */ -static u32 imx219_get_format_code(struct imx219 *imx219) +static u32 imx219_get_format_code(struct imx219 *imx219, u32 code) { - /* - * Only one bayer order is supported. - * It depends on the flip settings. - */ - static const u32 codes[2][2] = { + static const u32 codes10[2][2] = { { MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SGRBG10_1X10, }, { MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SBGGR10_1X10, }, }; + static const u32 codes8[2][2] = { + { MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_SGRBG8_1X8, }, + { MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_SBGGR8_1X8, }, + }; lockdep_assert_held(&imx219->mutex); - return codes[imx219->vflip->val][imx219->hflip->val]; + + if (code == MEDIA_BUS_FMT_SRGGB10_1X10 || + code == MEDIA_BUS_FMT_SGRBG10_1X10 || + code == MEDIA_BUS_FMT_SGBRG10_1X10 || + code == MEDIA_BUS_FMT_SBGGR10_1X10) + return codes10[imx219->vflip->val][imx219->hflip->val]; + + return codes8[imx219->vflip->val][imx219->hflip->val]; } static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) @@ -539,13 +555,26 @@ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) struct imx219 *imx219 = to_imx219(sd); struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(sd, fh->pad, 0); + struct v4l2_mbus_framefmt *fmt; mutex_lock(&imx219->mutex); + fmt = &imx219->fmt; + fmt->code = MEDIA_BUS_FMT_SRGGB8_1X8; + fmt->colorspace = V4L2_COLORSPACE_SRGB; + fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace); + fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true, + fmt->colorspace, + fmt->ycbcr_enc); + fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace); + fmt->width = supported_modes[0].width; + fmt->height = supported_modes[0].height; + fmt->field = V4L2_FIELD_NONE; + /* Initialize try_fmt */ try_fmt->width = supported_modes[0].width; try_fmt->height = supported_modes[0].height; - try_fmt->code = imx219_get_format_code(imx219); + try_fmt->code = imx219_get_format_code(imx219, fmt->code); try_fmt->field = V4L2_FIELD_NONE; mutex_unlock(&imx219->mutex); @@ -646,16 +675,12 @@ static int imx219_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_mbus_code_enum *code) { - struct imx219 *imx219 = to_imx219(sd); - - /* - * Only one bayer order is supported (though it depends on the flip - * settings) - */ - if (code->index > 0) + if (code->pad != 0) + return -EINVAL; + if (code->index >= ARRAY_SIZE(imx219_formats)) return -EINVAL; - code->code = imx219_get_format_code(imx219); + code->code = imx219_formats[code->index].code; return 0; } @@ -669,7 +694,7 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd, if (fse->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - if (fse->code != imx219_get_format_code(imx219)) + if (fse->code != imx219_get_format_code(imx219, imx219->fmt.code)) return -EINVAL; fse->min_width = supported_modes[fse->index].width; @@ -696,7 +721,7 @@ static void imx219_update_pad_format(struct imx219 *imx219, { fmt->format.width = mode->width; fmt->format.height = mode->height; - fmt->format.code = imx219_get_format_code(imx219); + fmt->format.code = imx219_get_format_code(imx219, imx219->fmt.code); fmt->format.field = V4L2_FIELD_NONE; imx219_reset_colorspace(&fmt->format); @@ -710,7 +735,7 @@ static int __imx219_get_pad_format(struct imx219 *imx219, struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(&imx219->sd, cfg, fmt->pad); /* update the code which could change due to vflip or hflip: */ - try_fmt->code = imx219_get_format_code(imx219); + try_fmt->code = imx219_get_format_code(imx219, try_fmt->code); fmt->format = *try_fmt; } else { imx219_update_pad_format(imx219, imx219->mode, fmt); @@ -741,11 +766,19 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, const struct imx219_mode *mode; struct v4l2_mbus_framefmt *framefmt; int exposure_max, exposure_def, hblank; + int i; mutex_lock(&imx219->mutex); + for (i = 0; i < ARRAY_SIZE(imx219_formats); i++) + if (imx219_formats[i].code == fmt->format.code) + break; + if (i >= ARRAY_SIZE(imx219_formats)) + i = 0; + /* Bayer order varies with flips */ - fmt->format.code = imx219_get_format_code(imx219); + fmt->format.code = imx219_get_format_code(imx219, + imx219_formats[i].code); mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes), @@ -756,6 +789,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, framefmt = v4l2_subdev_get_try_format(sd, cfg, fmt->pad); *framefmt = fmt->format; } else if (imx219->mode != mode) { + imx219->fmt = fmt->format; imx219->mode = mode; /* Update limits and set FPS to default */ __v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN, @@ -786,6 +820,36 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, return 0; } +static int imx219_set_framefmt(struct imx219 *imx219) +{ + int ret; + + switch (imx219->fmt.code) { + case MEDIA_BUS_FMT_SRGGB8_1X8: + case MEDIA_BUS_FMT_SGRBG8_1X8: + case MEDIA_BUS_FMT_SGBRG8_1X8: + case MEDIA_BUS_FMT_SBGGR8_1X8: + ret = imx219_write_reg(imx219, IMX219_CSI_DATA_FORMAT_A_0_7, + IMX219_REG_VALUE_08BIT, 0x08); + ret |= imx219_write_reg(imx219, IMX219_CSI_DATA_FORMAT_A_8_15, + IMX219_REG_VALUE_08BIT, 0x08); + break; + case MEDIA_BUS_FMT_SRGGB10_1X10: + case MEDIA_BUS_FMT_SGRBG10_1X10: + case MEDIA_BUS_FMT_SGBRG10_1X10: + case MEDIA_BUS_FMT_SBGGR10_1X10: + ret = imx219_write_reg(imx219, IMX219_CSI_DATA_FORMAT_A_0_7, + IMX219_REG_VALUE_08BIT, 0x0a); + ret |= imx219_write_reg(imx219, IMX219_CSI_DATA_FORMAT_A_8_15, + IMX219_REG_VALUE_08BIT, 0x0a); + break; + default: + ret = -EINVAL; + } + + return ret; +} + static int imx219_start_streaming(struct imx219 *imx219) { struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); @@ -800,6 +864,12 @@ static int imx219_start_streaming(struct imx219 *imx219) return ret; } + ret = imx219_set_framefmt(imx219); + if (ret) { + dev_err(&client->dev, "%s failed to set format\n", __func__); + return ret; + } + /* Apply customized values from user */ ret = __v4l2_ctrl_handler_setup(imx219->sd.ctrl_handler); if (ret)