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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E25FC433EF for ; Sun, 20 Feb 2022 11:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234424AbiBTLxw (ORCPT ); Sun, 20 Feb 2022 06:53:52 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:42200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233630AbiBTLxs (ORCPT ); Sun, 20 Feb 2022 06:53:48 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74F424EF40 for ; Sun, 20 Feb 2022 03:53:27 -0800 (PST) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 37E3D25B; Sun, 20 Feb 2022 12:53:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1645358005; bh=9cB3/v8gMwBAbf4m8ctRHOYw7wCWeuKEQtwsh73d5Vo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=afRmXmInqbpLwi91WT0dQRBzP49smrQdd7+DtoukzZ0NpMeo0CmVuUr6Y6MmFGdhU Qw/5Tvvw0G+zpB5/CsmMQvXamsmI2U2qw8n3yVnZhc2k43+9lXQnKfeyZsYE4HTSFe pd7YcPrzxmNDAD3zb2h2bfEr1jX/FZgEvU5uqM1k= Date: Sun, 20 Feb 2022 13:53:15 +0200 From: Laurent Pinchart To: Jacopo Mondi Cc: Steve Longerbeam , sakari.ailus@iki.fi, hverkuil-cisco@xs4all.nl, mirela.rabulea@nxp.com, xavier.roumegue@oss.nxp.com, tomi.valkeinen@ideasonboard.com, hugues.fruchet@st.com, prabhakar.mahadev-lad.rj@bp.renesas.com, aford173@gmail.com, festevam@gmail.com, Eugen.Hristev@microchip.com, jbrunet@baylibre.com, Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: Re: [PATCH v2 01/23] media: ov5640: Add pixel rate to modes Message-ID: References: <20220210110458.152494-1-jacopo@jmondi.org> <20220210110458.152494-2-jacopo@jmondi.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220210110458.152494-2-jacopo@jmondi.org> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Jacopo, Thank you for the patch. On Thu, Feb 10, 2022 at 12:04:36PM +0100, Jacopo Mondi wrote: > Add to each mode supported by the sensor the ideal pixel rate, as > defined by Table 2.1 in the chip manual. > > The ideal pixel rate will be used to compute the MIPI CSI-2 clock tree. > > Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart > --- > drivers/media/i2c/ov5640.c | 44 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 41 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c > index db5a19babe67..01f4a075f86e 100644 > --- a/drivers/media/i2c/ov5640.c > +++ b/drivers/media/i2c/ov5640.c > @@ -118,6 +118,29 @@ enum ov5640_frame_rate { > OV5640_NUM_FRAMERATES, > }; > > +enum ov5640_pixel_rate_id { > + OV5640_PIXEL_RATE_168M, > + OV5640_PIXEL_RATE_148M, > + OV5640_PIXEL_RATE_124M, > + OV5640_PIXEL_RATE_96M, > + OV5640_PIXEL_RATE_48M, > + OV5640_NUM_PIXEL_RATES, > +}; > + > +/* > + * The chip manual suggests 24/48/96/192 MHz pixel clocks. > + * > + * 192MHz exceeds the sysclk limits; use 168MHz as maximum pixel rate for > + * full resolution mode @15 FPS. > + */ > +static const u32 ov5640_pixel_rates[] = { > + [OV5640_PIXEL_RATE_168M] = 168000000, > + [OV5640_PIXEL_RATE_148M] = 148000000, > + [OV5640_PIXEL_RATE_124M] = 124000000, > + [OV5640_PIXEL_RATE_96M] = 96000000, > + [OV5640_PIXEL_RATE_48M] = 48000000, > +}; > + > enum ov5640_format_mux { > OV5640_FMT_MUX_YUV422 = 0, > OV5640_FMT_MUX_RGB, > @@ -189,6 +212,7 @@ struct reg_value { > struct ov5640_mode_info { > enum ov5640_mode_id id; > enum ov5640_downsize_mode dn_mode; > + enum ov5640_pixel_rate_id pixel_rate; > u32 hact; > u32 htot; > u32 vact; > @@ -565,7 +589,9 @@ static const struct reg_value ov5640_setting_QSXGA_2592_1944[] = { > > /* power-on sensor init reg table */ > static const struct ov5640_mode_info ov5640_mode_init_data = { > - 0, SUBSAMPLING, 640, 1896, 480, 984, > + 0, SUBSAMPLING, > + OV5640_PIXEL_RATE_96M, > + 640, 1896, 480, 984, > ov5640_init_setting_30fps_VGA, > ARRAY_SIZE(ov5640_init_setting_30fps_VGA), > OV5640_30_FPS, > @@ -574,51 +600,61 @@ static const struct ov5640_mode_info ov5640_mode_init_data = { > static const struct ov5640_mode_info > ov5640_mode_data[OV5640_NUM_MODES] = { > {OV5640_MODE_QQVGA_160_120, SUBSAMPLING, > + OV5640_PIXEL_RATE_48M, > 160, 1896, 120, 984, > ov5640_setting_QQVGA_160_120, > ARRAY_SIZE(ov5640_setting_QQVGA_160_120), > OV5640_30_FPS}, > {OV5640_MODE_QCIF_176_144, SUBSAMPLING, > + OV5640_PIXEL_RATE_48M, > 176, 1896, 144, 984, > ov5640_setting_QCIF_176_144, > ARRAY_SIZE(ov5640_setting_QCIF_176_144), > OV5640_30_FPS}, > {OV5640_MODE_QVGA_320_240, SUBSAMPLING, > + OV5640_PIXEL_RATE_48M, > 320, 1896, 240, 984, > ov5640_setting_QVGA_320_240, > ARRAY_SIZE(ov5640_setting_QVGA_320_240), > OV5640_30_FPS}, > {OV5640_MODE_VGA_640_480, SUBSAMPLING, > + OV5640_PIXEL_RATE_48M, > 640, 1896, 480, 1080, > ov5640_setting_VGA_640_480, > ARRAY_SIZE(ov5640_setting_VGA_640_480), > OV5640_60_FPS}, > {OV5640_MODE_NTSC_720_480, SUBSAMPLING, > + OV5640_PIXEL_RATE_96M, > 720, 1896, 480, 984, > ov5640_setting_NTSC_720_480, > ARRAY_SIZE(ov5640_setting_NTSC_720_480), > OV5640_30_FPS}, > {OV5640_MODE_PAL_720_576, SUBSAMPLING, > + OV5640_PIXEL_RATE_96M, > 720, 1896, 576, 984, > ov5640_setting_PAL_720_576, > ARRAY_SIZE(ov5640_setting_PAL_720_576), > OV5640_30_FPS}, > {OV5640_MODE_XGA_1024_768, SUBSAMPLING, > + OV5640_PIXEL_RATE_96M, > 1024, 1896, 768, 1080, > ov5640_setting_XGA_1024_768, > ARRAY_SIZE(ov5640_setting_XGA_1024_768), > OV5640_30_FPS}, > {OV5640_MODE_720P_1280_720, SUBSAMPLING, > + OV5640_PIXEL_RATE_124M, > 1280, 1892, 720, 740, > ov5640_setting_720P_1280_720, > ARRAY_SIZE(ov5640_setting_720P_1280_720), > OV5640_30_FPS}, > {OV5640_MODE_1080P_1920_1080, SCALING, > + OV5640_PIXEL_RATE_148M, > 1920, 2500, 1080, 1120, > ov5640_setting_1080P_1920_1080, > ARRAY_SIZE(ov5640_setting_1080P_1920_1080), > OV5640_30_FPS}, > {OV5640_MODE_QSXGA_2592_1944, SCALING, > + OV5640_PIXEL_RATE_168M, > 2592, 2844, 1944, 1968, > ov5640_setting_QSXGA_2592_1944, > ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), > @@ -2743,6 +2779,7 @@ static const struct v4l2_ctrl_ops ov5640_ctrl_ops = { > > static int ov5640_init_controls(struct ov5640_dev *sensor) > { > + const struct ov5640_mode_info *mode = sensor->current_mode; > const struct v4l2_ctrl_ops *ops = &ov5640_ctrl_ops; > struct ov5640_ctrls *ctrls = &sensor->ctrls; > struct v4l2_ctrl_handler *hdl = &ctrls->handler; > @@ -2755,8 +2792,9 @@ static int ov5640_init_controls(struct ov5640_dev *sensor) > > /* Clock related controls */ > ctrls->pixel_rate = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_PIXEL_RATE, > - 0, INT_MAX, 1, > - ov5640_calc_pixel_rate(sensor)); > + ov5640_pixel_rates[OV5640_NUM_PIXEL_RATES - 1], > + ov5640_pixel_rates[0], 1, > + ov5640_pixel_rates[mode->pixel_rate]); > > /* Auto/manual white balance */ > ctrls->auto_wb = v4l2_ctrl_new_std(hdl, ops, -- Regards, Laurent Pinchart