* [PATCH v2] staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support
@ 2026-11-18 0:06 ` Maximo Manriquez Lizarraga
0 siblings, 0 replies; 4+ messages in thread
From: Maximo Manriquez Lizarraga via B4 Relay @ 2026-11-18 0:06 UTC (permalink / raw)
To: slongerbeam
Cc: mchehab, linux-kernel, p.zabel, gregkh, imx, linux-staging,
linux-media, Maximo Manriquez Lizarraga
From: Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
Implement frame interval handling for V4L2_SUBDEV_FORMAT_TRY
by storing and retrieving per-pad intervals from the subdev state,
following the same pattern the driver already uses for TRY formats:
ACTIVE intervals stay in priv->frame_interval while TRY intervals live
in the subdev state. Add a PRPENCVF-specific init_state callback to
initialize TRY intervals from the active default, and move default
interval initialization to prp_init(), which runs before any state can
be initialized.
Signed-off-by: Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
---
Compile-tested only: x86_64, VIDEO_IMX_MEDIA=m via COMPILE_TEST, zero
warnings. No i.MX hardware here for runtime testing; hardware testing
by others is welcome.
---
Changes in v2:
- Propagate TRY intervals from sink to source pad in prp_set_frame_interval(), mirroring prp_set_fmt() (spotted by Sashiko review; apologies for the oversight).
- Resend under my real name (From/Signed-off-by: Maximo Manriquez Lizarraga).
- Link to v1: https://patch.msgid.link/20261107-batch1-m2-prpencvf-try-v1-1-76bd9f505710@tubot.lat
---
drivers/staging/media/imx/imx-ic-prpencvf.c | 109 +++++++++++++++++++++-------
1 file changed, 84 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 3430ddeac356..5ce0eb56be5b 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -795,6 +795,18 @@ __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
return &priv->format_mbus[pad];
}
+static struct v4l2_fract *
+__prp_get_frame_interval(struct prp_priv *priv,
+ struct v4l2_subdev_state *sd_state,
+ unsigned int pad,
+ enum v4l2_subdev_format_whence which)
+{
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
+ return v4l2_subdev_state_get_interval(sd_state, pad);
+
+ return &priv->frame_interval;
+}
+
/*
* Applies IC resizer and IDMAC alignment restrictions to output
* rectangle given the input rectangle, and depending on given
@@ -1208,22 +1220,25 @@ static int prp_get_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_frame_interval *fi)
{
struct prp_priv *priv = sd_to_priv(sd);
-
- /*
- * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
- * subdev active state API.
- */
- if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
- return -EINVAL;
+ struct v4l2_fract *interval;
+ int ret = 0;
if (fi->pad >= PRPENCVF_NUM_PADS)
return -EINVAL;
mutex_lock(&priv->lock);
- fi->interval = priv->frame_interval;
+ interval = __prp_get_frame_interval(priv, sd_state, fi->pad,
+ fi->which);
+ if (!interval) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ fi->interval = *interval;
+out:
mutex_unlock(&priv->lock);
- return 0;
+ return ret;
}
static int prp_set_frame_interval(struct v4l2_subdev *sd,
@@ -1231,24 +1246,68 @@ static int prp_set_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_frame_interval *fi)
{
struct prp_priv *priv = sd_to_priv(sd);
-
- /*
- * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
- * subdev active state API.
- */
- if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
- return -EINVAL;
+ struct v4l2_fract *interval;
+ int ret = 0;
if (fi->pad >= PRPENCVF_NUM_PADS)
return -EINVAL;
mutex_lock(&priv->lock);
+ interval = __prp_get_frame_interval(priv, sd_state, fi->pad,
+ fi->which);
+ if (!interval) {
+ ret = -EINVAL;
+ goto out;
+ }
/* No limits on valid frame intervals */
- if (fi->interval.numerator == 0 || fi->interval.denominator == 0)
- fi->interval = priv->frame_interval;
- else
- priv->frame_interval = fi->interval;
+ if (fi->interval.numerator == 0 || fi->interval.denominator == 0) {
+ fi->interval = *interval;
+ } else {
+ *interval = fi->interval;
+
+ /*
+ * The IC task does not change the frame rate between sink
+ * and source, so keep both TRY slots in sync the same way
+ * prp_set_fmt() propagates formats to the source pad.
+ * (ACTIVE uses a single shared interval and needs nothing.)
+ */
+ if (fi->which == V4L2_SUBDEV_FORMAT_TRY &&
+ fi->pad == PRPENCVF_SINK_PAD) {
+ struct v4l2_fract *src_interval;
+
+ src_interval = __prp_get_frame_interval(priv, sd_state,
+ PRPENCVF_SRC_PAD,
+ fi->which);
+ if (src_interval)
+ *src_interval = fi->interval;
+ }
+ }
+out:
+ mutex_unlock(&priv->lock);
+
+ return ret;
+}
+
+static int prp_init_state(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *sd_state)
+{
+ struct prp_priv *priv = sd_to_priv(sd);
+ struct v4l2_fract *interval;
+ unsigned int pad;
+ int ret;
+
+ ret = imx_media_init_state(sd, sd_state);
+ if (ret)
+ return ret;
+
+ mutex_lock(&priv->lock);
+
+ for (pad = 0; pad < PRPENCVF_NUM_PADS; pad++) {
+ interval = v4l2_subdev_state_get_interval(sd_state, pad);
+ if (interval)
+ *interval = priv->frame_interval;
+ }
mutex_unlock(&priv->lock);
@@ -1274,10 +1333,6 @@ static int prp_registered(struct v4l2_subdev *sd)
return ret;
}
- /* init default frame interval */
- priv->frame_interval.numerator = 1;
- priv->frame_interval.denominator = 30;
-
priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
&ic_priv->sd,
PRPENCVF_SRC_PAD, true);
@@ -1335,7 +1390,7 @@ static const struct v4l2_subdev_ops prp_subdev_ops = {
};
static const struct v4l2_subdev_internal_ops prp_internal_ops = {
- .init_state = imx_media_init_state,
+ .init_state = prp_init_state,
.registered = prp_registered,
.unregistered = prp_unregistered,
};
@@ -1352,6 +1407,10 @@ static int prp_init(struct imx_ic_priv *ic_priv)
ic_priv->task_priv = priv;
priv->ic_priv = ic_priv;
+ /* init default frame interval */
+ priv->frame_interval.numerator = 1;
+ priv->frame_interval.denominator = 30;
+
spin_lock_init(&priv->irqlock);
timer_setup(&priv->eof_timeout_timer, prp_eof_timeout, 0);
---
base-commit: fa4ad798f6f681031775266044ba1b0cf3c670bd
change-id: 20261107-batch1-m2-prpencvf-try-3181836786d9
Best regards,
--
Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support
@ 2026-11-18 0:06 ` Maximo Manriquez Lizarraga
0 siblings, 0 replies; 4+ messages in thread
From: Maximo Manriquez Lizarraga @ 2026-11-18 0:06 UTC (permalink / raw)
To: slongerbeam
Cc: mchehab, linux-kernel, p.zabel, gregkh, imx, linux-staging,
linux-media, Maximo Manriquez Lizarraga
Implement frame interval handling for V4L2_SUBDEV_FORMAT_TRY
by storing and retrieving per-pad intervals from the subdev state,
following the same pattern the driver already uses for TRY formats:
ACTIVE intervals stay in priv->frame_interval while TRY intervals live
in the subdev state. Add a PRPENCVF-specific init_state callback to
initialize TRY intervals from the active default, and move default
interval initialization to prp_init(), which runs before any state can
be initialized.
Signed-off-by: Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
---
Compile-tested only: x86_64, VIDEO_IMX_MEDIA=m via COMPILE_TEST, zero
warnings. No i.MX hardware here for runtime testing; hardware testing
by others is welcome.
---
Changes in v2:
- Propagate TRY intervals from sink to source pad in prp_set_frame_interval(), mirroring prp_set_fmt() (spotted by Sashiko review; apologies for the oversight).
- Resend under my real name (From/Signed-off-by: Maximo Manriquez Lizarraga).
- Link to v1: https://patch.msgid.link/20261107-batch1-m2-prpencvf-try-v1-1-76bd9f505710@tubot.lat
---
drivers/staging/media/imx/imx-ic-prpencvf.c | 109 +++++++++++++++++++++-------
1 file changed, 84 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 3430ddeac356..5ce0eb56be5b 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -795,6 +795,18 @@ __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
return &priv->format_mbus[pad];
}
+static struct v4l2_fract *
+__prp_get_frame_interval(struct prp_priv *priv,
+ struct v4l2_subdev_state *sd_state,
+ unsigned int pad,
+ enum v4l2_subdev_format_whence which)
+{
+ if (which == V4L2_SUBDEV_FORMAT_TRY)
+ return v4l2_subdev_state_get_interval(sd_state, pad);
+
+ return &priv->frame_interval;
+}
+
/*
* Applies IC resizer and IDMAC alignment restrictions to output
* rectangle given the input rectangle, and depending on given
@@ -1208,22 +1220,25 @@ static int prp_get_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_frame_interval *fi)
{
struct prp_priv *priv = sd_to_priv(sd);
-
- /*
- * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
- * subdev active state API.
- */
- if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
- return -EINVAL;
+ struct v4l2_fract *interval;
+ int ret = 0;
if (fi->pad >= PRPENCVF_NUM_PADS)
return -EINVAL;
mutex_lock(&priv->lock);
- fi->interval = priv->frame_interval;
+ interval = __prp_get_frame_interval(priv, sd_state, fi->pad,
+ fi->which);
+ if (!interval) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ fi->interval = *interval;
+out:
mutex_unlock(&priv->lock);
- return 0;
+ return ret;
}
static int prp_set_frame_interval(struct v4l2_subdev *sd,
@@ -1231,24 +1246,68 @@ static int prp_set_frame_interval(struct v4l2_subdev *sd,
struct v4l2_subdev_frame_interval *fi)
{
struct prp_priv *priv = sd_to_priv(sd);
-
- /*
- * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
- * subdev active state API.
- */
- if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
- return -EINVAL;
+ struct v4l2_fract *interval;
+ int ret = 0;
if (fi->pad >= PRPENCVF_NUM_PADS)
return -EINVAL;
mutex_lock(&priv->lock);
+ interval = __prp_get_frame_interval(priv, sd_state, fi->pad,
+ fi->which);
+ if (!interval) {
+ ret = -EINVAL;
+ goto out;
+ }
/* No limits on valid frame intervals */
- if (fi->interval.numerator == 0 || fi->interval.denominator == 0)
- fi->interval = priv->frame_interval;
- else
- priv->frame_interval = fi->interval;
+ if (fi->interval.numerator == 0 || fi->interval.denominator == 0) {
+ fi->interval = *interval;
+ } else {
+ *interval = fi->interval;
+
+ /*
+ * The IC task does not change the frame rate between sink
+ * and source, so keep both TRY slots in sync the same way
+ * prp_set_fmt() propagates formats to the source pad.
+ * (ACTIVE uses a single shared interval and needs nothing.)
+ */
+ if (fi->which == V4L2_SUBDEV_FORMAT_TRY &&
+ fi->pad == PRPENCVF_SINK_PAD) {
+ struct v4l2_fract *src_interval;
+
+ src_interval = __prp_get_frame_interval(priv, sd_state,
+ PRPENCVF_SRC_PAD,
+ fi->which);
+ if (src_interval)
+ *src_interval = fi->interval;
+ }
+ }
+out:
+ mutex_unlock(&priv->lock);
+
+ return ret;
+}
+
+static int prp_init_state(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *sd_state)
+{
+ struct prp_priv *priv = sd_to_priv(sd);
+ struct v4l2_fract *interval;
+ unsigned int pad;
+ int ret;
+
+ ret = imx_media_init_state(sd, sd_state);
+ if (ret)
+ return ret;
+
+ mutex_lock(&priv->lock);
+
+ for (pad = 0; pad < PRPENCVF_NUM_PADS; pad++) {
+ interval = v4l2_subdev_state_get_interval(sd_state, pad);
+ if (interval)
+ *interval = priv->frame_interval;
+ }
mutex_unlock(&priv->lock);
@@ -1274,10 +1333,6 @@ static int prp_registered(struct v4l2_subdev *sd)
return ret;
}
- /* init default frame interval */
- priv->frame_interval.numerator = 1;
- priv->frame_interval.denominator = 30;
-
priv->vdev = imx_media_capture_device_init(ic_priv->ipu_dev,
&ic_priv->sd,
PRPENCVF_SRC_PAD, true);
@@ -1335,7 +1390,7 @@ static const struct v4l2_subdev_ops prp_subdev_ops = {
};
static const struct v4l2_subdev_internal_ops prp_internal_ops = {
- .init_state = imx_media_init_state,
+ .init_state = prp_init_state,
.registered = prp_registered,
.unregistered = prp_unregistered,
};
@@ -1352,6 +1407,10 @@ static int prp_init(struct imx_ic_priv *ic_priv)
ic_priv->task_priv = priv;
priv->ic_priv = ic_priv;
+ /* init default frame interval */
+ priv->frame_interval.numerator = 1;
+ priv->frame_interval.denominator = 30;
+
spin_lock_init(&priv->irqlock);
timer_setup(&priv->eof_timeout_timer, prp_eof_timeout, 0);
---
base-commit: fa4ad798f6f681031775266044ba1b0cf3c670bd
change-id: 20261107-batch1-m2-prpencvf-try-3181836786d9
Best regards,
--
Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support
2026-11-18 0:06 ` Maximo Manriquez Lizarraga
(?)
@ 2026-11-18 0:27 ` sashiko-bot
-1 siblings, 0 replies; 4+ messages in thread
From: sashiko-bot @ 2026-11-18 0:27 UTC (permalink / raw)
To: Maximo Manriquez Lizarraga; +Cc: imx, Frank.Li, media-ci
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] staging: media: imx: divergent TRY pad intervals in
prp_set_frame_interval()
--
commit ab0674eed0b91380970c6973e29f82828fdedc3b
Author: Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support
This commit adds V4L2_SUBDEV_FORMAT_TRY support for frame intervals in
the i.MX IC prpencvf subdev by storing TRY intervals in the subdev state
and initializing them in a custom init_state callback.
> diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 3430ddeac3569..5ce0eb56be5bf 100644
> --- a/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
[ ... ]
> @@ -1231,24 +1246,68 @@ static int prp_set_frame_interval(struct v4l2_subdev *sd,
> struct v4l2_subdev_frame_interval *fi)
> {
> struct prp_priv *priv = sd_to_priv(sd);
> -
> - /*
> - * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2
> - * subdev active state API.
> - */
> - if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE)
> - return -EINVAL;
> + struct v4l2_fract *interval;
> + int ret = 0;
>
> if (fi->pad >= PRPENCVF_NUM_PADS)
> return -EINVAL;
>
> mutex_lock(&priv->lock);
> + interval = __prp_get_frame_interval(priv, sd_state, fi->pad,
> + fi->which);
> + if (!interval) {
> + ret = -EINVAL;
> + goto out;
> + }
>
> /* No limits on valid frame intervals */
> - if (fi->interval.numerator == 0 || fi->interval.denominator == 0)
> - fi->interval = priv->frame_interval;
> - else
> - priv->frame_interval = fi->interval;
> + if (fi->interval.numerator == 0 || fi->interval.denominator == 0) {
> + fi->interval = *interval;
> + } else {
> + *interval = fi->interval;
> +
> + /*
> + * The IC task does not change the frame rate between sink
> + * and source, so keep both TRY slots in sync the same way
> + * prp_set_fmt() propagates formats to the source pad.
> + * (ACTIVE uses a single shared interval and needs nothing.)
> + */
> + if (fi->which == V4L2_SUBDEV_FORMAT_TRY &&
> + fi->pad == PRPENCVF_SINK_PAD) {
> + struct v4l2_fract *src_interval;
> +
> + src_interval = __prp_get_frame_interval(priv, sd_state,
> + PRPENCVF_SRC_PAD,
> + fi->which);
> + if (src_interval)
> + *src_interval = fi->interval;
> + }
> + }
[Severity: Low]
Can setting a V4L2_SUBDEV_FORMAT_TRY frame interval on PRPENCVF_SRC_PAD
cause the sink and source TRY intervals to diverge?
For V4L2_SUBDEV_FORMAT_ACTIVE, both pads share priv->frame_interval, so
calling prp_set_frame_interval() on PRPENCVF_SRC_PAD updates both pads.
For V4L2_SUBDEV_FORMAT_TRY, *interval = fi->interval overwrites the
source pad slot without either clamping it to the sink pad interval or
updating the sink pad slot to match, leaving the two pads with different
TRY frame intervals even though the IC does not alter the frame rate.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261117-batch1-m2-prpencvf-try-v2-1-dd331ab13137@tubot.lat?part=1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support
2026-11-18 0:06 ` Maximo Manriquez Lizarraga
(?)
(?)
@ 2026-11-18 9:03 ` Dan Carpenter
-1 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2026-11-18 9:03 UTC (permalink / raw)
To: DelaySystem
Cc: slongerbeam, mchehab, linux-kernel, p.zabel, gregkh, imx,
linux-staging, linux-media
On Tue, Nov 17, 2026 at 04:06:10PM -0800, Maximo Manriquez Lizarraga via B4 Relay wrote:
> From: Maximo Manriquez Lizarraga <DelaySystem@tubot.lat>
>
> Implement frame interval handling for V4L2_SUBDEV_FORMAT_TRY
> by storing and retrieving per-pad intervals from the subdev state,
> following the same pattern the driver already uses for TRY formats:
> ACTIVE intervals stay in priv->frame_interval while TRY intervals live
> in the subdev state. Add a PRPENCVF-specific init_state callback to
> initialize TRY intervals from the active default, and move default
> interval initialization to prp_init(), which runs before any state can
> be initialized.
>
AI is great at writing monkey see, monkey do commits but it sucks at
writing commit messages.
What difference does this make in terms of the users?
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-18 9:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 0:06 [PATCH v2] staging: media: imx: ic-prpencvf: add FORMAT_TRY frame interval support Maximo Manriquez Lizarraga via B4 Relay
2026-11-18 0:06 ` Maximo Manriquez Lizarraga
2026-11-18 0:27 ` sashiko-bot
2026-11-18 9:03 ` Dan Carpenter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.