[PATCH v2] media: i2c: imx258: Parse and register properties

[PATCH v2] media: i2c: imx258: Parse and register properties

[Robert Mader]

Analogous to e.g. the imx219. This enables propagating
V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION
values.
The motivation is to allow libcamera detect these values from the
device tree and propagate them further to e.g. Pipewire.

While at it, reserve space for 3 additional controls even if
v4l2_ctrl_new_fwnode_properties() can only register 2 of
them, to fix the existing implementation which reserve space for 8
controls but actually registers 9.

Changes in v2:
 - Reserve 11 instead of 10 controls
 - Change order of variable declaration
 - Slightly extend description

Signed-off-by: Robert Mader <robert.mader@collabora.com>
---
 drivers/media/i2c/imx258.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
index eab5fc1ee2f7..3b560865b657 100644
--- a/drivers/media/i2c/imx258.c
+++ b/drivers/media/i2c/imx258.c
@@ -9,6 +9,7 @@
 #include <linux/pm_runtime.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
 #include <asm/unaligned.h>
 
 #define IMX258_REG_VALUE_08BIT		1
@@ -1148,6 +1149,7 @@ static const struct v4l2_subdev_internal_ops imx258_internal_ops = {
 static int imx258_init_controls(struct imx258 *imx258)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
+	struct v4l2_fwnode_device_properties props;
 	struct v4l2_ctrl_handler *ctrl_hdlr;
 	s64 vblank_def;
 	s64 vblank_min;
@@ -1156,7 +1158,7 @@ static int imx258_init_controls(struct imx258 *imx258)
 	int ret;
 
 	ctrl_hdlr = &imx258->ctrl_handler;
-	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
 	if (ret)
 		return ret;
 
@@ -1232,6 +1234,15 @@ static int imx258_init_controls(struct imx258 *imx258)
 		goto error;
 	}
 
+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
+	if (ret)
+		goto error;
+
+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx258_ctrl_ops,
+					      &props);
+	if (ret)
+		goto error;
+
 	imx258->sd.ctrl_handler = ctrl_hdlr;
 
 	return 0;
-- 
2.39.0

Re: [PATCH v2] media: i2c: imx258: Parse and register properties

[Jacopo Mondi]

Hi Robert

On Wed, Jan 04, 2023 at 01:23:37PM +0100, Robert Mader wrote:
> Analogous to e.g. the imx219. This enables propagating
> V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION
> values.
> The motivation is to allow libcamera detect these values from the
> device tree and propagate them further to e.g. Pipewire.
>
> While at it, reserve space for 3 additional controls even if
> v4l2_ctrl_new_fwnode_properties() can only register 2 of
> them, to fix the existing implementation which reserve space for 8
> controls but actually registers 9.
>
> Changes in v2:
>  - Reserve 11 instead of 10 controls
>  - Change order of variable declaration
>  - Slightly extend description

This part should go below, after ---, as it shouldn't be part of the commit
message

The patch looks good

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

>
> Signed-off-by: Robert Mader <robert.mader@collabora.com>
> ---
>  drivers/media/i2c/imx258.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
> index eab5fc1ee2f7..3b560865b657 100644
> --- a/drivers/media/i2c/imx258.c
> +++ b/drivers/media/i2c/imx258.c
> @@ -9,6 +9,7 @@
>  #include <linux/pm_runtime.h>
>  #include <media/v4l2-ctrls.h>
>  #include <media/v4l2-device.h>
> +#include <media/v4l2-fwnode.h>
>  #include <asm/unaligned.h>
>
>  #define IMX258_REG_VALUE_08BIT		1
> @@ -1148,6 +1149,7 @@ static const struct v4l2_subdev_internal_ops imx258_internal_ops = {
>  static int imx258_init_controls(struct imx258 *imx258)
>  {
>  	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
> +	struct v4l2_fwnode_device_properties props;
>  	struct v4l2_ctrl_handler *ctrl_hdlr;
>  	s64 vblank_def;
>  	s64 vblank_min;
> @@ -1156,7 +1158,7 @@ static int imx258_init_controls(struct imx258 *imx258)
>  	int ret;
>
>  	ctrl_hdlr = &imx258->ctrl_handler;
> -	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
> +	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
>  	if (ret)
>  		return ret;
>
> @@ -1232,6 +1234,15 @@ static int imx258_init_controls(struct imx258 *imx258)
>  		goto error;
>  	}
>
> +	ret = v4l2_fwnode_device_parse(&client->dev, &props);
> +	if (ret)
> +		goto error;
> +
> +	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx258_ctrl_ops,
> +					      &props);
> +	if (ret)
> +		goto error;
> +
>  	imx258->sd.ctrl_handler = ctrl_hdlr;
>
>  	return 0;
> --
> 2.39.0
>

Re: [PATCH v2] media: i2c: imx258: Parse and register properties

[Robert Mader]

On 04.01.23 15:11, Jacopo Mondi wrote:
> Hi Robert
>
> On Wed, Jan 04, 2023 at 01:23:37PM +0100, Robert Mader wrote:
>> Analogous to e.g. the imx219. This enables propagating
>> V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION
>> values.
>> The motivation is to allow libcamera detect these values from the
>> device tree and propagate them further to e.g. Pipewire.
>>
>> While at it, reserve space for 3 additional controls even if
>> v4l2_ctrl_new_fwnode_properties() can only register 2 of
>> them, to fix the existing implementation which reserve space for 8
>> controls but actually registers 9.
>>
>> Changes in v2:
>>   - Reserve 11 instead of 10 controls
>>   - Change order of variable declaration
>>   - Slightly extend description
> This part should go below, after ---, as it shouldn't be part of the commit
> message
>
> The patch looks good
>
> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Thanks! And ops, right, make sense. Should I spin a v3 for that or is it 
simple enough to fix when pulling?
>> Signed-off-by: Robert Mader <robert.mader@collabora.com>
>> ---
>>   drivers/media/i2c/imx258.c | 13 ++++++++++++-
>>   1 file changed, 12 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
>> index eab5fc1ee2f7..3b560865b657 100644
>> --- a/drivers/media/i2c/imx258.c
>> +++ b/drivers/media/i2c/imx258.c
>> @@ -9,6 +9,7 @@
>>   #include <linux/pm_runtime.h>
>>   #include <media/v4l2-ctrls.h>
>>   #include <media/v4l2-device.h>
>> +#include <media/v4l2-fwnode.h>
>>   #include <asm/unaligned.h>
>>
>>   #define IMX258_REG_VALUE_08BIT		1
>> @@ -1148,6 +1149,7 @@ static const struct v4l2_subdev_internal_ops imx258_internal_ops = {
>>   static int imx258_init_controls(struct imx258 *imx258)
>>   {
>>   	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
>> +	struct v4l2_fwnode_device_properties props;
>>   	struct v4l2_ctrl_handler *ctrl_hdlr;
>>   	s64 vblank_def;
>>   	s64 vblank_min;
>> @@ -1156,7 +1158,7 @@ static int imx258_init_controls(struct imx258 *imx258)
>>   	int ret;
>>
>>   	ctrl_hdlr = &imx258->ctrl_handler;
>> -	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
>> +	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 11);
>>   	if (ret)
>>   		return ret;
>>
>> @@ -1232,6 +1234,15 @@ static int imx258_init_controls(struct imx258 *imx258)
>>   		goto error;
>>   	}
>>
>> +	ret = v4l2_fwnode_device_parse(&client->dev, &props);
>> +	if (ret)
>> +		goto error;
>> +
>> +	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx258_ctrl_ops,
>> +					      &props);
>> +	if (ret)
>> +		goto error;
>> +
>>   	imx258->sd.ctrl_handler = ctrl_hdlr;
>>
>>   	return 0;
>> --
>> 2.39.0
>>

Re: [PATCH v2] media: i2c: imx258: Parse and register properties

[Sakari Ailus]

Hi Robert,

On Wed, Jan 04, 2023 at 03:14:50PM +0100, Robert Mader wrote:
> On 04.01.23 15:11, Jacopo Mondi wrote:
> > Hi Robert
> > 
> > On Wed, Jan 04, 2023 at 01:23:37PM +0100, Robert Mader wrote:
> > > Analogous to e.g. the imx219. This enables propagating
> > > V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION
> > > values.
> > > The motivation is to allow libcamera detect these values from the
> > > device tree and propagate them further to e.g. Pipewire.
> > > 
> > > While at it, reserve space for 3 additional controls even if
> > > v4l2_ctrl_new_fwnode_properties() can only register 2 of
> > > them, to fix the existing implementation which reserve space for 8
> > > controls but actually registers 9.
> > > 
> > > Changes in v2:
> > >   - Reserve 11 instead of 10 controls
> > >   - Change order of variable declaration
> > >   - Slightly extend description
> > This part should go below, after ---, as it shouldn't be part of the commit
> > message
> > 
> > The patch looks good
> > 
> > Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> Thanks! And ops, right, make sense. Should I spin a v3 for that or is it
> simple enough to fix when pulling?

I can fix it while applying the patch.

-- 
Regards,

Sakari Ailus

Re: [PATCH v2] media: i2c: imx258: Parse and register properties

[Sakari Ailus]

On Wed, Jan 04, 2023 at 03:59:53PM +0000, Sakari Ailus wrote:
> Hi Robert,
> 
> On Wed, Jan 04, 2023 at 03:14:50PM +0100, Robert Mader wrote:
> > On 04.01.23 15:11, Jacopo Mondi wrote:
> > > Hi Robert
> > > 
> > > On Wed, Jan 04, 2023 at 01:23:37PM +0100, Robert Mader wrote:
> > > > Analogous to e.g. the imx219. This enables propagating
> > > > V4L2_CID_CAMERA_ORIENTATION and V4L2_CID_CAMERA_SENSOR_ROTATION
> > > > values.
> > > > The motivation is to allow libcamera detect these values from the
> > > > device tree and propagate them further to e.g. Pipewire.
> > > > 
> > > > While at it, reserve space for 3 additional controls even if
> > > > v4l2_ctrl_new_fwnode_properties() can only register 2 of
> > > > them, to fix the existing implementation which reserve space for 8
> > > > controls but actually registers 9.
> > > > 
> > > > Changes in v2:
> > > >   - Reserve 11 instead of 10 controls
> > > >   - Change order of variable declaration
> > > >   - Slightly extend description
> > > This part should go below, after ---, as it shouldn't be part of the commit
> > > message
> > > 
> > > The patch looks good
> > > 
> > > Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> > Thanks! And ops, right, make sense. Should I spin a v3 for that or is it
> > simple enough to fix when pulling?
> 
> I can fix it while applying the patch.

No need for line breaks after period, just let your editor to break them
before 74 or so.

-- 
Sakari Ailus