* [PATCH v3 0/2] media: v4l2-subdev: Support const-awareness in state accessors
@ 2024-05-07 16:19 Laurent Pinchart
2024-05-07 16:19 ` [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev " Laurent Pinchart
2024-05-07 16:19 ` [PATCH v3 2/2] media: rkisp1: Mark subdev state pointers as const Laurent Pinchart
0 siblings, 2 replies; 6+ messages in thread
From: Laurent Pinchart @ 2024-05-07 16:19 UTC (permalink / raw)
To: linux-media
Cc: linux-renesas-soc, Sakari Ailus, Tomi Valkeinen, Hans Verkuil,
Dafna Hirschfeld, linux-rockchip
This small patch series comes from a mild annoyance I experienced during
a recent patch review, where I wanted to ask for a pointer to a
v4l2_subdev_state used to access the state in a read-only fashion to be
made const. This wasn't possible as the state accessors functions take a
non-const state pointer, in order to return pointers to mutable formats
and selection rectangles.
Patch 1/2 improves the state accessors to support const states, in the
same wait as the recently introduced container_of_const() macro.
Bikeshedding of the internal macro and function names is expected. Patch
2/2 then shows how this can be used in one driver.
Compared to v2, patch 1/2 uses explicit types as _Generic() selectors,
and fixes an issue with the const cast of the value.
Laurent Pinchart (2):
media: v4l2-subdev: Provide const-aware subdev state accessors
media: rkisp1: Mark subdev state pointers as const
.../platform/rockchip/rkisp1/rkisp1-isp.c | 8 ++--
.../platform/rockchip/rkisp1/rkisp1-resizer.c | 8 ++--
include/media/v4l2-subdev.h | 40 +++++++++++++------
3 files changed, 35 insertions(+), 21 deletions(-)
base-commit: e695668af8523b059127dfa8b261c76e7c9cde10
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev state accessors
2024-05-07 16:19 [PATCH v3 0/2] media: v4l2-subdev: Support const-awareness in state accessors Laurent Pinchart
@ 2024-05-07 16:19 ` Laurent Pinchart
2024-05-08 18:44 ` Sakari Ailus
2024-05-07 16:19 ` [PATCH v3 2/2] media: rkisp1: Mark subdev state pointers as const Laurent Pinchart
1 sibling, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2024-05-07 16:19 UTC (permalink / raw)
To: linux-media
Cc: linux-renesas-soc, Sakari Ailus, Tomi Valkeinen, Hans Verkuil,
Dafna Hirschfeld, linux-rockchip
It would be useful to mark instances of v4l2_subdev_state structures as
const when code needs to access them read-only. This isn't currently
possible, as the v4l2_subdev_state_get_*() accessor functions take a
non-const pointer to the state.
Use _Generic() to provide two different versions of the accessors, for
const and non-const states respectively. The former returns a const
pointer to the requested format, rectangle or interval, implementing
const-correctness. The latter returns a non-const pointer, preserving
the current behaviour for drivers.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v2:
- Specify types explicitly in _Generic() expression
- Fix cast of value to const pointer
Changes since v1:
- Wrap the accessors with _Generic() using a single macro instead of
adding a _Generic() statement in each of them.
---
include/media/v4l2-subdev.h | 40 +++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index e30c463d90e5..cd3e9e2ebe4d 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -1326,6 +1326,16 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
#define __v4l2_subdev_state_gen_call(NAME, _1, ARG, ...) \
__v4l2_subdev_state_get_ ## NAME ## ARG
+/*
+ * A macro to constify the return value of the state accessors when the state
+ * parameter is const.
+ */
+#define __v4l2_subdev_state_constify_call(state, value) \
+ _Generic(state, \
+ const struct v4l2_subdev_state *: (const typeof(*(value)) *)(value), \
+ struct v4l2_subdev_state *: (value) \
+ )
+
/**
* v4l2_subdev_state_get_format() - Get pointer to a stream format
* @state: subdevice state
@@ -1340,16 +1350,17 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
*/
/*
* Wrap v4l2_subdev_state_get_format(), allowing the function to be called with
- * two or three arguments. The purpose of the __v4l2_subdev_state_get_format()
+ * two or three arguments. The purpose of the __v4l2_subdev_state_gen_call()
* macro below is to come up with the name of the function or macro to call,
* using the last two arguments (_stream and _pad). The selected function or
* macro is then called using the arguments specified by the caller. A similar
* arrangement is used for v4l2_subdev_state_crop() and
* v4l2_subdev_state_compose() below.
*/
-#define v4l2_subdev_state_get_format(state, pad, ...) \
- __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
- (state, pad, ##__VA_ARGS__)
+#define v4l2_subdev_state_get_format(state, pad, ...) \
+ __v4l2_subdev_state_constify_call(state, \
+ __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
+ ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
#define __v4l2_subdev_state_get_format_pad(state, pad) \
__v4l2_subdev_state_get_format(state, pad, 0)
struct v4l2_mbus_framefmt *
@@ -1368,9 +1379,10 @@ __v4l2_subdev_state_get_format(struct v4l2_subdev_state *state,
* For stream-unaware drivers the crop rectangle for the corresponding pad is
* returned. If the pad does not exist, NULL is returned.
*/
-#define v4l2_subdev_state_get_crop(state, pad, ...) \
- __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
- (state, pad, ##__VA_ARGS__)
+#define v4l2_subdev_state_get_crop(state, pad, ...) \
+ __v4l2_subdev_state_constify_call(state, \
+ __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
+ ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
#define __v4l2_subdev_state_get_crop_pad(state, pad) \
__v4l2_subdev_state_get_crop(state, pad, 0)
struct v4l2_rect *
@@ -1389,9 +1401,10 @@ __v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
* For stream-unaware drivers the compose rectangle for the corresponding pad is
* returned. If the pad does not exist, NULL is returned.
*/
-#define v4l2_subdev_state_get_compose(state, pad, ...) \
- __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
- (state, pad, ##__VA_ARGS__)
+#define v4l2_subdev_state_get_compose(state, pad, ...) \
+ __v4l2_subdev_state_constify_call(state, \
+ __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
+ ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
#define __v4l2_subdev_state_get_compose_pad(state, pad) \
__v4l2_subdev_state_get_compose(state, pad, 0)
struct v4l2_rect *
@@ -1410,9 +1423,10 @@ __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state,
* For stream-unaware drivers the frame interval for the corresponding pad is
* returned. If the pad does not exist, NULL is returned.
*/
-#define v4l2_subdev_state_get_interval(state, pad, ...) \
- __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
- (state, pad, ##__VA_ARGS__)
+#define v4l2_subdev_state_get_interval(state, pad, ...) \
+ __v4l2_subdev_state_constify_call(state, \
+ __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
+ ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
#define __v4l2_subdev_state_get_interval_pad(state, pad) \
__v4l2_subdev_state_get_interval(state, pad, 0)
struct v4l2_fract *
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] media: rkisp1: Mark subdev state pointers as const
2024-05-07 16:19 [PATCH v3 0/2] media: v4l2-subdev: Support const-awareness in state accessors Laurent Pinchart
2024-05-07 16:19 ` [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev " Laurent Pinchart
@ 2024-05-07 16:19 ` Laurent Pinchart
1 sibling, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2024-05-07 16:19 UTC (permalink / raw)
To: linux-media
Cc: linux-renesas-soc, Sakari Ailus, Tomi Valkeinen, Hans Verkuil,
Dafna Hirschfeld, linux-rockchip
Several subdev state pointers are used to access the state read-only.
Mark them as const.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 8 ++++----
drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index e45a213baf49..91301d17d356 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -173,7 +173,7 @@ static void rkisp1_gasket_disable(struct rkisp1_device *rkisp1)
* or at the frame end interrupt
*/
static void rkisp1_config_ism(struct rkisp1_isp *isp,
- struct v4l2_subdev_state *sd_state)
+ const struct v4l2_subdev_state *sd_state)
{
const struct v4l2_rect *src_crop =
v4l2_subdev_state_get_crop(sd_state,
@@ -201,7 +201,7 @@ static void rkisp1_config_ism(struct rkisp1_isp *isp,
* configure ISP blocks with input format, size......
*/
static int rkisp1_config_isp(struct rkisp1_isp *isp,
- struct v4l2_subdev_state *sd_state,
+ const struct v4l2_subdev_state *sd_state,
enum v4l2_mbus_type mbus_type, u32 mbus_flags)
{
struct rkisp1_device *rkisp1 = isp->rkisp1;
@@ -309,7 +309,7 @@ static int rkisp1_config_isp(struct rkisp1_isp *isp,
if (src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER) {
rkisp1_params_disable(&rkisp1->params);
} else {
- struct v4l2_mbus_framefmt *src_frm;
+ const struct v4l2_mbus_framefmt *src_frm;
src_frm = v4l2_subdev_state_get_format(sd_state,
RKISP1_ISP_PAD_SOURCE_VIDEO);
@@ -429,7 +429,7 @@ static void rkisp1_config_clk(struct rkisp1_isp *isp)
}
static int rkisp1_isp_start(struct rkisp1_isp *isp,
- struct v4l2_subdev_state *sd_state,
+ const struct v4l2_subdev_state *sd_state,
struct media_pad *source)
{
struct rkisp1_device *rkisp1 = isp->rkisp1;
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
index 6f3931ca5b51..1fa991227fa9 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
@@ -135,11 +135,11 @@ static void rkisp1_dcrop_disable(struct rkisp1_resizer *rsz,
/* configure dual-crop unit */
static void rkisp1_dcrop_config(struct rkisp1_resizer *rsz,
- struct v4l2_subdev_state *sd_state)
+ const struct v4l2_subdev_state *sd_state)
{
struct rkisp1_device *rkisp1 = rsz->rkisp1;
- struct v4l2_mbus_framefmt *sink_fmt;
- struct v4l2_rect *sink_crop;
+ const struct v4l2_mbus_framefmt *sink_fmt;
+ const struct v4l2_rect *sink_crop;
u32 dc_ctrl;
sink_crop = v4l2_subdev_state_get_crop(sd_state, RKISP1_RSZ_PAD_SINK);
@@ -264,7 +264,7 @@ static void rkisp1_rsz_config_regs(struct rkisp1_resizer *rsz,
}
static void rkisp1_rsz_config(struct rkisp1_resizer *rsz,
- struct v4l2_subdev_state *sd_state,
+ const struct v4l2_subdev_state *sd_state,
enum rkisp1_shadow_regs_when when)
{
const struct rkisp1_rsz_yuv_mbus_info *sink_yuv_info, *src_yuv_info;
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev state accessors
2024-05-07 16:19 ` [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev " Laurent Pinchart
@ 2024-05-08 18:44 ` Sakari Ailus
2024-05-08 18:48 ` Tomi Valkeinen
2024-05-08 21:02 ` Laurent Pinchart
0 siblings, 2 replies; 6+ messages in thread
From: Sakari Ailus @ 2024-05-08 18:44 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, linux-renesas-soc, Tomi Valkeinen, Hans Verkuil,
Dafna Hirschfeld, linux-rockchip
Hi Laurent,
Thanks for the update.
This is starting to look very nice. A few comments below...
On Tue, May 07, 2024 at 07:19:06PM +0300, Laurent Pinchart wrote:
> It would be useful to mark instances of v4l2_subdev_state structures as
> const when code needs to access them read-only. This isn't currently
> possible, as the v4l2_subdev_state_get_*() accessor functions take a
> non-const pointer to the state.
>
> Use _Generic() to provide two different versions of the accessors, for
> const and non-const states respectively. The former returns a const
> pointer to the requested format, rectangle or interval, implementing
> const-correctness. The latter returns a non-const pointer, preserving
> the current behaviour for drivers.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> Changes since v2:
>
> - Specify types explicitly in _Generic() expression
> - Fix cast of value to const pointer
>
> Changes since v1:
>
> - Wrap the accessors with _Generic() using a single macro instead of
> adding a _Generic() statement in each of them.
> ---
> include/media/v4l2-subdev.h | 40 +++++++++++++++++++++++++------------
> 1 file changed, 27 insertions(+), 13 deletions(-)
>
> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> index e30c463d90e5..cd3e9e2ebe4d 100644
> --- a/include/media/v4l2-subdev.h
> +++ b/include/media/v4l2-subdev.h
> @@ -1326,6 +1326,16 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
> #define __v4l2_subdev_state_gen_call(NAME, _1, ARG, ...) \
> __v4l2_subdev_state_get_ ## NAME ## ARG
>
> +/*
> + * A macro to constify the return value of the state accessors when the state
> + * parameter is const.
> + */
> +#define __v4l2_subdev_state_constify_call(state, value) \
This function just changes the return value constness. How about calling it
e.g. __v4l2_subdev_state_constify_ret instead?
Either way,
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> + _Generic(state, \
> + const struct v4l2_subdev_state *: (const typeof(*(value)) *)(value), \
> + struct v4l2_subdev_state *: (value) \
> + )
> +
> /**
> * v4l2_subdev_state_get_format() - Get pointer to a stream format
> * @state: subdevice state
> @@ -1340,16 +1350,17 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
> */
> /*
> * Wrap v4l2_subdev_state_get_format(), allowing the function to be called with
> - * two or three arguments. The purpose of the __v4l2_subdev_state_get_format()
> + * two or three arguments. The purpose of the __v4l2_subdev_state_gen_call()
> * macro below is to come up with the name of the function or macro to call,
> * using the last two arguments (_stream and _pad). The selected function or
> * macro is then called using the arguments specified by the caller. A similar
> * arrangement is used for v4l2_subdev_state_crop() and
> * v4l2_subdev_state_compose() below.
These function names are missing _get after the prefix.
Could you also add the interval function here, too?
The would fit well for a separate patch.
> */
> -#define v4l2_subdev_state_get_format(state, pad, ...) \
> - __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
> - (state, pad, ##__VA_ARGS__)
> +#define v4l2_subdev_state_get_format(state, pad, ...) \
> + __v4l2_subdev_state_constify_call(state, \
> + __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> #define __v4l2_subdev_state_get_format_pad(state, pad) \
> __v4l2_subdev_state_get_format(state, pad, 0)
> struct v4l2_mbus_framefmt *
> @@ -1368,9 +1379,10 @@ __v4l2_subdev_state_get_format(struct v4l2_subdev_state *state,
> * For stream-unaware drivers the crop rectangle for the corresponding pad is
> * returned. If the pad does not exist, NULL is returned.
> */
> -#define v4l2_subdev_state_get_crop(state, pad, ...) \
> - __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
> - (state, pad, ##__VA_ARGS__)
> +#define v4l2_subdev_state_get_crop(state, pad, ...) \
> + __v4l2_subdev_state_constify_call(state, \
> + __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> #define __v4l2_subdev_state_get_crop_pad(state, pad) \
> __v4l2_subdev_state_get_crop(state, pad, 0)
> struct v4l2_rect *
> @@ -1389,9 +1401,10 @@ __v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
> * For stream-unaware drivers the compose rectangle for the corresponding pad is
> * returned. If the pad does not exist, NULL is returned.
> */
> -#define v4l2_subdev_state_get_compose(state, pad, ...) \
> - __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
> - (state, pad, ##__VA_ARGS__)
> +#define v4l2_subdev_state_get_compose(state, pad, ...) \
> + __v4l2_subdev_state_constify_call(state, \
> + __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> #define __v4l2_subdev_state_get_compose_pad(state, pad) \
> __v4l2_subdev_state_get_compose(state, pad, 0)
> struct v4l2_rect *
> @@ -1410,9 +1423,10 @@ __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state,
> * For stream-unaware drivers the frame interval for the corresponding pad is
> * returned. If the pad does not exist, NULL is returned.
> */
> -#define v4l2_subdev_state_get_interval(state, pad, ...) \
> - __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
> - (state, pad, ##__VA_ARGS__)
> +#define v4l2_subdev_state_get_interval(state, pad, ...) \
> + __v4l2_subdev_state_constify_call(state, \
> + __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> #define __v4l2_subdev_state_get_interval_pad(state, pad) \
> __v4l2_subdev_state_get_interval(state, pad, 0)
> struct v4l2_fract *
--
Kind regards,
Sakari Ailus
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev state accessors
2024-05-08 18:44 ` Sakari Ailus
@ 2024-05-08 18:48 ` Tomi Valkeinen
2024-05-08 21:02 ` Laurent Pinchart
1 sibling, 0 replies; 6+ messages in thread
From: Tomi Valkeinen @ 2024-05-08 18:48 UTC (permalink / raw)
To: Sakari Ailus, Laurent Pinchart
Cc: linux-media, linux-renesas-soc, Hans Verkuil, Dafna Hirschfeld,
linux-rockchip
On 08/05/2024 21:44, Sakari Ailus wrote:
> Hi Laurent,
>
> Thanks for the update.
>
> This is starting to look very nice. A few comments below...
>
> On Tue, May 07, 2024 at 07:19:06PM +0300, Laurent Pinchart wrote:
>> It would be useful to mark instances of v4l2_subdev_state structures as
>> const when code needs to access them read-only. This isn't currently
>> possible, as the v4l2_subdev_state_get_*() accessor functions take a
>> non-const pointer to the state.
>>
>> Use _Generic() to provide two different versions of the accessors, for
>> const and non-const states respectively. The former returns a const
>> pointer to the requested format, rectangle or interval, implementing
>> const-correctness. The latter returns a non-const pointer, preserving
>> the current behaviour for drivers.
>>
>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>> ---
>> Changes since v2:
>>
>> - Specify types explicitly in _Generic() expression
>> - Fix cast of value to const pointer
>>
>> Changes since v1:
>>
>> - Wrap the accessors with _Generic() using a single macro instead of
>> adding a _Generic() statement in each of them.
>> ---
>> include/media/v4l2-subdev.h | 40 +++++++++++++++++++++++++------------
>> 1 file changed, 27 insertions(+), 13 deletions(-)
>>
>> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
>> index e30c463d90e5..cd3e9e2ebe4d 100644
>> --- a/include/media/v4l2-subdev.h
>> +++ b/include/media/v4l2-subdev.h
>> @@ -1326,6 +1326,16 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
>> #define __v4l2_subdev_state_gen_call(NAME, _1, ARG, ...) \
>> __v4l2_subdev_state_get_ ## NAME ## ARG
>>
>> +/*
>> + * A macro to constify the return value of the state accessors when the state
>> + * parameter is const.
>> + */
>> +#define __v4l2_subdev_state_constify_call(state, value) \
>
> This function just changes the return value constness. How about calling it
> e.g. __v4l2_subdev_state_constify_ret instead?
>
> Either way,
>
> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
I tested this today on my branches, but apparently forgot to send the
R-b. So here's mine also:
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Tomi
>> + _Generic(state, \
>> + const struct v4l2_subdev_state *: (const typeof(*(value)) *)(value), \
>> + struct v4l2_subdev_state *: (value) \
>> + )
>> +
>> /**
>> * v4l2_subdev_state_get_format() - Get pointer to a stream format
>> * @state: subdevice state
>> @@ -1340,16 +1350,17 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
>> */
>> /*
>> * Wrap v4l2_subdev_state_get_format(), allowing the function to be called with
>> - * two or three arguments. The purpose of the __v4l2_subdev_state_get_format()
>> + * two or three arguments. The purpose of the __v4l2_subdev_state_gen_call()
>> * macro below is to come up with the name of the function or macro to call,
>> * using the last two arguments (_stream and _pad). The selected function or
>> * macro is then called using the arguments specified by the caller. A similar
>> * arrangement is used for v4l2_subdev_state_crop() and
>> * v4l2_subdev_state_compose() below.
>
> These function names are missing _get after the prefix.
>
> Could you also add the interval function here, too?
>
> The would fit well for a separate patch.
>
>> */
>> -#define v4l2_subdev_state_get_format(state, pad, ...) \
>> - __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
>> - (state, pad, ##__VA_ARGS__)
>> +#define v4l2_subdev_state_get_format(state, pad, ...) \
>> + __v4l2_subdev_state_constify_call(state, \
>> + __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
>> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
>> #define __v4l2_subdev_state_get_format_pad(state, pad) \
>> __v4l2_subdev_state_get_format(state, pad, 0)
>> struct v4l2_mbus_framefmt *
>> @@ -1368,9 +1379,10 @@ __v4l2_subdev_state_get_format(struct v4l2_subdev_state *state,
>> * For stream-unaware drivers the crop rectangle for the corresponding pad is
>> * returned. If the pad does not exist, NULL is returned.
>> */
>> -#define v4l2_subdev_state_get_crop(state, pad, ...) \
>> - __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
>> - (state, pad, ##__VA_ARGS__)
>> +#define v4l2_subdev_state_get_crop(state, pad, ...) \
>> + __v4l2_subdev_state_constify_call(state, \
>> + __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
>> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
>> #define __v4l2_subdev_state_get_crop_pad(state, pad) \
>> __v4l2_subdev_state_get_crop(state, pad, 0)
>> struct v4l2_rect *
>> @@ -1389,9 +1401,10 @@ __v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
>> * For stream-unaware drivers the compose rectangle for the corresponding pad is
>> * returned. If the pad does not exist, NULL is returned.
>> */
>> -#define v4l2_subdev_state_get_compose(state, pad, ...) \
>> - __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
>> - (state, pad, ##__VA_ARGS__)
>> +#define v4l2_subdev_state_get_compose(state, pad, ...) \
>> + __v4l2_subdev_state_constify_call(state, \
>> + __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
>> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
>> #define __v4l2_subdev_state_get_compose_pad(state, pad) \
>> __v4l2_subdev_state_get_compose(state, pad, 0)
>> struct v4l2_rect *
>> @@ -1410,9 +1423,10 @@ __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state,
>> * For stream-unaware drivers the frame interval for the corresponding pad is
>> * returned. If the pad does not exist, NULL is returned.
>> */
>> -#define v4l2_subdev_state_get_interval(state, pad, ...) \
>> - __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
>> - (state, pad, ##__VA_ARGS__)
>> +#define v4l2_subdev_state_get_interval(state, pad, ...) \
>> + __v4l2_subdev_state_constify_call(state, \
>> + __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
>> + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
>> #define __v4l2_subdev_state_get_interval_pad(state, pad) \
>> __v4l2_subdev_state_get_interval(state, pad, 0)
>> struct v4l2_fract *
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev state accessors
2024-05-08 18:44 ` Sakari Ailus
2024-05-08 18:48 ` Tomi Valkeinen
@ 2024-05-08 21:02 ` Laurent Pinchart
1 sibling, 0 replies; 6+ messages in thread
From: Laurent Pinchart @ 2024-05-08 21:02 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, linux-renesas-soc, Tomi Valkeinen, Hans Verkuil,
Dafna Hirschfeld, linux-rockchip
On Wed, May 08, 2024 at 06:44:40PM +0000, Sakari Ailus wrote:
> Hi Laurent,
>
> Thanks for the update.
>
> This is starting to look very nice. A few comments below...
Thanks :-)
> On Tue, May 07, 2024 at 07:19:06PM +0300, Laurent Pinchart wrote:
> > It would be useful to mark instances of v4l2_subdev_state structures as
> > const when code needs to access them read-only. This isn't currently
> > possible, as the v4l2_subdev_state_get_*() accessor functions take a
> > non-const pointer to the state.
> >
> > Use _Generic() to provide two different versions of the accessors, for
> > const and non-const states respectively. The former returns a const
> > pointer to the requested format, rectangle or interval, implementing
> > const-correctness. The latter returns a non-const pointer, preserving
> > the current behaviour for drivers.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > Changes since v2:
> >
> > - Specify types explicitly in _Generic() expression
> > - Fix cast of value to const pointer
> >
> > Changes since v1:
> >
> > - Wrap the accessors with _Generic() using a single macro instead of
> > adding a _Generic() statement in each of them.
> > ---
> > include/media/v4l2-subdev.h | 40 +++++++++++++++++++++++++------------
> > 1 file changed, 27 insertions(+), 13 deletions(-)
> >
> > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> > index e30c463d90e5..cd3e9e2ebe4d 100644
> > --- a/include/media/v4l2-subdev.h
> > +++ b/include/media/v4l2-subdev.h
> > @@ -1326,6 +1326,16 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
> > #define __v4l2_subdev_state_gen_call(NAME, _1, ARG, ...) \
> > __v4l2_subdev_state_get_ ## NAME ## ARG
> >
> > +/*
> > + * A macro to constify the return value of the state accessors when the state
> > + * parameter is const.
> > + */
> > +#define __v4l2_subdev_state_constify_call(state, value) \
>
> This function just changes the return value constness. How about calling it
> e.g. __v4l2_subdev_state_constify_ret instead?
Fine with me.
> Either way,
>
> Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>
> > + _Generic(state, \
> > + const struct v4l2_subdev_state *: (const typeof(*(value)) *)(value), \
> > + struct v4l2_subdev_state *: (value) \
> > + )
> > +
> > /**
> > * v4l2_subdev_state_get_format() - Get pointer to a stream format
> > * @state: subdevice state
> > @@ -1340,16 +1350,17 @@ void v4l2_subdev_cleanup(struct v4l2_subdev *sd);
> > */
> > /*
> > * Wrap v4l2_subdev_state_get_format(), allowing the function to be called with
> > - * two or three arguments. The purpose of the __v4l2_subdev_state_get_format()
> > + * two or three arguments. The purpose of the __v4l2_subdev_state_gen_call()
> > * macro below is to come up with the name of the function or macro to call,
> > * using the last two arguments (_stream and _pad). The selected function or
> > * macro is then called using the arguments specified by the caller. A similar
> > * arrangement is used for v4l2_subdev_state_crop() and
> > * v4l2_subdev_state_compose() below.
>
> These function names are missing _get after the prefix.
>
> Could you also add the interval function here, too?
>
> The would fit well for a separate patch.
I'll drop the change above and will fix the whole paragraph in a
separate patch.
> > */
> > -#define v4l2_subdev_state_get_format(state, pad, ...) \
> > - __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
> > - (state, pad, ##__VA_ARGS__)
> > +#define v4l2_subdev_state_get_format(state, pad, ...) \
> > + __v4l2_subdev_state_constify_call(state, \
> > + __v4l2_subdev_state_gen_call(format, ##__VA_ARGS__, , _pad) \
> > + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> > #define __v4l2_subdev_state_get_format_pad(state, pad) \
> > __v4l2_subdev_state_get_format(state, pad, 0)
> > struct v4l2_mbus_framefmt *
> > @@ -1368,9 +1379,10 @@ __v4l2_subdev_state_get_format(struct v4l2_subdev_state *state,
> > * For stream-unaware drivers the crop rectangle for the corresponding pad is
> > * returned. If the pad does not exist, NULL is returned.
> > */
> > -#define v4l2_subdev_state_get_crop(state, pad, ...) \
> > - __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
> > - (state, pad, ##__VA_ARGS__)
> > +#define v4l2_subdev_state_get_crop(state, pad, ...) \
> > + __v4l2_subdev_state_constify_call(state, \
> > + __v4l2_subdev_state_gen_call(crop, ##__VA_ARGS__, , _pad) \
> > + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> > #define __v4l2_subdev_state_get_crop_pad(state, pad) \
> > __v4l2_subdev_state_get_crop(state, pad, 0)
> > struct v4l2_rect *
> > @@ -1389,9 +1401,10 @@ __v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
> > * For stream-unaware drivers the compose rectangle for the corresponding pad is
> > * returned. If the pad does not exist, NULL is returned.
> > */
> > -#define v4l2_subdev_state_get_compose(state, pad, ...) \
> > - __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
> > - (state, pad, ##__VA_ARGS__)
> > +#define v4l2_subdev_state_get_compose(state, pad, ...) \
> > + __v4l2_subdev_state_constify_call(state, \
> > + __v4l2_subdev_state_gen_call(compose, ##__VA_ARGS__, , _pad) \
> > + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> > #define __v4l2_subdev_state_get_compose_pad(state, pad) \
> > __v4l2_subdev_state_get_compose(state, pad, 0)
> > struct v4l2_rect *
> > @@ -1410,9 +1423,10 @@ __v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state,
> > * For stream-unaware drivers the frame interval for the corresponding pad is
> > * returned. If the pad does not exist, NULL is returned.
> > */
> > -#define v4l2_subdev_state_get_interval(state, pad, ...) \
> > - __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
> > - (state, pad, ##__VA_ARGS__)
> > +#define v4l2_subdev_state_get_interval(state, pad, ...) \
> > + __v4l2_subdev_state_constify_call(state, \
> > + __v4l2_subdev_state_gen_call(interval, ##__VA_ARGS__, , _pad) \
> > + ((struct v4l2_subdev_state *)state, pad, ##__VA_ARGS__))
> > #define __v4l2_subdev_state_get_interval_pad(state, pad) \
> > __v4l2_subdev_state_get_interval(state, pad, 0)
> > struct v4l2_fract *
--
Regards,
Laurent Pinchart
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-08 21:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-07 16:19 [PATCH v3 0/2] media: v4l2-subdev: Support const-awareness in state accessors Laurent Pinchart
2024-05-07 16:19 ` [PATCH v3 1/2] media: v4l2-subdev: Provide const-aware subdev " Laurent Pinchart
2024-05-08 18:44 ` Sakari Ailus
2024-05-08 18:48 ` Tomi Valkeinen
2024-05-08 21:02 ` Laurent Pinchart
2024-05-07 16:19 ` [PATCH v3 2/2] media: rkisp1: Mark subdev state pointers as const Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).