From nobody Tue Apr 7 23:42:41 2026 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AE4E36DA1A; Wed, 11 Mar 2026 13:54:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773237266; cv=none; b=BheiYdfTxSYID6Y+K6gOv4GCodfjOLs4Wl3NV9SGhZw4cKbeLdiCJFrCw+WOQ+Nkelzxme9IE66B2Vg2uy2Ny6QiU/AlnA0utAp/kXtIE68yX/ytQoQCKdtYkIsAbon/n5GqaMBM9OtQt8oe0pKhSqJz5Ng63bRm2OcLwof/w1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773237266; c=relaxed/simple; bh=OJ0cPcpsl2j4Ke/j3qEGXccRhFAy5Qw4fqRwl/curv0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KSNTqe+M/6BBIMgG/4uDsZ85peXjaTiQJ6rXnDOW/W/9xNomYT6eFy9e7W+dFKhi4hAL6M3IWl7zDaT+f6Ls2gniVA2TQwABE7cOlsytZ3OMr1JIRC/fpReiQAdE16yHLyTAT83CX8PLgESHJ7GOeHqpiFWGQrx/2vnAhVTdiVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=cikwbb8N; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cikwbb8N" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 370F613D9; Wed, 11 Mar 2026 14:52:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1773237168; bh=OJ0cPcpsl2j4Ke/j3qEGXccRhFAy5Qw4fqRwl/curv0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cikwbb8N3bPUFKxRibkX6NHoU+uzAlmIl7ie1rOdw4EfCqQXKBh4F+SoEf/GFzAwi LHbSE4zXeqpqJsZ523aUnF7m80tXwkxQI1ljsHcTu2lrW08UK6htHVftB6ke3GfNZk aygOk8Xv8GI5Gz9x+bl9pwi1hxfaRGyeGLp98zKc= From: Tomi Valkeinen Date: Wed, 11 Mar 2026 15:53:22 +0200 Subject: [PATCH v5 09/10] media: rcar-csi2: Add full streams support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260311-rcar-streams-v5-9-3e6c957d7567@ideasonboard.com> References: <20260311-rcar-streams-v5-0-3e6c957d7567@ideasonboard.com> In-Reply-To: <20260311-rcar-streams-v5-0-3e6c957d7567@ideasonboard.com> To: =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Laurent Pinchart , Jacopo Mondi , Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4411; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=OJ0cPcpsl2j4Ke/j3qEGXccRhFAy5Qw4fqRwl/curv0=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBpsXPsAtTPHtVFFfVY5Vd0vjw1PyjrLEsNMdlx1 kMbGgLUl0SJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCabFz7AAKCRD6PaqMvJYe 9Z2DEACsr0edT7xFiLEPzf+AQ03s5JPeFYuXRxykM8pe1mNqQNdv7WxsoepM/M7O29+Dou5m7ds 0GBUJZJLxY1KPsYwyVeRpUBlrw/xYT30DPJ1Q8XdQlyrZbP8lq/IJ/c3ayum34CPzv74GVNvKkv rrAJjTpn575KOoOFKHSK2mlhUpxJkkH8xsIdx43u29WIsKNMduG3MROJOIc6ZMiIKzDrm7iYgSC 2q43T4+uUosDHff9TtImmMHWCcUWDhsPqrF4qrNpzGLyvUD9ElDImlM0t0wU5Xzk1i91JzpfmTP 0O6qUdtcR1qTa8MQKEHdHREtl5PuNzJQnT8LJHp/3OHkUZH/mr7M2uTEAYosTmxrqz/mX64bIQP xhCqTEcE+vy8XCw7G/cuQIT/0HlpiYRQm1FCwQvXJhnlXn1Jhn5GuY7MuxfruHWwc2W/WOazrs5 b0mHeX/DJj/2Sfo2C2kUCep/rtGcSBNFzgo4q8VcRga5BACHsbkN6n9ohVTVX1MaN8tqo96CtoI nc8XFYAMM8e8BEHHiPB8QfwdBenbOxlzPrPWEH2JlIKP1b03988k6B8YfnTxGF73AomiLoP76Xx cAfYNv7QE4LkS0ym7PLBY4VgJ414beLOJv4hdrpvs/z6Y1MYd/N27tdWJamVbNVx+8wSGPOBAYq 5MIToBnweftqXuw== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add the missing pieces to enable full streams support: - Add set_routing - Drop the explicit uses of a single stream, and instead use the streams mask. Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 75 ++++++++++++++++++++++----= ---- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index 831a5ec27233..04afde4fe195 100644 --- a/drivers/media/platform/renesas/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-csi2.c @@ -702,6 +702,17 @@ static const struct rcar_csi2_format rcar_csi2_formats= [] =3D { }, }; =20 +static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt =3D { + .width =3D 1920, + .height =3D 1080, + .code =3D MEDIA_BUS_FMT_RGB888_1X24, + .colorspace =3D V4L2_COLORSPACE_SRGB, + .field =3D V4L2_FIELD_NONE, + .ycbcr_enc =3D V4L2_YCBCR_ENC_DEFAULT, + .quantization =3D V4L2_QUANTIZATION_DEFAULT, + .xfer_func =3D V4L2_XFER_FUNC_DEFAULT, +}; + static const struct rcar_csi2_format *rcsi2_code_to_fmt(unsigned int code) { unsigned int i; @@ -1883,10 +1894,8 @@ static int rcsi2_enable_streams(struct v4l2_subdev *= sd, u64 source_streams_mask) { struct rcar_csi2 *priv =3D sd_to_csi2(sd); - int ret =3D 0; - - if (source_streams_mask !=3D 1) - return -EINVAL; + u64 sink_streams; + int ret; =20 if (!priv->remote) return -ENODEV; @@ -1897,8 +1906,13 @@ static int rcsi2_enable_streams(struct v4l2_subdev *= sd, return ret; } =20 + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + RCAR_CSI2_SOURCE_VC0, + RCAR_CSI2_SINK, + &source_streams_mask); + ret =3D v4l2_subdev_enable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); + sink_streams); if (ret) { if (priv->stream_count =3D=3D 0) rcsi2_stop(priv); @@ -1915,19 +1929,22 @@ static int rcsi2_disable_streams(struct v4l2_subdev= *sd, u32 source_pad, u64 source_streams_mask) { struct rcar_csi2 *priv =3D sd_to_csi2(sd); + u64 sink_streams; int ret; =20 - if (source_streams_mask !=3D 1) - return -EINVAL; - if (!priv->remote) return -ENODEV; =20 if (priv->stream_count =3D=3D 1) rcsi2_stop(priv); =20 + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + RCAR_CSI2_SOURCE_VC0, + RCAR_CSI2_SINK, + &source_streams_mask); + ret =3D v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); + sink_streams); if (ret) return ret; =20 @@ -1966,6 +1983,34 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *= sd, return 0; } =20 +static int rcsi2_set_routing(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + enum v4l2_subdev_format_whence which, + struct v4l2_subdev_krouting *routing) +{ + struct rcar_csi2 *priv =3D sd_to_csi2(sd); + int ret; + + if (priv->info->use_isp) { + ret =3D v4l2_subdev_routing_validate(sd, routing, + V4L2_SUBDEV_ROUTING_ONLY_1_TO_1); + } else { + ret =3D v4l2_subdev_routing_validate(sd, routing, + V4L2_SUBDEV_ROUTING_ONLY_1_TO_1 | + V4L2_SUBDEV_ROUTING_NO_SOURCE_MULTIPLEXING); + } + + if (ret) + return ret; + + ret =3D v4l2_subdev_set_routing_with_fmt(sd, state, routing, + &rcar_csi2_default_fmt); + if (ret) + return ret; + + return 0; +} + static int rcsi2_get_frame_desc_fallback(struct v4l2_subdev *sd, unsigned int pad, struct v4l2_mbus_frame_desc *fd) @@ -2041,6 +2086,7 @@ static const struct v4l2_subdev_pad_ops rcar_csi2_pad= _ops =3D { .set_fmt =3D rcsi2_set_pad_format, .get_fmt =3D v4l2_subdev_get_fmt, =20 + .set_routing =3D rcsi2_set_routing, .get_frame_desc =3D rcsi2_get_frame_desc, }; =20 @@ -2061,17 +2107,6 @@ static int rcsi2_init_state(struct v4l2_subdev *sd, }, }; =20 - static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt =3D { - .width =3D 1920, - .height =3D 1080, - .code =3D MEDIA_BUS_FMT_RGB888_1X24, - .colorspace =3D V4L2_COLORSPACE_SRGB, - .field =3D V4L2_FIELD_NONE, - .ycbcr_enc =3D V4L2_YCBCR_ENC_DEFAULT, - .quantization =3D V4L2_QUANTIZATION_DEFAULT, - .xfer_func =3D V4L2_XFER_FUNC_DEFAULT, - }; - static const struct v4l2_subdev_krouting routing =3D { .num_routes =3D ARRAY_SIZE(routes), .routes =3D routes, --=20 2.43.0