From nobody Thu Dec 18 01:52:57 2025 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 25F0B231A37; Fri, 30 May 2025 13:51:48 +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=1748613110; cv=none; b=YDAql81RgXTgMTnuecJzLsh2JeJxW99PUQoiCqWOpaweA0ZnlFYGECcO7cjsmF3qJp5JFFlIVZr4e1Gvuy4N0FMwII2z2mTF+z5KO7sCXMTl11jwmEJ3dWR182mHhMWeBbQlD1AQSTngew/PUvaL9ALtOhB+Uxfc8NPaQW5ijKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748613110; c=relaxed/simple; bh=2a1aTa89YfHbKhTvYuMlZwM95lDZAoaySTga60o3guY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KVbZLD/7v8wK/tJAXzahiHl5UyT7yZfUAvBJKzfDSxGt1ugoOCt8watsmYFZ4zY7BILyCnlX5aEs+X3TMIc+lAhTcLXtzz4xRehknvCGReqLw/7j0ify49+h8egCckOkxiPYbDmtlY181Me2Bfz4xhLX8seRDBfqGNdMStaY8vQ= 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=URt4COJZ; 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="URt4COJZ" 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 041151A04; Fri, 30 May 2025 15:51:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1748613069; bh=2a1aTa89YfHbKhTvYuMlZwM95lDZAoaySTga60o3guY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=URt4COJZWBqaz55oZWoOIKd8WW7i+jA+Pb4lCLf0m4BmS/LstOvKAN3P4t+M3T8RC gHvGAmcarkl5OQYaEPK8xs4Q339qeZzaTCg2Xv9r/qg/6ikVjynyMTsXSbJEGLHdli sXgniRbto/QcABKgYfj6VjqY9P/oRYqrY61826AU= From: Tomi Valkeinen Date: Fri, 30 May 2025 16:50:40 +0300 Subject: [PATCH v3 11/15] 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: <20250530-rcar-streams-v3-11-026655df7138@ideasonboard.com> References: <20250530-rcar-streams-v3-0-026655df7138@ideasonboard.com> In-Reply-To: <20250530-rcar-streams-v3-0-026655df7138@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=4623; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=2a1aTa89YfHbKhTvYuMlZwM95lDZAoaySTga60o3guY=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBoObfeKf63AoRQAmM2o9cxaZK7j3FWyNfvvyVGx RWXOQyz5jeJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCaDm33gAKCRD6PaqMvJYe 9cuRD/4k2CxFhBqQ1fDbX1zUpAFT+clzEqmemxiuVNJutu2S9vmyf1NMc0KmyTEoaShOYUUGZXN 9Kf/vsy+B/I6noPubctc9SFkReQqLyFLPKxGbkArSeYyMLN3GE+HOOFXGS12vZSz3EWKUZFCH+l PN7jnHRSJhhk40aOv1SftZ/zd4Ps6lyqPIIAHi6r/hOHOMN39eBldvCOF/2v/CaA0bPSgC6m+iA HWOfDoQZhX0YGSoWsftCItICs6BQwUIN8Y+S1Hkch1ZxkumFFO/PpT5wdpCa4NsU7xCeRXTh8RH JxYngYwYRCOJ2F3zmcP4P72KB6F66+uESI6J3eJnuO1J1IeacIiNr9uSsZWPhD0XZF/hqjIeFj3 dbZhJAg4DE1aRPHrPXjNRClYWEZ8Y5rbC4eiH9mzF0wyB9sZOR9S9zuq890bQyRHtDl3dSdKOrC PPWsgCm5EuW3d0T/uxRfvqiuIMctKElm1AFecizjT8poJOgyMsi5IS5EQ9Tyev7ImgIjrEBzfhO 8D3F4vhHupQy2JR7QC5elyeOYn9So++P1ayZ6Th97Hz8y3QFW0QaeJAuOeatedR/IlsJOs7524+ V/92TmxGMwMBY2zoD/9i6klnROWYglmUZSe8TonhRV/cjWYpHVDdl6lTZq3OYLeQEov1+ek20Gr mOm1ScUknp4jzXQ== 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 Reviewed-by: Laurent Pinchart --- drivers/media/platform/renesas/rcar-isp/csisp.c | 108 +++++++++++++++++---= ---- 1 file changed, 77 insertions(+), 31 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-isp/csisp.c b/drivers/medi= a/platform/renesas/rcar-isp/csisp.c index a04cbf96b809..887d8eb21a3a 100644 --- a/drivers/media/platform/renesas/rcar-isp/csisp.c +++ b/drivers/media/platform/renesas/rcar-isp/csisp.c @@ -225,24 +225,86 @@ 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_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 - fmt =3D v4l2_subdev_state_get_format(state, RCAR_ISP_SINK, 0); - if (!fmt) - return -EINVAL; + ret =3D v4l2_subdev_call(isp->remote, pad, get_frame_desc, + isp->remote_pad, &source_fd); + if (ret) + return ret; =20 - format =3D risp_code_to_fmt(fmt->code); - if (!format) { - dev_err(isp->dev, "Unsupported bus format\n"); - return -EINVAL; + /* Clear the channel registers */ + for (unsigned int ch =3D 0; ch < 12; ++ch) { + risp_write_cs(isp, ISPCS_FILTER_ID_CH_REG(ch), 0); + risp_write_cs(isp, ISPCS_DT_CODE03_CH_REG(ch), 0); } =20 + /* Clear the proc mode registers */ + for (unsigned int dt =3D 0; dt < 64; ++dt) + risp_write_cs(isp, ISPPROCMODE_DT_REG(dt), 0); + + 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 stream from source frame desc\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)); + + /* 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); + } + + 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"); @@ -256,25 +318,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