From nobody Thu Jun 25 03:08:15 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 5FEDB3F0777; Wed, 17 Jun 2026 11:56:01 +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=1781697365; cv=none; b=X09ulTd66tXZetCnZbc8emm3jihkIidcb6s3HA48pDHHsZ6gx2v0F2soyWjiRXfaCX8zgRoVWafO9D6gFH8FJ9qN4CLNMMPd7ImWj99SJxLJP4O7KGdBNCg187OlFujRzjYjLPLRPqCQpAwqNOVO9skz/xxJMo9RtcQO71I0GyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697365; c=relaxed/simple; bh=TQpu4ZDSe8o6iU2aimqX4sqTDMPQM2QGuVyZ2YPewCk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dnpQgWQQt4W44sogsKv6S3WAnj5p9JrjQ3lrzjKYH20qrAY791CsD9xyPOzmT0rNitjNdhpRZVM8IbS5YrLPqausMQjTZ6CQ8cS3J+3eafDM4MuHFefIkI5HFQYePMAdyxFE5mnL2KbLwg96k/O938udPwjTw7xVQvzROj/diBA= 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=stAN+czd; 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="stAN+czd" 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 60D9A664; Wed, 17 Jun 2026 13:55:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697318; bh=TQpu4ZDSe8o6iU2aimqX4sqTDMPQM2QGuVyZ2YPewCk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=stAN+czdJofimo4QLtFOFcc10yCEfdEJCzgH/1Q1aiKlcG7qttKUGOQIkk9deaNJP 0EGcWOYcvT/LAA0PopbEdGQVnjICEdTyCZGYeFPCR55tjr2u030hDAivrQf1g73fgY 3/2ZkzTyGjpBBP7G0McK5GlvJ8SoBaMw2zPmWvtw= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:54 +0300 Subject: [PATCH v6 01/11] media: rcar-vin: Fix comment related to stride handling 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: <20260617-rcar-streams-v6-1-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1033; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=TQpu4ZDSe8o6iU2aimqX4sqTDMPQM2QGuVyZ2YPewCk=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotDIdYZJdjnamP4uo8u0YiJvpkcCKjPlJcna lmnzZDCP0WJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLQwAKCRD6PaqMvJYe 9b8ND/9BrO/14zJcxA0f4UyvxTrTZVYQI1f4rIYelwaTKOY63M4ZiptFiTLvEKunUPQdkh6wIOP JEd/oayedBpC/rtDimdCNFaOy8WEW6KKBHKV54KvxLx2arV51ExGopLX+BdO7/cJppyftwJndEk q0OjRBBkJnk2Ps/SEDTyhpjSXHHfMawu+dX/dT7yF2GFZwYckN6NMSIj8TMH51cjQJtUPekDcey w8e4YOokzgXoqeXDQPt2qr4N4IkyxakDHbc0v7Y708FHzkdpQFBKW9iLRC0/nEXh+l+ZqdQUuX0 ySVryDFWaC7FQwe+3C9LsLXiwd1soU6BoCYVTqMHaKYWaOcL3+AI+ty2fiEARHP+43zYreWEays tjXl+ZFXQROeRB9musYzllgGz1cdHdQ44hIeCRf7GzkiQ7TvdQ6oPL896hYFn+i6Fnf7/pDClMP U5zcxwJ+KW+y+RpP8Iu5XkMhZSQiBHyZGS2LuLkDKJ7pRRi1LBbh8K6Xq9xlknsCo+SoFJnovK+ vBq6KmTiM5xN+RvSg4ZCzWQjynNSPFGDpyN8XuALLWdPlDdve2Fo7YfpouTriHbBIE0qtN+ydHm OpKkMkKhsq/3uDUwwzQM40dXT8/gOpUu7r/0E0ugjOiVfKD2PLdtSwyYEmjVrZbCXuWiXuL9zhc JMdEL0cQrJ9DRuQ== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 The comment says the stride has to be aligned to 16 bytes, but it should be 16 pixels, as VNIS_REG register is in pixels. Signed-off-by: Tomi Valkeinen Fixes: 40c6da8a9c0f ("media: renesas: vin: Fix RAW8 (again)") --- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c b/drivers/m= edia/platform/renesas/rcar-vin/rcar-dma.c index f9af9177e02f..d6c69c674d57 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c @@ -678,7 +678,7 @@ void rvin_crop_scale_comp(struct rvin_dev *vin) =20 /* * VNIS_REG has four lowest bits always 0, i.e. the stride has to be - * aligned to 16 bytes. This is done in rvin_format_bytesperline(). + * aligned to 16 pixels. This is done in rvin_format_bytesperline(). */ =20 fmt =3D rvin_format_from_pixel(vin, vin->format.pixelformat); --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 B07603F0A99; Wed, 17 Jun 2026 11:56:06 +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=1781697368; cv=none; b=uKMtIrbdtQPmlr/mpdyUgxL3EiF+0R+mi0hqyhvQgRbR6fBx7BLZuOg+ltboUmGNaP1/q34KWYIm9ltHexhm/URwoKyjb+KOU2T5i0m3qO/eDER85kdMDg75UuZiMF9jQ+qpgnfHm1SWJdravSRFpPTVP6Ez/WVOEm/KTyCA5ac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697368; c=relaxed/simple; bh=BxfPGRr2J1D055cjrNZil4rQ5zjx26uJty+0ZS+l6aM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t0K1k9mljQU1s0lHUqT4uXq9brFj9ZwhUAJupKf9sEAhl686iFslAJVOkNqiI6moNR/s/lzbjpX6htT0+s02UAcQcO+mtZdfnoi8N48EHerz2wDxXAhRcGxPBM0gbFin/4i63r661ze3fBUoVZ1R8u1HMQxPR5iX6LPbdjru6bA= 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=RSO1th//; 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="RSO1th//" 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 233AE97F; Wed, 17 Jun 2026 13:55:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697319; bh=BxfPGRr2J1D055cjrNZil4rQ5zjx26uJty+0ZS+l6aM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RSO1th//l5VGOB3LKm+7zp2Gi2yhq0glg4UKzxHI1+jMuHotN26RoxcghWWzg5umq Au8pA9z9amg1Z4pu6acNdiGeqqn71nywvu3t4KJmQ65mdzuyZDA+C7x3zyptsFr9CR OpHnQXkQjeisvbW91OYz7Kx9/1MQu/PMhYldlxuk= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:55 +0300 Subject: [PATCH v6 02/11] media: rcar-vin: Link VINs on Gen3 to a single channel on each CSI-2 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: <20260617-rcar-streams-v6-2-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2508; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=BxfPGRr2J1D055cjrNZil4rQ5zjx26uJty+0ZS+l6aM=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotDeU2HQMH+Ksbdr6V434I1E5hiKAwmD4jgi X+ZFv+Xzu6JAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLQwAKCRD6PaqMvJYe 9aZKEACQ4YQcFPg9I7Kpu9Hv6GYO9uNyL9ipBLIZW52oU5p3hKkZKL8ELOg+meRH5zi7MLSlMnr BGdVLqDTDbAVP/Z30Pon1SdqQk8dOa7+M0bfYnVCk9Ce295IP8zcO/lhGUVhs6TXJRoXqTUjCIo Tjyrxf8jVhBgv8dTwiSfa0PRqK0b3LAgbTtJKPp0xuPNnWIAJfKSO+Pum99+ScXPrTBWmBE2Lpz C6f5tOZ525DEL4BhhZGvReivO/9nmvoPfwbrI1zRD13ibY8Xcke/XuUNARrTUFNcz/e4Fash1Td bAeCGnh23mTiO8O81uhf6DsVAtXGM7qraEWb9bT6lvh5Lm4rSOxKOlG4+fMvfXQCegIM+g6eImI fFBD4iMso/VsrDUXfNsK0UiGHBwS0gdaDZgCxxbHYCAscQ5YOpQ538r/RoWLQBJMFlRGA4MJ3G6 SW8fJk6wTnaRba3HUQf9qVOZrdl9r77IE8JHLoCpoLDyo/R6lB3k4vXPDTMgdS9LnuxVwCXDphq wQY1Tbo8WlKM2lrLVTJGeJ1gqFQxs/8wRyVUrwUoULOPcAun886JJRjadl9KTpJw/25ybI707sU v59z4vyLZiVIolGwYasIjaTOPpyBn9uQPR0pA/hznoDZyEMOAzkYu0PssCqQ+4ERVZ2nDTB6eA/ vb4qbZO6fNUq0mg== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 The stream routing will be fully configurable when we add full streams support to the rcar pipeline. Thus there is no need for the user to be able to link VINs to different CSI-2 channels. In fact, allowing e.g. VIN0 to be connected to CSI-2 channel 3 would be wrong, as the hardware doesn't allow that. Change rvin_csi2_create_link() so that it creates media links only between matching VINs and CSI-2 channels (VIN0 - channel 0, VIN1 - channel 1, etc.). Reviewed-by: Niklas S=C3=B6derlund Signed-off-by: Tomi Valkeinen --- .../media/platform/renesas/rcar-vin/rcar-core.c | 27 ++++++++++++------= ---- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/= media/platform/renesas/rcar-vin/rcar-core.c index c8d564aa1eba..2fcea715101c 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c @@ -673,23 +673,26 @@ static int rvin_csi2_create_link(struct rvin_group *g= roup, unsigned int id, struct media_entity *source =3D &group->remotes[route->csi].subdev->entit= y; struct media_entity *sink =3D &group->vin[id]->vdev.entity; struct media_pad *sink_pad =3D &sink->pads[0]; + struct media_pad *source_pad; + unsigned int source_idx; unsigned int channel; - int ret; =20 - for (channel =3D 0; channel < 4; channel++) { - unsigned int source_idx =3D rvin_group_csi_channel_to_pad(channel); - struct media_pad *source_pad =3D &source->pads[source_idx]; + /* + * The channels from CSI-2 blocks and the VIN groups have a set of + * hardcoded routing options to choose from. We only support the routing + * where all VINs in a group are connected to the same CSI-2 block, + * and the Nth VIN in the group is connected to the Nth CSI-2 channel. + */ =20 - /* Skip if link already exists. */ - if (media_entity_find_link(source_pad, sink_pad)) - continue; + channel =3D id % 4; + source_idx =3D rvin_group_csi_channel_to_pad(channel); + source_pad =3D &source->pads[source_idx]; =20 - ret =3D media_create_pad_link(source, source_idx, sink, 0, 0); - if (ret) - return ret; - } + /* Skip if link already exists. */ + if (media_entity_find_link(source_pad, sink_pad)) + return 0; =20 - return 0; + return media_create_pad_link(source, source_idx, sink, 0, 0); } =20 static int rvin_parallel_setup_links(struct rvin_group *group) --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 48CEF3EB111; Wed, 17 Jun 2026 11:56:08 +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=1781697370; cv=none; b=UGv7EU8XAlpo/M3W+m9i2ec+sydytfHeFlXsNtGZPcMpixFaS69PwPVEdSn0pvzXPU7X7F56zVYupmH5aL0qWOhYfufKGuDJ3gtnGaRks6Aaj0MNQR5NW+MKzBtRywhwpMhhJs1GlypWwB4pLuPiTlwq2Rmk63+9F1G78jfPdws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697370; c=relaxed/simple; bh=hrHGVZ86FuA2oCxeuk7UfW40XyZ8V8YygkjiETwuZx0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ekG8YIB+ECuT5JI6RHGmhx+AgkVoL+TN0CeUGgl3nnxQsZH+1DkVcYu7hiuzzE9sEQ2GVnQze902dnXi2ICsTPlbEs7YBoUmapaByI9xqCwjVAPHiXwLZnE5XAEz26gqXJG5OAIRWYh8AlPWoZklvh/iVtH39tLfMPhOlIdvcqc= 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=sG4ZHbNQ; 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="sG4ZHbNQ" 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 DA23C1121; Wed, 17 Jun 2026 13:55:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697320; bh=hrHGVZ86FuA2oCxeuk7UfW40XyZ8V8YygkjiETwuZx0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=sG4ZHbNQA8AqaX6jThiQGH3MKhOSsEFfrDMgSF2/SKh7xhrwoatLuEJ5lteE/oCmV QDHChy9qFRdfyWjiDGs2CphcANDUIqcFgC7Yw6tiEBpxTKmb/QulmdRVcnuu9awZim Ds9GbmwBg7me1R+cN6+3VLATIq94Zw847HXy+xOM= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:56 +0300 Subject: [PATCH v6 03/11] media: rcar-isp: Move {enable|disable}_streams() calls 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: <20260617-rcar-streams-v6-3-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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 , Laurent Pinchart X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2957; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=hrHGVZ86FuA2oCxeuk7UfW40XyZ8V8YygkjiETwuZx0=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotDjUAWK2AHvY4Z642Hauke3MoG8A52GZi4a HQGbVIZGuWJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLQwAKCRD6PaqMvJYe 9YETD/9HPvOgCc39eNbylZDnJBnvkaITgQcZvIX+6jvpcpC17zzMVeavkPeZOoM5vRK95IO8fsm L37xTXk0zkaxW+y5ElhcUId8lg7D8T8LdzHWlyWtQDkH1L8+3wWazuLgErWS1vUld4ZIOcbHeC0 o3BlRpmBwHeYiaQnbTLQR+Ddo0Eqi79HxvbFr6zh5p0pCpcaeWJFdUvRVaCG4tYADAjw1ZfWf4p sDmmbcGIrC0CfBktHDUBo7y41AY7858aGHz2GjmaTtRKUex4wewIH0//QQiRyEMmW3Agt+t7JOj B/XpDReZO19eCgGRnJcEunltozBLpfrhjszdn4jEqWv0pAmddNJY6d2do6WVx+DeY74eFqt2mEV Bc6QYo/J8rty9YNRC5ACu4RLDpduKDBLtq5SJg+4/XAtxmeNK/zklQ4f3GwXFkZAg6bwra2+rxL xRaNpnunheibRPIcS7g1JtCjNfjkKKs7yVV/0JrmbXgCoSW1PXIuRoh3aUwBX0rcX104aloVJ74 RWtwmp477LP4PPZnwV/76ou3z3f2ywyXAjalcj6reCy+K/OBAarYMyzJg79UPzTA01aLmDpNDmR 2/fLCkbfIMQHz4eWEYIHcYb0g9/byMf6scGE5oRglhiq9vVS/Dp5AYneE8S+F7asn9JOnEjec/k Tw8/GcdZI3HX8jA== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 With multiple streams the operation to enable the ISP hardware and to call {enable|disable}_streams() on upstream subdev will need to be handled separately. Prepare for that by moving {enable|disable}_streams() calls out from risp_start() and risp_stop(). On Gen4, a side effect of this change is that if the sink side devices call .enable_streams() on rcar-isp multiple times, the second call will fail. This is because we always use stream ID 0, so the second call would attempt to enable the same stream again, leading to an error. In other words, a normal single-stream setup continues to work, but trying to use the current driver's custom VC based routing will fail. Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-isp/csisp.c | 27 ++++++++++++++++-----= ---- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/medi= a/platform/renesas/rcar-isp/csisp.c index 8fb2cc3b5650..58a9a3bd9f75 100644 --- a/drivers/media/platform/renesas/rcar-isp/csisp.c +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c @@ -268,18 +268,11 @@ static int risp_start(struct rcar_isp *isp, struct v4= l2_subdev_state *state) /* Start ISP. */ risp_write_cs(isp, ISPSTART_REG, ISPSTART_START); =20 - ret =3D v4l2_subdev_enable_streams(isp->remote, isp->remote_pad, - BIT_ULL(0)); - if (ret) - risp_power_off(isp); - - return ret; + return 0; } =20 static void risp_stop(struct rcar_isp *isp) { - v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, BIT_ULL(0)); - /* Stop ISP. */ risp_write_cs(isp, ISPSTART_REG, ISPSTART_STOP); =20 @@ -291,7 +284,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd, u64 source_streams_mask) { struct rcar_isp *isp =3D sd_to_isp(sd); - int ret =3D 0; + int ret; =20 if (source_streams_mask !=3D 1) return -EINVAL; @@ -305,9 +298,17 @@ static int risp_enable_streams(struct v4l2_subdev *sd, return ret; } =20 + ret =3D v4l2_subdev_enable_streams(isp->remote, isp->remote_pad, + BIT_ULL(0)); + if (ret) { + if (isp->stream_count =3D=3D 0) + risp_stop(isp); + return ret; + } + isp->stream_count +=3D 1; =20 - return ret; + return 0; } =20 static int risp_disable_streams(struct v4l2_subdev *sd, @@ -315,6 +316,7 @@ static int risp_disable_streams(struct v4l2_subdev *sd, u64 source_streams_mask) { struct rcar_isp *isp =3D sd_to_isp(sd); + int ret; =20 if (source_streams_mask !=3D 1) return -EINVAL; @@ -322,6 +324,11 @@ static int risp_disable_streams(struct v4l2_subdev *sd, if (!isp->remote) return -ENODEV; =20 + ret =3D v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, + BIT_ULL(0)); + if (ret) + return ret; + if (isp->stream_count =3D=3D 1) risp_stop(isp); =20 --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 61C803F54BF; Wed, 17 Jun 2026 11:56:10 +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=1781697372; cv=none; b=jpbOu2jZZ3Sv06pgqO0MuBmScCH052JdZRuYdNX+TMGJNyNPWFJPAcsTEoCC6828FVGEDMI5jvXcsRZ40aresaHHLa0D+k6DihvQ6dE7XRPqVOiFGISQ6sbAmCvCBka3cAN5ltgxm1kj5UtCYXb7bRqxsBa2h9udXnIYU3rRZAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697372; c=relaxed/simple; bh=fLSaZatxZGVezSWbEtVA1QixYVyhOQYtg1eGVTt/5WM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nMFkLg8FhH0rFQZad1EFviwjr3rjbOMkMl4ueJAwuNkS7QoBDA93XmIvQ7qLtGBFI2iAnzNWM9HltsUwp1KUz8+8LeKhCQ12a2d+r4M9IdDGs9dabgJDRsnNz3uCvOssmIMb/9rHl8jQ4Wc5VT1m6kdelA+3xUQyQdOTZzuO3fA= 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=GVrJu1UF; 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="GVrJu1UF" 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 A402016F9; Wed, 17 Jun 2026 13:55:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697321; bh=fLSaZatxZGVezSWbEtVA1QixYVyhOQYtg1eGVTt/5WM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GVrJu1UFJ/IEND04SfxgJODDYTfZHlo8LxjQiheBg/A+ctBwiSTA6qRgv0jBleaCh hkJYXpwBUu4ALtHrwNY/oP6mKwDS2gfZTSl7LDrtJH3rSfM+dJ52IhjGiA2O33BQAl O6FejUg0EPbjzmfwmPBC505EKKnaQNXnKKnfaLFU= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:57 +0300 Subject: [PATCH v6 04/11] media: rcar-csi2: Move {enable|disable}_streams() calls 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: <20260617-rcar-streams-v6-4-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4090; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=fLSaZatxZGVezSWbEtVA1QixYVyhOQYtg1eGVTt/5WM=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotEmmV/gtknz5Yn43xKdU7KYsWTNOvTzLODo 1bH27q8ne2JAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRAAKCRD6PaqMvJYe 9ffnEACiIGPtz90VoxIS71QGFHNUxqNvKhIZmIJr6eSkKoyXhhW0EqMvuidgWQ0/NPK5FMAM4NM InpRl/Mur69nCrzyiH0Yd8W/g8mTI1n+PkwfhT9UzRtA4WFCc/SkyBmjLkipyyiJwWySq/jj6D3 11ySg4+je+HUmvUs+ltliKdYCU5L6QomfQ6QqI/npy2gedi2c1aBkM8Y5eXlXJtBHEza9FJApKg THs5VaRzm4uM8lEQf6HyglZZnHUPl6ZrGrqDSnt9A+s0Fx9sjM9S10r5qEqkd15WTeslEOOUQvk DEs7kGe0ArzqOU4zRu9J/QXm2IVqXK9irMOyCw5NuBFnt2KABYQP+z7Gd8UnotqW9n5h4j1+SIa rBtNgS42Txj81WDa8XABHN6HGbUrJ/87MgUvtxIF/rF3aNIRrrqm4bFsMwN+HapKbX+rYo8pJGl bDarw+HkdUNDEPzZy4YXqqnUtvNPbFC2mQLIWr7yIhyhbWtas/QEXaJi3TA6rZHAZ/tdsU2HGKO cxIDBmjLlxJP6kc1M9xf4xjT/xTK3GYMCxf7ozwtKhOLjGHv2pWwGLsv1SHjkZLRNpz4/m49xd8 gMfRN8Gbq/HVPHDc0nMh2/0bYTJ6N+ji+HT8W5rsub13hGCA4TdwKXtI7Kmdyt4YdGdIdxVbdXa cqgYczvFoEqvuew== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 With multiple streams the operation to enable the CSI-2 hardware and to call {enable|disable}_streams() on upstream subdev will need to be handled separately. Prepare for that by moving {enable|disable}_streams() calls out from rcsi2_start() and rcsi2_stop(). As the error recovery in rcsi2_irq_thread() relies on rcsi2_start() and rcsi2_stop(), we need to modify rcsi2_irq_thread() accordingly. On Gen3, a side effect of this change is that if the sink side devices call .enable_streams() on rcar-csi2 multiple times, the second call will fail. This is because we always use stream ID 0, so the second call would attempt to enable the same stream again, leading to an error. In other words, a normal single-stream setup continues to work, but trying to use the current driver's custom VC based routing will fail. On Gen4, this doesn't matter as the rcar-isp behaves in a similar way as described above, and thus rcar-csi2 will only get a single .enable_streams() call. Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 59 ++++++++++++++++++++++++--= ---- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index 7305cc4a04cb..f5d8b06dff51 100644 --- a/drivers/media/platform/renesas/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-csi2.c @@ -1822,20 +1822,12 @@ static int rcsi2_start(struct rcar_csi2 *priv, stru= ct v4l2_subdev_state *state) return ret; } =20 - ret =3D v4l2_subdev_enable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); - if (ret) { - rcsi2_enter_standby(priv); - return ret; - } - return 0; } =20 static void rcsi2_stop(struct rcar_csi2 *priv) { rcsi2_enter_standby(priv); - v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, BIT_ULL(0)); } =20 static int rcsi2_enable_streams(struct v4l2_subdev *sd, @@ -1857,6 +1849,14 @@ static int rcsi2_enable_streams(struct v4l2_subdev *= sd, return ret; } =20 + ret =3D v4l2_subdev_enable_streams(priv->remote, priv->remote_pad, + BIT_ULL(0)); + if (ret) { + if (priv->stream_count =3D=3D 0) + rcsi2_stop(priv); + return ret; + } + priv->stream_count +=3D 1; =20 return ret; @@ -1867,7 +1867,7 @@ 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); - int ret =3D 0; + int ret; =20 if (source_streams_mask !=3D 1) return -EINVAL; @@ -1878,9 +1878,14 @@ static int rcsi2_disable_streams(struct v4l2_subdev = *sd, if (priv->stream_count =3D=3D 1) rcsi2_stop(priv); =20 + ret =3D v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, + BIT_ULL(0)); + if (ret) + return ret; + priv->stream_count -=3D 1; =20 - return ret; + return 0; } =20 static int rcsi2_set_pad_format(struct v4l2_subdev *sd, @@ -1971,14 +1976,44 @@ static irqreturn_t rcsi2_irq_thread(int irq, void *= data) { struct v4l2_subdev_state *state; struct rcar_csi2 *priv =3D data; + int ret; =20 state =3D v4l2_subdev_lock_and_get_active_state(&priv->subdev); =20 + if (priv->stream_count =3D=3D 0) + goto out; + rcsi2_stop(priv); + + ret =3D v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, + BIT_ULL(0)); + if (ret) { + dev_warn(priv->dev, + "Error recovery: failed to disable streams: %d\n", + ret); + goto out; + } + usleep_range(1000, 2000); - if (rcsi2_start(priv, state)) - dev_warn(priv->dev, "Failed to restart CSI-2 receiver\n"); =20 + ret =3D rcsi2_start(priv, state); + if (ret) { + dev_warn(priv->dev, + "Error recovery: failed to start CSI-2 receiver: %d\n", + ret); + goto out; + } + + ret =3D v4l2_subdev_enable_streams(priv->remote, priv->remote_pad, + BIT_ULL(0)); + if (ret) { + dev_warn(priv->dev, + "Error recovery: failed to start streams: %d\n", + ret); + goto out; + } + +out: v4l2_subdev_unlock_state(state); =20 return IRQ_HANDLED; --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 8CBD13F5BCF; Wed, 17 Jun 2026 11:56:11 +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=1781697372; cv=none; b=FTKKlIjCNXgsGspXhbe4tXpjsHpcr1rgmlbkmAAAHYRxP4k4ro3eTct/ErfGYgXC1DhB0okbvRNXC+cFhcMKtd840j3RTku9byqNIYQNivrihTaR3YU6ZlzNcz2X/g0DSEHnlXrFG09e3R1gD0hCpj2aqCLl7BaerzzlKlxH0Zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697372; c=relaxed/simple; bh=6sHE00vbDvzvrybHQclSR6qWqqhtviFdFTBgc5dIgYE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KE9l7JqCUHPKB26NWHYDSLlbT7ECAW/LNSqVyFvADMhKW7dsXwfCmO6t0qyzJqposn8T2WSKRZ1VrK/68NCFPNEkia6tYgBeeL0gEbOdPYeV3w++h5PAaDe0j/yMGT4k+CmhfnvbWUkOpVBuURCxsLRA17F8TRtLAUlfqQRErlU= 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=XBRodase; 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="XBRodase" 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 6587518E9; Wed, 17 Jun 2026 13:55:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697321; bh=6sHE00vbDvzvrybHQclSR6qWqqhtviFdFTBgc5dIgYE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XBRodase4zRAh1axK1oCitwH9puPynRJ8wCQbB33Kweftix4ac7UEU0muondnFp6m W7z9uapz5tJl4wxnewWm+1tdAfdCtU99ign9SBtneJbN/51SmJFUYTandPhKjqFHJs wYCct0fbVIbG0T0abKfkfAzOKYGueXr8SpaZRnBI= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:58 +0300 Subject: [PATCH v6 05/11] media: rcar-csi2: Switch to Streams API 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: <20260617-rcar-streams-v6-5-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5188; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=6sHE00vbDvzvrybHQclSR6qWqqhtviFdFTBgc5dIgYE=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotE+5XiH48zvOMT+Ws2VpWXRzXys0wFe2cWe 7Mny+iC1ieJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRAAKCRD6PaqMvJYe 9flQD/0RGHQ7OXugT3lskQHoLsZJu7Tp+zg2e0MpqoMaw4+uBvKiMy3yXRan7MG4XDRK9ZkD/Qu BO7TUIt8yooXRoO4PIIb6lIdErL0vJIy9oG4iWClnyTPxvJs8ce+yyNhU7SvTqUHTprTznTFwEF Y4KYP3QfSAzcDy36shEMbvYEMSTjy6ovHBc5elZQiwY1PQCLvi1V7hi/+Or+L2O/SkBetsg4qjX A5H88j3cqkbcLzdkG07hWmjjTbO1SS3gPDyu0B8GJW4QQSYkAPFJri2WjPvtaZSXPCrxj20wJBX hBXzfOvghOLPtl/S5vr+T+4veIQAzjVzRExqw2XrmkaC6Ogd7ta2nOS1u3EBrV3hqPbPzXDynR8 2xZeAAMiDm2vq/9jLFdksipNzI8tflQt5kCYWdIljPrGtHEGTUZRq9Fqy6lKWWC6bhWaIWZzi/S ISwgmyzHGNtValGvTLZg7fmarXekLVpbIrRKMHoG51cXdqJQP6raHSqs/uZVXHZT8MmpEvlqc/Z CEcf6hz2zZYpQ18niH+7uU96E9i56RLwMZI3sTCng2mCwPecv8jGNPn30DAXSs8nO/pitlges1e /ZBnxqtjbfZCrs3y9ZGmh8y7rg+kw8z99Auz/IvbAR/RUpRg+xMf1h2fxgTZv8w13i9DHqTZQl5 0FqPhzYdK5G5F4Q== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 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 Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 64 +++++++++++++++++++++++---= ---- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index f5d8b06dff51..91f713e1f8c2 100644 --- a/drivers/media/platform/renesas/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-csi2.c @@ -1023,17 +1023,24 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv, */ freq =3D v4l2_get_link_freq(remote_pad, 0, 0); if (freq < 0) { + const struct v4l2_subdev_route *route; const struct rcar_csi2_format *format; const struct v4l2_mbus_framefmt *fmt; unsigned int lanes; unsigned int bpp; int ret; =20 + if (state->routing.num_routes !=3D 1) + return -EINVAL; + ret =3D rcsi2_get_active_lanes(priv, &lanes); if (ret) return ret; =20 - fmt =3D v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK); + route =3D &state->routing.routes[0]; + + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); if (!fmt) return -EINVAL; =20 @@ -1062,6 +1069,7 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv, static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv, struct v4l2_subdev_state *state) { + const struct v4l2_subdev_route *route; const struct rcar_csi2_format *format; u32 phycnt, vcdt =3D 0, vcdt2 =3D 0, fld =3D 0; const struct v4l2_mbus_framefmt *fmt; @@ -1070,7 +1078,16 @@ static int rcsi2_start_receiver_gen3(struct rcar_csi= 2 *priv, int mbps, ret; =20 /* Use the format on the sink pad to compute the receiver config. */ - fmt =3D v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK); + + if (state->routing.num_routes !=3D 1) + return -EINVAL; + + route =3D &state->routing.routes[0]; + + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); + if (!fmt) + return -EINVAL; =20 dev_dbg(priv->dev, "Input size (%ux%u%c)\n", fmt->width, fmt->height, @@ -1892,8 +1909,7 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *s= d, struct v4l2_subdev_state *state, struct v4l2_subdev_format *format) { - struct rcar_csi2 *priv =3D sd_to_csi2(sd); - unsigned int num_pads =3D rcsi2_num_pads(priv); + struct v4l2_mbus_framefmt *fmt; =20 if (format->pad > RCAR_CSI2_SINK) return v4l2_subdev_get_fmt(sd, state, format); @@ -1901,11 +1917,20 @@ static int rcsi2_set_pad_format(struct v4l2_subdev = *sd, if (!rcsi2_code_to_fmt(format->format.code)) format->format.code =3D rcar_csi2_formats[0].code; =20 - *v4l2_subdev_state_get_format(state, format->pad) =3D format->format; + /* Set sink format. */ + fmt =3D v4l2_subdev_state_get_format(state, format->pad, format->stream); + if (!fmt) + return -EINVAL; + + *fmt =3D format->format; + + /* Propagate the format to the source pad. */ + fmt =3D v4l2_subdev_state_get_opposite_stream_format(state, format->pad, + format->stream); + if (!fmt) + return -EINVAL; =20 - /* Propagate the format to the source pads. */ - for (unsigned int i =3D RCAR_CSI2_SOURCE_VC0; i < num_pads; i++) - *v4l2_subdev_state_get_format(state, i) =3D format->format; + *fmt =3D format->format; =20 return 0; } @@ -1925,8 +1950,15 @@ static const struct v4l2_subdev_ops rcar_csi2_subdev= _ops =3D { static int rcsi2_init_state(struct v4l2_subdev *sd, struct v4l2_subdev_state *state) { - struct rcar_csi2 *priv =3D sd_to_csi2(sd); - unsigned int num_pads =3D rcsi2_num_pads(priv); + static struct v4l2_subdev_route routes[] =3D { + { + .sink_pad =3D RCAR_CSI2_SINK, + .sink_stream =3D 0, + .source_pad =3D RCAR_CSI2_SOURCE_VC0, + .source_stream =3D 0, + .flags =3D V4L2_SUBDEV_ROUTE_FL_ACTIVE, + }, + }; =20 static const struct v4l2_mbus_framefmt rcar_csi2_default_fmt =3D { .width =3D 1920, @@ -1939,10 +1971,13 @@ static int rcsi2_init_state(struct v4l2_subdev *sd, .xfer_func =3D V4L2_XFER_FUNC_DEFAULT, }; =20 - for (unsigned int i =3D RCAR_CSI2_SINK; i < num_pads; i++) - *v4l2_subdev_state_get_format(state, i) =3D rcar_csi2_default_fmt; + static const struct v4l2_subdev_krouting routing =3D { + .num_routes =3D ARRAY_SIZE(routes), + .routes =3D routes, + }; =20 - return 0; + return v4l2_subdev_set_routing_with_fmt(sd, state, &routing, + &rcar_csi2_default_fmt); } =20 static const struct v4l2_subdev_internal_ops rcar_csi2_internal_ops =3D { @@ -2629,7 +2664,8 @@ static int rcsi2_probe(struct platform_device *pdev) v4l2_set_subdevdata(&priv->subdev, &pdev->dev); snprintf(priv->subdev.name, sizeof(priv->subdev.name), "%s %s", KBUILD_MODNAME, dev_name(&pdev->dev)); - priv->subdev.flags =3D V4L2_SUBDEV_FL_HAS_DEVNODE; + priv->subdev.flags =3D V4L2_SUBDEV_FL_HAS_DEVNODE | + V4L2_SUBDEV_FL_STREAMS; =20 priv->subdev.entity.function =3D MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER; priv->subdev.entity.ops =3D &rcar_csi2_entity_ops; --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 EA8E83F54BB; Wed, 17 Jun 2026 11:56:13 +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=1781697375; cv=none; b=VwrMSWxiT/lxOhMkBd/D9ueyB/36UJJcAxfAHUqIOc5Es/F3qQqPSLKcWKf59cZAdc2+AxDhLLTB3tauKYrjkNdJUytFOyJ7auX00zCjP7IS23r3GSBEzDfdVzJn6U1q7ccGO6KEWRXO8KUvm5XOUhSzhWoH3VV2Ia4m4g1qzGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697375; c=relaxed/simple; bh=sBcIT51/DlVUNmZuKuMsMHbk8CgiKIupbYEj/l/JidE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VGylu2lgJbvER4K68JjCzn9FgwS0YqqKdoB/CfPgGQ3TkzdWiqL10bD9RGZ7mfUb6v8JzIGpQeeYKZoiEMjD/mmGqfDmDdlSJwUrF7LrywsAi+gs7txr308HmHD5cLXbnoLa7+HAOoytBogVQMZWEup2kH+I2He79cVfnFgBkFg= 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=P5tMezFN; 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="P5tMezFN" 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 2043A1943; Wed, 17 Jun 2026 13:55:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697322; bh=sBcIT51/DlVUNmZuKuMsMHbk8CgiKIupbYEj/l/JidE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P5tMezFNHcNtaQBNDGDVXl3MnIMU6FcD2B6Bt2DpbU0BwcXcuX5mo0Ev1RvRVOZib IEik4RkP+JJ8PeD5MERbq5GJsyfx0wowWca4fKYJApVs3KfKAh0uEiuFQHNJLLND8M qLsJ+MOK0vNJAeDgMKEs8bkzkA9CKtDG22AVwktE= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:54:59 +0300 Subject: [PATCH v6 06/11] media: rcar-isp: Switch to Streams API 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: <20260617-rcar-streams-v6-6-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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 , Laurent Pinchart X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4488; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=sBcIT51/DlVUNmZuKuMsMHbk8CgiKIupbYEj/l/JidE=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotFeDgCFrWxExnZ32495fKq/KtgLERgLKLa8 htXWsuGQ5CJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRQAKCRD6PaqMvJYe 9ZQyD/9y39uGabRPeXK6iYHFIpYgkbHmMWNqpEMW4utQWsYnzXVh3J5P1rnFRcUuOy6B1UVWc/n ZAWiRX9AXKLAPRZu0k/mKwL6uL1N/Ty0WD2r3DztScGKshL3+uM/SAh80c61n7+gHzYS3mybSFu xLeRr174ZTzWjjqhHx7V9QwlxR/I6r9Noa926WCHTQJl4PfcMvdZBYtxXQzNgBt5SyVBdHPJ0iC EgtoASJrS/hR34wtzyjMG9RheHP1odj+kJPKayntWTX6milC1624/MUALBXdlIMLRwhJtT0dYj+ FJKtixwoL5w8nax8l2Lav2c7rmheNg4YSUZ4VrjM22Hwbsq0CFlUN2sWNNGp17GA/OB1wT0yU7F 4kfJ1Von0NNxYkw1DSjdCzOXnEVYZgsPS5Knx70Ze2EfGDGlJhQBHnbrHTS8MxxyVCgYZkeTZCu HM9MEdeWXIvIW829eyqQAInDisGGO/TEhT1clYByriHHtNKwAtE9PjvshTrEBivpRyisgvJwyET 5TPwknF91Upn6RV+ayAnpjU+jD38b738wqOcFY+cdfAiyfFSKTA6NLc7GcyokHbDzR2ocvQkrkK lpK+e4ccbjOSCQn8ocQNNprEHoUilKV04gYs3lkq6UAyMAZ2WjA/MZ/J3q4qs32Q235v7qQaS+R shCcvCCX8WHPLug== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 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 Signed-off-by: Tomi Valkeinen --- 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/medi= a/platform/renesas/rcar-isp/csisp.c index 58a9a3bd9f75..8ac45516aa39 100644 --- a/drivers/media/platform/renesas/rcar-isp/csisp.c +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c @@ -124,6 +124,17 @@ static const struct rcar_isp_format rcar_isp_formats[]= =3D { }, }; =20 +static const struct v4l2_mbus_framefmt risp_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_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) =20 static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *stat= e) { + const struct v4l2_subdev_route *route; const struct v4l2_mbus_framefmt *fmt; const struct rcar_isp_format *format; unsigned int vc; u32 sel_csi =3D 0; int ret; =20 - fmt =3D v4l2_subdev_state_get_format(state, RCAR_ISP_SINK); + if (state->routing.num_routes !=3D 1) + return -EINVAL; + + route =3D &state->routing.routes[0]; + + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); if (!fmt) return -EINVAL; =20 @@ -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; =20 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 =3D rcar_isp_formats[0].code; =20 - for (unsigned int i =3D 0; i < RCAR_ISP_NUM_PADS; i++) { - framefmt =3D v4l2_subdev_state_get_format(state, i); - *framefmt =3D format->format; - } + /* Set sink format. */ + fmt =3D v4l2_subdev_state_get_format(state, format->pad, format->stream); + if (!fmt) + return -EINVAL; + + *fmt =3D format->format; + + /* Propagate the format to the source pad. */ + fmt =3D v4l2_subdev_state_get_opposite_stream_format(state, format->pad, + format->stream); + if (!fmt) + return -EINVAL; + + *fmt =3D format->format; =20 return 0; } @@ -369,6 +397,32 @@ static const struct v4l2_subdev_ops rcar_isp_subdev_op= s =3D { .pad =3D &risp_pad_ops, }; =20 +static int risp_init_state(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state) +{ + static struct v4l2_subdev_route routes[] =3D { + { + .sink_pad =3D RCAR_ISP_SINK, + .sink_stream =3D 0, + .source_pad =3D RCAR_ISP_PORT0, + .source_stream =3D 0, + .flags =3D V4L2_SUBDEV_ROUTE_FL_ACTIVE, + }, + }; + + static const struct v4l2_subdev_krouting routing =3D { + .num_routes =3D ARRAY_SIZE(routes), + .routes =3D routes, + }; + + return v4l2_subdev_set_routing_with_fmt(sd, state, &routing, + &risp_default_fmt); +} + +static const struct v4l2_subdev_internal_ops risp_internal_ops =3D { + .init_state =3D risp_init_state, +}; + /* -----------------------------------------------------------------------= ------ * Async handling and registration of subdevices and links */ @@ -526,11 +580,12 @@ static int risp_probe(struct platform_device *pdev) =20 isp->subdev.owner =3D THIS_MODULE; isp->subdev.dev =3D &pdev->dev; + isp->subdev.internal_ops =3D &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 =3D V4L2_SUBDEV_FL_HAS_DEVNODE; + isp->subdev.flags =3D V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_STREAMS; =20 isp->subdev.entity.function =3D MEDIA_ENT_F_VID_MUX; isp->subdev.entity.ops =3D &risp_entity_ops; --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 4A77F3F8892; Wed, 17 Jun 2026 11:56:14 +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=1781697375; cv=none; b=liBHLtZfhYSyduXw5NqHBnV6gi/4zUgbJEeHJMvHkKLKb0TgQneMiwFZYZLLI30K5uRJOPbktuISE4FEjK4Og4R6hrjr5OvVAyGrLVvf52SABsBKzeiFBcQWIshPfjc2rZsPoaPuOFfC7QMg5TakPRUA+7bkBObkGDZBgRze8/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697375; c=relaxed/simple; bh=GK/EfESteMm/OAfHPWec46Cpj/NwHtTv+mYplktaWZE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KI0Xmo6vRyFJy9Nb0W+n5xFMUWDFNpr69oeWYoVRoRNJZN1u4nvAddfTjALeEpXEhSLPpj5sscP6s5RHsj5IThdC1tBoGoS3WUB7setevK1FS6qx4zx+wSa1+GR5OhruX8gi0b4IFw22ghYDC4UfButTKiLwohJGQFZmzk+eeOM= 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=W0kVghgV; 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="W0kVghgV" 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 E1C8D1E20; Wed, 17 Jun 2026 13:55:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697323; bh=GK/EfESteMm/OAfHPWec46Cpj/NwHtTv+mYplktaWZE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=W0kVghgV2MM9AEAzj9Z8f5OQjEqEc0Abqc5T+4kryJi5Q/gsiIGFy+db789EF4Qro fJ7WErBRFkr3uhUF0NxBfgMG/o0E+xZzJc5sYATBW65G38eEXJkN4KbA90UyWeAyev nlw6drfKDzGTZGlva7ZnzZ6OYi3633LlJdhlyFSQ= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:55:00 +0300 Subject: [PATCH v6 07/11] media: rcar-csi2: Add .get_frame_desc op 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: <20260617-rcar-streams-v6-7-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2889; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=GK/EfESteMm/OAfHPWec46Cpj/NwHtTv+mYplktaWZE=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotFigmik6+pW6+Lu6/sL+ZxyeXn52qjVt9+u G1FdAnD87SJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRQAKCRD6PaqMvJYe 9XFED/0ZxO2a3dexMW6mxqbfohBsMLlp/NBscMYn/vdzxoP7mvbDwd//HOoLWIW44R1g3k8K/3e U+ehOPuFZneHay7VD5mOXvXgv41nG0/6wYuYOEwPEarg3v+qwAmjNTQJOZ2zJnqYvm8/Sf4iWk2 toEyZfVlsaJX2bWNCLC1b+XCDPw9Y5h5TMIJFPSau7kUqPpBJPJluSxk4Xv+vYDHS++IJq3ttvx d01lVQgHFkVRQ8mb8K1ITPQqw8iKLD2o3WfEnTd3RN5S8ACup6iXHVf9qWijpeQqiMMbeT+FY1m oQH2OxR38uEZDP4buy/66tGye8TxnQNuMod9A1itIVDPNly0FmfoMu50ei/owxdFn+Mze3/c8/c qn8ZoUUvfNY8PpEJ0C7bFOltiINATfdPrhYdbT3z60HZL55oFVWa2VkUYRO6z0ChGBkJOayPols OvL4zwey2M0KC7S2yHYfr6zsCWngzuhYR4T3JowZ1WVv0UuPVtiJ/l/dEPmGhLdD/ns0l+KivZ/ kBxCNuvX6lqGiS5i59Xmcw+lyHohWYDi9Pyg2FOvkLY2AhIhS4jOEDr/fPVdYnf6XxVs5s1Jnzw VxGKscyQ7mc8aOGxonvXghtAa9UsPeei6/VH/9jmzwJjFX+4TjDKRaRaDs0S4slqFPtdHTvF0uV OKwq7IKe4VoAHdw== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add v4l2_subdev_pad_ops.get_frame_desc() implementation. We also implement a fallback for the case where the upstream subdevice does not implement .get_frame_desc. It assumes a single stream with VC =3D 0 and DT based on the configured stream mbus format. Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 74 ++++++++++++++++++++++++++= ++++ 1 file changed, 74 insertions(+) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index 91f713e1f8c2..0d9e730fa677 100644 --- a/drivers/media/platform/renesas/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-csi2.c @@ -1935,12 +1935,86 @@ static int rcsi2_set_pad_format(struct v4l2_subdev = *sd, return 0; } =20 +static int rcsi2_get_frame_desc_fallback(struct v4l2_subdev *sd, + unsigned int pad, + struct v4l2_mbus_frame_desc *fd) +{ + struct v4l2_subdev_route *route; + const struct rcar_csi2_format *format; + struct v4l2_subdev_state *state; + struct v4l2_mbus_framefmt *fmt; + int ret =3D 0; + + state =3D v4l2_subdev_lock_and_get_active_state(sd); + + if (state->routing.num_routes !=3D 1) { + ret =3D -EINVAL; + goto out; + } + + route =3D &state->routing.routes[0]; + + if (route->source_pad !=3D pad) { + ret =3D -EINVAL; + goto out; + } + + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); + if (!fmt) { + ret =3D -EINVAL; + goto out; + } + + format =3D rcsi2_code_to_fmt(fmt->code); + if (!format) { + ret =3D -EINVAL; + goto out; + } + + fd->num_entries =3D 1; + fd->type =3D V4L2_MBUS_FRAME_DESC_TYPE_CSI2; + fd->entry[0].stream =3D route->source_stream; + fd->entry[0].pixelcode =3D fmt->code; + fd->entry[0].bus.csi2.vc =3D 0; + fd->entry[0].bus.csi2.dt =3D format->datatype; + +out: + v4l2_subdev_unlock_state(state); + + return ret; +} + +static int rcsi2_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, + struct v4l2_mbus_frame_desc *fd) +{ + struct rcar_csi2 *priv =3D sd_to_csi2(sd); + int ret; + + /* + * This should only get called on gen4, with ISP, so yell here + * if that is not the case to highlight a driver bug. + */ + if (WARN_ON(!priv->info->use_isp)) + return -ENOTTY; + + if (WARN_ON(pad !=3D RCAR_CSI2_SOURCE_VC0)) + return -EINVAL; + + ret =3D v4l2_subdev_get_frame_desc_passthrough(sd, pad, fd); + if (ret =3D=3D -ENOIOCTLCMD) + ret =3D rcsi2_get_frame_desc_fallback(sd, pad, fd); + return ret; +} + static const struct v4l2_subdev_pad_ops rcar_csi2_pad_ops =3D { .enable_streams =3D rcsi2_enable_streams, .disable_streams =3D rcsi2_disable_streams, =20 .set_fmt =3D rcsi2_set_pad_format, .get_fmt =3D v4l2_subdev_get_fmt, + + .get_frame_desc =3D rcsi2_get_frame_desc, }; =20 static const struct v4l2_subdev_ops rcar_csi2_subdev_ops =3D { --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 AF30B3FB052; Wed, 17 Jun 2026 11:56:16 +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=1781697378; cv=none; b=GF0VpghTD3gkk3KLSZkP1zVqne7vdibM7I0hZ3sRHDH4B0vQ+ldlWTnaCv+ptmjpCJEWpzSRbRgHuLSoAKyCQaduh4T/hQbgZhQOB/cX/j76yaJeXcvkwGq4WKKDeUiUVVjpEfzdtx7y66pnw3MwVpeMStP/981eodovGPZO8fE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697378; c=relaxed/simple; bh=pCxr7r38pjLHfIyuHDmhrSY7G5s+T+0pT8occa86F7s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tLMGNzqavRoh2tVW5OBK+FqgiSH7kSe/5WRr+Q444oP5urheoWnElNvGZn/ll+jVTL53pFMmUsSEtkEGTyiBMs5uvuxAuC2z7iauHlDyUVoo/hCDf47dpe/syrED3pcmU/Z2Y3GoDZKZaKAQkY0ha+9RMpsYbEVin/vV56szAOU= 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=X14kp94L; 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="X14kp94L" 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 A10341E76; Wed, 17 Jun 2026 13:55:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697324; bh=pCxr7r38pjLHfIyuHDmhrSY7G5s+T+0pT8occa86F7s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=X14kp94LWBjRCb/a52Ol1InrISicA93rQEZAsbepnwiSNJw9eywXTTT4LsGwqe82Q HBIs0/0aTCDUeJh7LyGoQLxVCtEe95FcmA8tOs6+k2tHNIHoHdI/G+pXJDLJEn/+qh wfWHwmfxIqpCAy6i6me3YRdUdZSCaXxTsja1I2Ig= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:55:01 +0300 Subject: [PATCH v6 08/11] media: rcar-isp: Call get_frame_desc to find out VC & DT 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: <20260617-rcar-streams-v6-8-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4966; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=pCxr7r38pjLHfIyuHDmhrSY7G5s+T+0pT8occa86F7s=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotFF+PQLf5VSgd/e4Enp7gWgxmixYus5bx1A nVfHSZ+SbuJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRQAKCRD6PaqMvJYe 9Zw5D/4zKKJCIzSYKYZBgYPrbzxauKd9yuNZ4AW3LeT7zvvz3dFuXtyh9B6p52cqTXGAkUW09YG FMbJZ7uA4d0DT8HNB85EkXLMNumOegp/zNG4E2MhOGZT7MMfAuDC3iTK1CkI/BdUPMb4m4QNq85 6setKkygCN786nGkQGe2REjoefGnxmnx+n59WYxYEVodwllD4RwePfAdY8b+7JCchXLbqiNnfsA UshptYclUOeHBfaJNXgknZywzlQd3ak6N8ZyR79VxWfuikxm1NgXK5646A+i6Nci6fmIY7TShIX 1jigxhraGuXmBg+os8QmD6qirA1gX98w5fNoI0jTa4+sb6lVm4NoCRRDfilqHXwxjqdVWlYk9uo kKwkrLo//CADETLRHdxsPCYNlNrvIrpGwxi885SxSaBC0sb0N5YeJ3XM0w5H8mVi6f8PA9RYcsl /t22BkBnC1nhLfUXE5xvChwBVo/vbMvBFFn3FPpm8tSlwutn0bdTdfMtOE2fuxJq4+EqSbtOyhz fLN3m4MG0Mrg1mdc3pM1F4xoQN44uNaeEwEz2WFEaPf3JTNCYXhRVIXKxEgW1K1Q6/7By0DFBZk wrlSGtrqAyHhT3Xf5J1SSgmmT79gn48HZqknruOK5i2kHdiaHY4DdkEDvcOnPU5/F6flizZnq4s npvWWs6yVheRyEw== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Call get_frame_desc to find out VC & DT, instead of hardcoding the VC routing and deducing the DT based on the mbus format. Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-isp/csisp.c | 110 ++++++++++++++++----= ---- 1 file changed, 74 insertions(+), 36 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/medi= a/platform/renesas/rcar-isp/csisp.c index 8ac45516aa39..42ee6c19801a 100644 --- a/drivers/media/platform/renesas/rcar-isp/csisp.c +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c @@ -42,6 +42,9 @@ #define ISPCS_DT_CODE03_EN0 BIT(7) #define ISPCS_DT_CODE03_DT0(dt) ((dt) & 0x3f) =20 +/* ISP has 12 channels, of which channels 4 to 11 are connected to VINs */ +#define ISPCS_NUM_CHANNELS 12 + struct rcar_isp_format { u32 code; unsigned int datatype; @@ -225,31 +228,82 @@ static void risp_power_off(struct rcar_isp *isp) pm_runtime_put(isp->dev); } =20 -static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *stat= e) +static int risp_configure_routing(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 =3D 0; + struct v4l2_mbus_frame_desc source_fd; + struct v4l2_subdev_route *route; int ret; =20 - if (state->routing.num_routes !=3D 1) - return -EINVAL; + ret =3D v4l2_subdev_call(isp->remote, pad, get_frame_desc, + isp->remote_pad, &source_fd); + if (ret) + return ret; =20 - route =3D &state->routing.routes[0]; + /* Clear the channel registers */ + for (unsigned int ch =3D 0; ch < ISPCS_NUM_CHANNELS; ++ch) { + risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), 0); + risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch), 0); + } =20 - fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, - route->sink_stream); - if (!fmt) - return -EINVAL; + for_each_active_route(&state->routing, route) { + struct v4l2_mbus_frame_desc_entry *source_entry =3D NULL; + const struct rcar_isp_format *format; + const struct v4l2_mbus_framefmt *fmt; + unsigned int i; + u8 vc, dt, ch; + u32 v; + + for (i =3D 0; i < source_fd.num_entries; i++) { + if (source_fd.entry[i].stream =3D=3D route->sink_stream) { + source_entry =3D &source_fd.entry[i]; + break; + } + } + + if (!source_entry) { + dev_err(isp->dev, + "Failed to find source frame desc entry for stream\n"); + return -EPIPE; + } + + vc =3D source_entry->bus.csi2.vc; + dt =3D source_entry->bus.csi2.dt; + /* Channels 4 - 11 go to VIN */ + ch =3D route->source_pad - 1 + 4; + + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); + if (!fmt) + return -EINVAL; + + format =3D risp_code_to_fmt(fmt->code); + if (!format) { + dev_err(isp->dev, "Unsupported bus format\n"); + return -EINVAL; + } + + /* VC Filtering */ + risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), BIT(vc)); =20 - format =3D risp_code_to_fmt(fmt->code); - if (!format) { - dev_err(isp->dev, "Unsupported bus format\n"); - return -EINVAL; + /* DT Filtering */ + risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch), + ISPCS_DT_CODE03_EN0 | ISPCS_DT_CODE03_DT0(dt)); + + /* Proc mode */ + v =3D risp_read_cs(isp, ISPPROCMODE_DT_REG(dt)); + v |=3D ISPPROCMODE_DT_PROC_MODE_VCn(vc, format->procmode); + risp_write_cs(isp, ISPPROCMODE_DT_REG(dt), v); } =20 + return 0; +} + +static int risp_start(struct rcar_isp *isp, struct v4l2_subdev_state *stat= e) +{ + u32 sel_csi =3D 0; + int ret; + ret =3D risp_power_on(isp); if (ret) { dev_err(isp->dev, "Failed to power on ISP\n"); @@ -263,25 +317,9 @@ static int risp_start(struct rcar_isp *isp, struct v4l= 2_subdev_state *state) risp_write_cs(isp, ISPINPUTSEL0_REG, risp_read_cs(isp, ISPINPUTSEL0_REG) | sel_csi); =20 - /* Configure Channel Selector. */ - for (vc =3D 0; vc < 4; vc++) { - u8 ch =3D vc + 4; - u8 dt =3D format->datatype; - - risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), BIT(vc)); - risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch), - ISPCS_DT_CODE03_EN3 | ISPCS_DT_CODE03_DT3(dt) | - ISPCS_DT_CODE03_EN2 | ISPCS_DT_CODE03_DT2(dt) | - ISPCS_DT_CODE03_EN1 | ISPCS_DT_CODE03_DT1(dt) | - ISPCS_DT_CODE03_EN0 | ISPCS_DT_CODE03_DT0(dt)); - } - - /* Setup processing method. */ - risp_write_cs(isp, ISPPROCMODE_DT_REG(format->datatype), - ISPPROCMODE_DT_PROC_MODE_VCn(3, format->procmode) | - ISPPROCMODE_DT_PROC_MODE_VCn(2, format->procmode) | - ISPPROCMODE_DT_PROC_MODE_VCn(1, format->procmode) | - ISPPROCMODE_DT_PROC_MODE_VCn(0, format->procmode)); + ret =3D risp_configure_routing(isp, state); + if (ret) + return ret; =20 /* Start ISP. */ risp_write_cs(isp, ISPSTART_REG, ISPSTART_START); --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 1E5DD3FB07E; Wed, 17 Jun 2026 11:56:16 +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=1781697378; cv=none; b=lCgjNJaYPUUwdjSJDTs3piYzpDaoSTsqgSeQNxHO/SVRxw8z2zSxwug8j0PiCR+wkL0p4PxjCLu1hns0HmzpF6YN4wv0ZGcChCiVQ8rPM5t4jza1j7rKgjmrc+m+bTwcAPzv3uDYluy5RtrEN+2k9SyTMpsjpmUVS7foBRrJ4o4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697378; c=relaxed/simple; bh=asXI7wVuxtiTJOk362LtdU6/Okyu7xXtTfE9UwJ5R54=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FKZ9eSvElpZ7/OBfsw+DifLpqlzjU7el6Tbv4NCTS91TZE2BX8C3764Qz6GhfCoK7VTarbFHVjkUcq5d9NzIMqtwhwUP70t9MZXZgnsF9bf5wilh70u1kqYVHhSnlIEAU99Kh3fYf7eWfgpdYTNTgLqGwDMI9x3psnw0sL8ZjUk= 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=K/kZJCpR; 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="K/kZJCpR" 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 63470243E; Wed, 17 Jun 2026 13:55:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697324; bh=asXI7wVuxtiTJOk362LtdU6/Okyu7xXtTfE9UwJ5R54=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=K/kZJCpR3t/CP3h1Spazot+tfm7GLgoaq19ZO3jssdu4L0gbqjq9sU/r5j86euFOk 8ZjTwvmMnR5FrEjRbEHUwWsJrR1ksR11d0fB3qur9QJo6Kn3I+t0TQAnMmzBhP8MLC WsWOvD7wVdGOrzNB6zEt/s3RJX2H364IO11SmbGY= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:55:02 +0300 Subject: [PATCH v6 09/11] media: rcar-csi2: Call get_frame_desc to find out VC & DT (Gen3) 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: <20260617-rcar-streams-v6-9-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4903; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=asXI7wVuxtiTJOk362LtdU6/Okyu7xXtTfE9UwJ5R54=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotG/uAJOnq9xVUn75QaoY5hpDaMy40QzbOX/ lqUsWlwcgaJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRgAKCRD6PaqMvJYe 9cl/D/9hp6KogZG4NTuWerDuIsBkUxB+CI3Vqcv2IqeBRzXwIKl1jixe8Pn3mr0SfIdCCyI2pQI oWthZF1nDLxBurNB3yF381dB6+ywYqNmrSfgF+BX5Aak/8zSPEmAPh6Lr06ztWhN1McxqMeWqow lnLpW7Dzq093IbxZk6Hs6PnrAiDdnlys85ConYsKPzY0o9hwXIx21ISbJh8Ljro7MK3vmssFy88 1l8bDY6AuzUclCDP4I6N29v+p/ck7T19BmjfSsOP3FOIGvqb+OdBNuw8QuxpbEPkaR/XCSl3B76 mRsmycTsmjCTUT76jjcFUUXLzHpNcY9BRdtcE2zcXSdfhbG2gmewKJAYa0sKYypY1xGof5aI5Z/ li7p4kbPXfCMYnpl5zvJN0rCbmgbriLz7jBM4u8LjrxnRDlEPRpV2pzH2as9YyqIYheUHJHxnsK l57DuFj5KUizAQRnTaes3/4huD8cuOhNoHdFxuHqOW7E04oUlmraP5p4kEV7sDBldxLrjZ4QlBY qbhagmJCGWJLyTNKg6aSvoTAQO4ajVczVX3WnkL78dAn78b5gx/piljyOEm7T3VV0p2KDt8V2JL FDxSWK3DajWKqWclRyRsR5In2vaeP+J9Uc/WB4nz9j5M9PYbrIz4FpUdBgtgTB8YHIwnjJhKzRm fOaZWWCcQzpf/SA== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Call get_frame_desc to find out VC & DT, for Gen3 platforms, instead of hardcoding the VC routing and deducing the DT based on the mbus format. If the source subdevice doesn't implement .get_frame_desc, we use a fallback case where we assume there's a single stream with VC =3D 0 and DT based on the mbus format. Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 111 ++++++++++++++++++-------= ---- 1 file changed, 71 insertions(+), 40 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index 0d9e730fa677..8cd38b4cbc7f 100644 --- a/drivers/media/platform/renesas/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-csi2.c @@ -1069,62 +1069,93 @@ static int rcsi2_calc_mbps(struct rcar_csi2 *priv, static int rcsi2_start_receiver_gen3(struct rcar_csi2 *priv, struct v4l2_subdev_state *state) { - const struct v4l2_subdev_route *route; - const struct rcar_csi2_format *format; - u32 phycnt, vcdt =3D 0, vcdt2 =3D 0, fld =3D 0; - const struct v4l2_mbus_framefmt *fmt; + u32 phycnt, vcdt =3D 0, vcdt2 =3D 0; + u32 fld =3D FLD_DET_SEL(1); + struct v4l2_mbus_frame_desc source_fd; + struct v4l2_subdev_route *route; unsigned int lanes; - unsigned int i; int mbps, ret; + u8 ch =3D 0; =20 - /* Use the format on the sink pad to compute the receiver config. */ + ret =3D v4l2_subdev_call(priv->remote, pad, get_frame_desc, + priv->remote_pad, &source_fd); + if (ret && ret !=3D -ENOIOCTLCMD) + return ret; =20 - if (state->routing.num_routes !=3D 1) - return -EINVAL; + if (ret =3D=3D -ENOIOCTLCMD) { + /* Create a fallback source_fd */ + struct v4l2_mbus_frame_desc *fd =3D &source_fd; + const struct v4l2_subdev_route *route; + const struct rcar_csi2_format *format; + struct v4l2_mbus_framefmt *fmt; =20 - route =3D &state->routing.routes[0]; + if (state->routing.num_routes !=3D 1) + return -EINVAL; =20 - fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, - route->sink_stream); - if (!fmt) - return -EINVAL; + route =3D &state->routing.routes[0]; =20 - dev_dbg(priv->dev, "Input size (%ux%u%c)\n", - fmt->width, fmt->height, - fmt->field =3D=3D V4L2_FIELD_NONE ? 'p' : 'i'); + fmt =3D v4l2_subdev_state_get_format(state, route->sink_pad, + route->sink_stream); + if (!fmt) + return -EINVAL; =20 - /* Code is validated in set_fmt. */ - format =3D rcsi2_code_to_fmt(fmt->code); - if (!format) - return -EINVAL; + format =3D rcsi2_code_to_fmt(fmt->code); + if (!format) + return -EINVAL; =20 - /* - * Enable all supported CSI-2 channels with virtual channel and - * data type matching. - * - * NOTE: It's not possible to get individual datatype for each - * source virtual channel. Once this is possible in V4L2 - * it should be used here. - */ - for (i =3D 0; i < priv->info->num_channels; i++) { + memset(fd, 0, sizeof(*fd)); + + fd->num_entries =3D 1; + fd->type =3D V4L2_MBUS_FRAME_DESC_TYPE_CSI2; + fd->entry[0].stream =3D 0; + fd->entry[0].pixelcode =3D fmt->code; + fd->entry[0].bus.csi2.vc =3D 0; + fd->entry[0].bus.csi2.dt =3D format->datatype; + } + + for_each_active_route(&state->routing, route) { + const struct v4l2_mbus_frame_desc_entry *source_entry =3D NULL; + const struct v4l2_mbus_framefmt *fmt; + unsigned int i; u32 vcdt_part; =20 - if (priv->channel_vc[i] < 0) - continue; + for (i =3D 0; i < source_fd.num_entries; i++) { + if (source_fd.entry[i].stream =3D=3D route->sink_stream) { + source_entry =3D &source_fd.entry[i]; + break; + } + } =20 - vcdt_part =3D VCDT_SEL_VC(priv->channel_vc[i]) | VCDT_VCDTN_EN | - VCDT_SEL_DTN_ON | VCDT_SEL_DT(format->datatype); + if (!source_entry) { + dev_err(priv->dev, + "Failed to find stream from source frame desc\n"); + return -EPIPE; + } + + vcdt_part =3D VCDT_SEL_VC(source_entry->bus.csi2.vc) | + VCDT_VCDTN_EN | VCDT_SEL_DTN_ON | + VCDT_SEL_DT(source_entry->bus.csi2.dt); =20 /* Store in correct reg and offset. */ - if (i < 2) - vcdt |=3D vcdt_part << ((i % 2) * 16); + if (ch < 2) + vcdt |=3D vcdt_part << ((ch % 2) * 16); else - vcdt2 |=3D vcdt_part << ((i % 2) * 16); - } + vcdt2 |=3D vcdt_part << ((ch % 2) * 16); + + fmt =3D v4l2_subdev_state_get_format(state, RCAR_CSI2_SINK, + route->sink_stream); + if (!fmt) + return -EINVAL; + + dev_dbg(priv->dev, "Input size (%ux%u%c)\n", + fmt->width, fmt->height, + fmt->field =3D=3D V4L2_FIELD_NONE ? 'p' : 'i'); =20 - if (fmt->field =3D=3D V4L2_FIELD_ALTERNATE) - fld =3D FLD_DET_SEL(1) | FLD_FLD_EN(3) | FLD_FLD_EN(2) | - FLD_FLD_EN(1) | FLD_FLD_EN(0); + if (fmt->field =3D=3D V4L2_FIELD_ALTERNATE) + fld |=3D FLD_FLD_EN(ch); + + ch++; + } =20 /* * Get the number of active data lanes inspecting the remote mbus --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 78B0D3F1ABA; Wed, 17 Jun 2026 11:56:19 +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=1781697380; cv=none; b=PaIvvrGH3+wVAdn8DUMkbd67CjL9jRjR4r+cCnBcx8rVu1KTiN5vx+nMDTKi84LiBLjNAkNhwc/q+J2Y82OAV22cG7SxjlnD2rOpAcdSyxFWEbwg8XZ8QcfCQC6VExI1ld8SIABLZLBL8VbHV9pefDK4VCpwgeg/Q+nDtkcwcyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697380; c=relaxed/simple; bh=S3avSRgMOsfZq/Te9AKc1SpCJwVfwV1BwRoIOQBoDcs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kwjBGAhgm3x4aYsv/aEWe9CmetsfSKnRbYWOSMDH5xq+UQU6C4R61kULka7nEyGSFYVd/7dlRyg/zPHJDpQ8zRqMBZ+HdoTAL1ZnDgLYTSivUxGKkBwF8XboMvCp4rIIpv0sMS3ktQl15ozvjDmS8bq801JloSrfsskv3hmwSTk= 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=Sv4rIjRU; 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="Sv4rIjRU" 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 20243259E; Wed, 17 Jun 2026 13:55:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697325; bh=S3avSRgMOsfZq/Te9AKc1SpCJwVfwV1BwRoIOQBoDcs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Sv4rIjRUFtCW02lIDE4KaV9768qUpjMWklHCZHonFyRUD0rpcRQv4ZZJ+2UEucpHL +PWej2nAWWsrjlg14UmtitUCmbFiO7shv++JRdfaM4FCBpfrGE0v+zZik8FS7ZUNRp MgVdRrOJPtSKj//mD59BFM9EOaYz6zzd9ugVwb6g= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:55:03 +0300 Subject: [PATCH v6 10/11] 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: <20260617-rcar-streams-v6-10-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6107; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=S3avSRgMOsfZq/Te9AKc1SpCJwVfwV1BwRoIOQBoDcs=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotGBmysIDAVSPZ2BgINGWeNYAOsQynFOm/eb Ks1SfgbHM6JAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRgAKCRD6PaqMvJYe 9bEwD/4ys6CtU0wWw9hNA4TvDhTYrxuUrQ0pCxofQ2OhX8cNFsLgVYy3/bz3cM5FqpPWcSplRfG q7KCVvw+qMbOKPUT/+7uz0EFPC2dUTPEChWY//hR/OtUsl0cBVHpS03cD9Zuo/09rTCwHAwaccC IOomli4luz38nH1wRkgkmIDcjUJcTkdw/mKaG+bg1hztaZhPZfocyHN7BVrVKkBtxhbkV4PrMZO J4DdPoQFLJ1qVNo0UFiObLt00qo5H6WPm3v8EKPc5o7cz7Me7mWUqLd8555CLKy6rwiNOQKADK5 8I7N+cw22QhD1K8b6voMsSUB+THjwirfZO7Ruq0vOlHbumMnn9ZSYo3kfEFHj9AGuy2p98sgvnN ghbitO1ZOSmmFblzyfyOz53TU7DrbmYXPFI0PFHizu0oNxRcnRiDDejgZaPR0/QwolrjG8I4A5y czL/0d/ZErusxdVPwESFf5gGZLjWgASgwlFfZ2fOWiKDUWf/M7Wrgh5NYfybj3r4cmeClI0yjJ1 zYC/A+c/qaFqLXYnmwfP3IudooS/08jACMoUPIWhpCMzPOAAsZ5sWih2gGuP59qRzeKJsWwFRW7 6rXUItG/Kc2E7rcv+NKfNBxeT02mN4QRTrw9z2b5Jo/A63GHQ4L7txHMBhxK12phtw/YVPxwx8o YmiBURGg4s0N34g== 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 - Track enabled sink streams so that in rcsi2_irq_thread() we can disable and enable all currently enabled streams Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-csi2.c | 95 ++++++++++++++++++++------= ---- 1 file changed, 64 insertions(+), 31 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/pla= tform/renesas/rcar-csi2.c index 8cd38b4cbc7f..34899e5409da 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; @@ -773,7 +784,7 @@ struct rcar_csi2 { =20 int channel_vc[4]; =20 - int stream_count; + u64 enabled_sink_streams_mask; =20 bool cphy; unsigned short lanes; @@ -1883,29 +1894,32 @@ 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; =20 - if (priv->stream_count =3D=3D 0) { + if (!priv->enabled_sink_streams_mask) { ret =3D rcsi2_start(priv, state); if (ret) return ret; } =20 + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + source_pad, + 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) + if (!priv->enabled_sink_streams_mask) rcsi2_stop(priv); return ret; } =20 - priv->stream_count +=3D 1; + priv->enabled_sink_streams_mask |=3D sink_streams; =20 return ret; } @@ -1915,23 +1929,26 @@ 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) + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + source_pad, + RCAR_CSI2_SINK, + &source_streams_mask); + + if (priv->enabled_sink_streams_mask =3D=3D sink_streams) rcsi2_stop(priv); =20 ret =3D v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); + sink_streams); if (ret) return ret; =20 - priv->stream_count -=3D 1; + priv->enabled_sink_streams_mask &=3D ~sink_streams; =20 return 0; } @@ -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) @@ -2045,6 +2090,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 @@ -2065,17 +2111,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, @@ -2120,13 +2155,13 @@ static irqreturn_t rcsi2_irq_thread(int irq, void *= data) =20 state =3D v4l2_subdev_lock_and_get_active_state(&priv->subdev); =20 - if (priv->stream_count =3D=3D 0) + if (!priv->enabled_sink_streams_mask) goto out; =20 rcsi2_stop(priv); =20 ret =3D v4l2_subdev_disable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); + priv->enabled_sink_streams_mask); if (ret) { dev_warn(priv->dev, "Error recovery: failed to disable streams: %d\n", @@ -2145,7 +2180,7 @@ static irqreturn_t rcsi2_irq_thread(int irq, void *da= ta) } =20 ret =3D v4l2_subdev_enable_streams(priv->remote, priv->remote_pad, - BIT_ULL(0)); + priv->enabled_sink_streams_mask); if (ret) { dev_warn(priv->dev, "Error recovery: failed to start streams: %d\n", @@ -2748,8 +2783,6 @@ static int rcsi2_probe(struct platform_device *pdev) =20 priv->dev =3D &pdev->dev; =20 - priv->stream_count =3D 0; - ret =3D rcsi2_probe_resources(priv, pdev); if (ret) { dev_err(priv->dev, "Failed to get resources\n"); --=20 2.43.0 From nobody Thu Jun 25 03:08:15 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 D2B663FF883; Wed, 17 Jun 2026 11:56:19 +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=1781697381; cv=none; b=PoLUsDiVkU6YcczSu4S8uZVrUXRyl0h5Rcb2xhpaB9CuwFErQz17q5NFTOsOjYP2vcLS0UaVtUAXuK4rpnEu7JYfI0yKQ0X3VU6A7020mh/XVRCTQBe+IUxieeW/rddcpASAIRPACbDlFW/vQMwPIee47Uf5vnP8shuxzIrUycg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781697381; c=relaxed/simple; bh=A33cXROl2PmqCjHKhGe6Ldp6ByCHXa6W1XIzFF8djBk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qK17LbmgFeowqa4Nm3YwPGc0+tflodnQ19f3OVKacBOdx2v3ZgAtM5RBnUdQeAcmi7aVljImTZZIpJpAoUq9VxlurgF40rDZ1EAU2i/CtNVX+nCnS/5v5WWSb77fbZcKfie69X47zX9Ipsm/22kpEMe9ET6sx++CmcndsWmannk= 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=atFqgjOg; 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="atFqgjOg" 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 D6A2625A0; Wed, 17 Jun 2026 13:55:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781697326; bh=A33cXROl2PmqCjHKhGe6Ldp6ByCHXa6W1XIzFF8djBk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=atFqgjOg1cPb12n0ZWi6+mb8LsmnJ5QW/25BR415kE1lgKoLpDapsdt7UvywoCzRV NZYLLLJBLZ707arxph6OLo9zkRK0Mpbke68ps4iN3hgZ+dOo3xsSaO6Wm+QV7TMxdu TssN3cmEcj6oGwVjAiySdNuoHDIS608DnUd+5ykE= From: Tomi Valkeinen Date: Wed, 17 Jun 2026 14:55:04 +0300 Subject: [PATCH v6 11/11] media: rcar-isp: 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: <20260617-rcar-streams-v6-11-1260eb72dff7@ideasonboard.com> References: <20260617-rcar-streams-v6-0-1260eb72dff7@ideasonboard.com> In-Reply-To: <20260617-rcar-streams-v6-0-1260eb72dff7@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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3025; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=A33cXROl2PmqCjHKhGe6Ldp6ByCHXa6W1XIzFF8djBk=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBqMotGwPgTi1MX2Gaol+CHZoi+EUrEdZQCIJluF 40JH0UPBKqJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCajKLRgAKCRD6PaqMvJYe 9ZCRD/91kPP0ugwUUU7bMY7myhBxZXJZhbW2Ci5udzjaNnX8TT8jYSn7wPt4ks+IVVvvymCfZAu 6zm6T4U6LLJ1qGyLSKl4jo7+ZBCi+xdRf8JUvQd/a3h31MrsfXvHPISpmUlIKwVJQxP0/hO+Uzj R/QYfefjfbt8ZKojzYlomOEX7XDC0/NZyvyBHbTwk0bKuCCs9vcf166dwPSRRjX9ST58faH0NMO DixyanCm3f/AUMSlxRlSQJcNe6SLqsq7GWhJUN6XN+SyNWCb3A7XsJPiq2Ujo2UZepGvJDa0WWP wgwr1ygwJBHhyb9QZa4y9iJhSOUXSEK3gRuXLpeoKX4fWGXKH9W0JvMvieAEirZWrNA8cHv1dQj zoDkMXe3xfCHCVw0WoVc00/2mkTEByQ2eXMw3pchSCEu7eTannFWTu/gqbQJUwP0pPjB3PnuOPD ANCR2sv6OlpWtwhR5JL9RmFtH/NyAti3TD4BgdtjcpmmcTtyKlOGhvQ91w+O7R8tlsfwni3Iuuv V47uK/aDdWLo2KZRqhv+kz7SYJz08c8QwAW340Te+583+DbicW22zeTTzvldNCFWPC+3ptDk3bK gLImOrfWFUXNWEQRqG0zE/Bye1yij2uJyg3s+oWzoiPtGByQFrJuHVacCepIdRRfEhE0ZMr2Gpu dDV+oSaLDrlg7rw== 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-isp/csisp.c | 39 +++++++++++++++++++++= ++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/medi= a/platform/renesas/rcar-isp/csisp.c index 42ee6c19801a..2e1bc8fbd432 100644 --- a/drivers/media/platform/renesas/rcar-isp/csisp.c +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c @@ -340,6 +340,7 @@ static int risp_enable_streams(struct v4l2_subdev *sd, u64 source_streams_mask) { struct rcar_isp *isp =3D sd_to_isp(sd); + u64 sink_streams; int ret; =20 if (source_streams_mask !=3D 1) @@ -354,8 +355,13 @@ static int risp_enable_streams(struct v4l2_subdev *sd, return ret; } =20 + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + source_pad, + RCAR_ISP_SINK, + &source_streams_mask); + ret =3D v4l2_subdev_enable_streams(isp->remote, isp->remote_pad, - BIT_ULL(0)); + sink_streams); if (ret) { if (isp->stream_count =3D=3D 0) risp_stop(isp); @@ -372,6 +378,7 @@ static int risp_disable_streams(struct v4l2_subdev *sd, u64 source_streams_mask) { struct rcar_isp *isp =3D sd_to_isp(sd); + u64 sink_streams; int ret; =20 if (source_streams_mask !=3D 1) @@ -380,8 +387,12 @@ static int risp_disable_streams(struct v4l2_subdev *sd, if (!isp->remote) return -ENODEV; =20 - ret =3D v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, - BIT_ULL(0)); + sink_streams =3D v4l2_subdev_state_xlate_streams(state, + source_pad, + RCAR_ISP_SINK, + &source_streams_mask); + + ret =3D v4l2_subdev_disable_streams(isp->remote, isp->remote_pad, sink_st= reams); if (ret) return ret; =20 @@ -423,12 +434,34 @@ static int risp_set_pad_format(struct v4l2_subdev *sd, return 0; } =20 +static int risp_set_routing(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + enum v4l2_subdev_format_whence which, + struct v4l2_subdev_krouting *routing) +{ + int ret; + + 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, + &risp_default_fmt); + if (ret) + return ret; + + return 0; +} + static const struct v4l2_subdev_pad_ops risp_pad_ops =3D { .enable_streams =3D risp_enable_streams, .disable_streams =3D risp_disable_streams, .set_fmt =3D risp_set_pad_format, .get_fmt =3D v4l2_subdev_get_fmt, .link_validate =3D v4l2_subdev_link_validate_default, + .set_routing =3D risp_set_routing, }; =20 static const struct v4l2_subdev_ops rcar_isp_subdev_ops =3D { --=20 2.43.0