On Tue Sep 8 09:33:10 2026 +0300, Tomi Valkeinen wrote:
> Switch to Streams API with a single hardcoded route.
>
> For single-stream use case there should be no change in behavior.
>
> Reviewed-by: Laurent Pinchart <[email protected]>
> Reviewed-by: Niklas Söderlund <[email protected]>
> Tested-by: Niklas Söderlund <[email protected]>
> Signed-off-by: Tomi Valkeinen <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/platform/renesas/rcar-isp/csisp.c | 69 ++++++++++++++++++++++---
1 file changed, 62 insertions(+), 7 deletions(-)
---
diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c
b/drivers/media/platform/renesas/rcar-isp/csisp.c
index 97ddae942fe3..97465467d047 100644
--- a/drivers/media/platform/renesas/rcar-isp/csisp.c
+++ b/drivers/media/platform/renesas/rcar-isp/csisp.c
@@ -123,6 +123,17 @@ static const struct rcar_isp_format rcar_isp_formats[] = {
},
};
+static const struct v4l2_mbus_framefmt risp_default_fmt = {
+ .width = 1920,
+ .height = 1080,
+ .code = MEDIA_BUS_FMT_RGB888_1X24,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .field = V4L2_FIELD_NONE,
+ .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT,
+ .quantization = V4L2_QUANTIZATION_DEFAULT,
+ .xfer_func = V4L2_XFER_FUNC_DEFAULT,
+};
+
static const struct rcar_isp_format *risp_code_to_fmt(unsigned int code)
{
unsigned int i;
@@ -216,13 +227,20 @@ static void risp_power_off(struct rcar_isp *isp)
static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *state)
{
+ const struct v4l2_subdev_route *route;
const struct v4l2_mbus_framefmt *fmt;
const struct rcar_isp_format *format;
unsigned int vc;
u32 sel_csi = 0;
int ret;
- fmt = v4l2_subdev_state_get_format(state, RCAR_ISP_SINK);
+ if (state->routing.num_routes != 1)
+ return -EINVAL;
+
+ route = &state->routing.routes[0];
+
+ fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
+ route->sink_stream);
if (!fmt)
return -EINVAL;
@@ -341,7 +359,7 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
{
- struct v4l2_mbus_framefmt *framefmt;
+ struct v4l2_mbus_framefmt *fmt;
if (format->pad > RCAR_ISP_SINK)
return v4l2_subdev_get_fmt(sd, state, format);
@@ -349,10 +367,20 @@ static int risp_set_pad_format(struct v4l2_subdev *sd,
if (!risp_code_to_fmt(format->format.code))
format->format.code = rcar_isp_formats[0].code;
- for (unsigned int i = 0; i < RCAR_ISP_NUM_PADS; i++) {
- framefmt = v4l2_subdev_state_get_format(state, i);
- *framefmt = format->format;
- }
+ /* Set sink format. */
+ fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
+ if (!fmt)
+ return -EINVAL;
+
+ *fmt = format->format;
+
+ /* Propagate the format to the source pad. */
+ fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad,
+ format->stream);
+ if (!fmt)
+ return -EINVAL;
+
+ *fmt = format->format;
return 0;
}
@@ -369,6 +397,32 @@ static const struct v4l2_subdev_ops rcar_isp_subdev_ops = {
.pad = &risp_pad_ops,
};
+static int risp_init_state(struct v4l2_subdev *sd,
+ struct v4l2_subdev_state *state)
+{
+ static struct v4l2_subdev_route routes[] = {
+ {
+ .sink_pad = RCAR_ISP_SINK,
+ .sink_stream = 0,
+ .source_pad = RCAR_ISP_PORT0,
+ .source_stream = 0,
+ .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE,
+ },
+ };
+
+ static const struct v4l2_subdev_krouting routing = {
+ .num_routes = ARRAY_SIZE(routes),
+ .routes = routes,
+ };
+
+ return v4l2_subdev_set_routing_with_fmt(sd, state, &routing,
+ &risp_default_fmt);
+}
+
+static const struct v4l2_subdev_internal_ops risp_internal_ops = {
+ .init_state = risp_init_state,
+};
+
/*
-----------------------------------------------------------------------------
* Async handling and registration of subdevices and links
*/
@@ -541,11 +595,12 @@ static int risp_probe(struct platform_device *pdev)
isp->subdev.owner = THIS_MODULE;
isp->subdev.dev = &pdev->dev;
+ isp->subdev.internal_ops = &risp_internal_ops;
v4l2_subdev_init(&isp->subdev, &rcar_isp_subdev_ops);
v4l2_set_subdevdata(&isp->subdev, &pdev->dev);
snprintf(isp->subdev.name, sizeof(isp->subdev.name), "%s %s",
KBUILD_MODNAME, dev_name(&pdev->dev));
- isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+ isp->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_STREAMS;
isp->subdev.entity.function = MEDIA_ENT_F_VID_MUX;
isp->subdev.entity.ops = &risp_entity_ops;
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
