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 B20BEC433EF for ; Tue, 2 Nov 2021 09:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93A9960F24 for ; Tue, 2 Nov 2021 09:26:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231136AbhKBJ3V (ORCPT ); Tue, 2 Nov 2021 05:29:21 -0400 Received: from mga03.intel.com ([134.134.136.65]:1670 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230468AbhKBJ3U (ORCPT ); Tue, 2 Nov 2021 05:29:20 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="231173844" X-IronPort-AV: E=Sophos;i="5.87,202,1631602800"; d="scan'208";a="231173844" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 02:26:44 -0700 X-IronPort-AV: E=Sophos;i="5.87,202,1631602800"; d="scan'208";a="638126437" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 02:26:40 -0700 Received: from paasikivi.fi.intel.com (localhost [127.0.0.1]) by paasikivi.fi.intel.com (Postfix) with SMTP id 3A87720180; Tue, 2 Nov 2021 11:26:38 +0200 (EET) Date: Tue, 2 Nov 2021 11:26:38 +0200 From: Sakari Ailus To: Daniel Scally Cc: Paul Kocialkowski , linux-media@vger.kernel.org, Yong Zhi , Bingbu Cao , Tianshu Qiu , Andy Shevchenko , Hans de Goede , Laurent Pinchart , Kieran Bingham Subject: Re: [PATCH v4 07/16] media: i2c: Add vblank control to ov8865 Message-ID: References: <20211101001119.46056-1-djrscally@gmail.com> <20211101001119.46056-8-djrscally@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Daniel, On Mon, Nov 01, 2021 at 11:45:45PM +0000, Daniel Scally wrote: > Hi Sakari > > On 01/11/2021 14:54, Sakari Ailus wrote: > > Hi Daniel, > > > > On Mon, Nov 01, 2021 at 12:11:10AM +0000, Daniel Scally wrote: > >> Add a V4L2_CID_VBLANK control to the ov8865 driver. > >> > >> Signed-off-by: Daniel Scally > >> --- > >> drivers/media/i2c/ov8865.c | 34 ++++++++++++++++++++++++++++++++++ > >> 1 file changed, 34 insertions(+) > >> > >> diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c > >> index a832938c33b6..f741c0713ca4 100644 > >> --- a/drivers/media/i2c/ov8865.c > >> +++ b/drivers/media/i2c/ov8865.c > >> @@ -183,6 +183,8 @@ > >> #define OV8865_VTS_H(v) (((v) & GENMASK(11, 8)) >> 8) > >> #define OV8865_VTS_L_REG 0x380f > >> #define OV8865_VTS_L(v) ((v) & GENMASK(7, 0)) > >> +#define OV8865_TIMING_MAX_VTS 0xffff > >> +#define OV8865_TIMING_MIN_VTS 0x04 > >> #define OV8865_OFFSET_X_H_REG 0x3810 > >> #define OV8865_OFFSET_X_H(v) (((v) & GENMASK(15, 8)) >> 8) > >> #define OV8865_OFFSET_X_L_REG 0x3811 > >> @@ -675,6 +677,7 @@ struct ov8865_state { > >> struct ov8865_ctrls { > >> struct v4l2_ctrl *link_freq; > >> struct v4l2_ctrl *pixel_rate; > >> + struct v4l2_ctrl *vblank; > >> > >> struct v4l2_ctrl_handler handler; > >> }; > >> @@ -2225,6 +2228,20 @@ static int ov8865_test_pattern_configure(struct ov8865_sensor *sensor, > >> ov8865_test_pattern_bits[index]); > >> } > >> > >> +/* Blanking */ > >> + > >> +static int ov8865_vts_configure(struct ov8865_sensor *sensor, u32 vblank) > >> +{ > >> + u16 vts = sensor->state.mode->output_size_y + vblank; > >> + int ret; > >> + > >> + ret = ov8865_write(sensor, OV8865_VTS_H_REG, OV8865_VTS_H(vts)); > >> + if (ret) > >> + return ret; > >> + > >> + return ov8865_write(sensor, OV8865_VTS_L_REG, OV8865_VTS_L(vts)); > >> +} > >> + > >> /* State */ > >> > >> static int ov8865_state_mipi_configure(struct ov8865_sensor *sensor, > >> @@ -2476,6 +2493,8 @@ static int ov8865_s_ctrl(struct v4l2_ctrl *ctrl) > >> case V4L2_CID_TEST_PATTERN: > >> index = (unsigned int)ctrl->val; > >> return ov8865_test_pattern_configure(sensor, index); > >> + case V4L2_CID_VBLANK: > >> + return ov8865_vts_configure(sensor, ctrl->val); > >> default: > >> return -EINVAL; > >> } > >> @@ -2492,6 +2511,8 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) > >> struct ov8865_ctrls *ctrls = &sensor->ctrls; > >> struct v4l2_ctrl_handler *handler = &ctrls->handler; > >> const struct v4l2_ctrl_ops *ops = &ov8865_ctrl_ops; > >> + const struct ov8865_mode *mode = sensor->state.mode; > >> + unsigned int vblank_max, vblank_def; > >> int ret; > >> > >> v4l2_ctrl_handler_init(handler, 32); > >> @@ -2528,6 +2549,13 @@ static int ov8865_ctrls_init(struct ov8865_sensor *sensor) > >> ARRAY_SIZE(ov8865_test_pattern_menu) - 1, > >> 0, 0, ov8865_test_pattern_menu); > >> > >> + /* Blanking */ > >> + vblank_max = OV8865_TIMING_MAX_VTS - mode->output_size_y; > >> + vblank_def = mode->vts - mode->output_size_y; > >> + ctrls->vblank = v4l2_ctrl_new_std(handler, ops, V4L2_CID_VBLANK, > >> + OV8865_TIMING_MIN_VTS, vblank_max, 1, > >> + vblank_def); > >> + > >> /* MIPI CSI-2 */ > >> > >> ctrls->link_freq = > >> @@ -2708,6 +2736,10 @@ static int ov8865_set_fmt(struct v4l2_subdev *subdev, > >> sensor->state.mbus_code != mbus_code) > >> ret = ov8865_state_configure(sensor, mode, mbus_code); > >> > >> + __v4l2_ctrl_modify_range(sensor->ctrls.vblank, OV8865_TIMING_MIN_VTS, > >> + OV8865_TIMING_MAX_VTS - mode->output_size_y, > >> + 1, mode->vts - mode->output_size_y); > >> + > >> complete: > >> mutex_unlock(&sensor->mutex); > >> > >> @@ -3035,6 +3067,8 @@ static int ov8865_probe(struct i2c_client *client) > >> > >> /* Sensor */ > >> > >> + sensor->state.mode = &ov8865_modes[0]; > > This seems to be an unrelated change. Does it belong here? > > > In ov8865_ctrls_init() I'm using sensor->state.mode to initialise the > new vblank control. I guess instead of > > > + const struct ov8865_mode *mode = sensor->state.mode; > > I could have > > + const struct ov8865_mode *mode = &ov8865_modes[0]; > > > in that function though You're right indeed. ov8865_state_init() refers to the same mode. I think it'd be cleaner if you'd e.g. call ov8865_state_configure() with sensor->state.mode instead, so that you don't initialise the same variable in two places. -- Kind regards, Sakari Ailus