From patchwork Fri Jan 24 20:25:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Helen Koike X-Patchwork-Id: 2733 Return-Path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 097F3608B9 for ; Fri, 24 Jan 2020 21:25:53 +0100 (CET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 94AFD294878 From: Helen Koike To: libcamera-devel@lists.libcamera.org Cc: laurent.pinchart@ideasonboard.com, kernel@collabora.com, heiko@sntech.de, tfiga@chromium.org, niklas.soderlund@ragnatech.se, joacim.zetterling@gmail.com Date: Fri, 24 Jan 2020 17:25:38 -0300 Message-Id: <20200124202538.764733-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200124202538.764733-1-helen.koike@collabora.com> References: <20200124202538.764733-1-helen.koike@collabora.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology with upstream driver in capture script X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2020 20:25:53 -0000 rkisp1 kernel driver was merged upstream with minor changes in the topology from the original driver libcamera based it's first support to rkisp1. Adapt libcamera capture script to work with upstream driver. * Remove subdevice dphy from the pipeline. * Add resizer in the pipeline. * Fix links. * Update entity names. Signed-off-by: Helen Koike Reviewed-by: Niklas Söderlund --- changes in v3: * Enable link between resizer and capture in mainpath changes in v2: * New commit (splitted from previous one) --- utils/rkisp1/rkisp1-capture.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh index cffe9fe..4b789b6 100755 --- a/utils/rkisp1/rkisp1-capture.sh +++ b/utils/rkisp1/rkisp1-capture.sh @@ -68,14 +68,15 @@ configure_pipeline() { $mediactl -r - $mediactl -l "'$sensor':0 -> 'rockchip-sy-mipi-dphy':0 [1]" - $mediactl -l "'rockchip-sy-mipi-dphy':1 -> 'rkisp1-isp-subdev':0 [1]" - $mediactl -l "'rkisp1-isp-subdev':2 -> 'rkisp1_mainpath':0 [1]" + $mediactl -l "'$sensor':0 -> 'rkisp1_isp':0 [1]" + $mediactl -l "'rkisp1_isp':2 -> 'rkisp1_resizer_mainpath':0 [1]" + $mediactl -l "'rkisp1_resizer_mainpath':1 -> 'rkisp1_mainpath':0 [1]" $mediactl -V "\"$sensor\":0 [$format]" - $mediactl -V "'rockchip-sy-mipi-dphy':1 [$format]" - $mediactl -V "'rkisp1-isp-subdev':0 [$format crop:(0,0)/$sensor_size]" - $mediactl -V "'rkisp1-isp-subdev':2 [fmt:$capture_mbus_code/$capture_size crop:(0,0)/$capture_size]" + $mediactl -V "'rkisp1_isp':0 [$format crop:(0,0)/$sensor_size]" + $mediactl -V "'rkisp1_isp':2 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]" + $mediactl -V "'rkisp1_resizer_mainpath':0 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]" + $mediactl -V "'rkisp1_resizer_mainpath':1 [fmt:$capture_mbus_code/$capture_size]" } # Capture frames @@ -161,8 +162,8 @@ fi sensor_name=$1 -modprobe mipi_dphy_sy -modprobe video_rkisp1 +modprobe phy_rockchip_dphy_rx0 +modprobe rockchip_isp1 sensor=$(find_sensor $sensor_name) || exit mdev=$(find_media_device rkisp1) || exit