summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelen Koike <helen.koike@collabora.com>2020-01-24 17:25:38 -0300
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-02-13 14:55:20 +0100
commitb3dbccd328dc83e1ef2f60124620957500434d3d (patch)
treef40a51dcecdac89283ce7c541d91a08ecd513205
parent8f6aa5603607c639a40c91204187a2b129381c17 (diff)
utils: rkisp1: sync topology with upstream driver in capture script
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 <helen.koike@collabora.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rwxr-xr-xutils/rkisp1/rkisp1-capture.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh
index cffe9fed..4b789b66 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