{"id":2733,"url":"https://patchwork.libcamera.org/api/1.1/patches/2733/?format=json","web_url":"https://patchwork.libcamera.org/patch/2733/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200124202538.764733-2-helen.koike@collabora.com>","date":"2020-01-24T20:25:38","name":"[libcamera-devel,v3,2/2] utils: rkisp1: sync topology with upstream driver in capture script","commit_ref":"b3dbccd328dc83e1ef2f60124620957500434d3d","pull_url":null,"state":"accepted","archived":false,"hash":"a439d4b3bbf5c2145fe9b88afe33c0485b160d7e","submitter":{"id":20,"url":"https://patchwork.libcamera.org/api/1.1/people/20/?format=json","name":"Helen Koike","email":"helen.koike@collabora.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2733/mbox/","series":[{"id":647,"url":"https://patchwork.libcamera.org/api/1.1/series/647/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=647","date":"2020-01-24T20:25:37","name":"[libcamera-devel,v3,1/2] libcamera: pipeline: rkisp1: sync topology with upstream driver","version":3,"mbox":"https://patchwork.libcamera.org/series/647/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2733/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2733/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 097F3608B9\n\tfor ;\n\tFri, 24 Jan 2020 21:25:53 +0100 (CET)","from [127.0.0.1] (localhost [127.0.0.1])\n\t(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,\n\ttfiga@chromium.org, niklas.soderlund@ragnatech.se,\n\tjoacim.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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology with\n\tupstream driver in capture script","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 24 Jan 2020 20:25:53 -0000"},"content":"rkisp1 kernel driver was merged upstream with minor changes in the\ntopology from the original driver libcamera based it's first support to\nrkisp1.\n\nAdapt libcamera capture script to work with upstream driver.\n\n* Remove subdevice dphy from the pipeline.\n* Add resizer in the pipeline.\n* Fix links.\n* Update entity names.\n\nSigned-off-by: Helen Koike \n\n---\nchanges in v3:\n* Enable link between resizer and capture in mainpath\n\nchanges in v2:\n* New commit (splitted from previous one)\n---\n utils/rkisp1/rkisp1-capture.sh | 17 +++++++++--------\n 1 file changed, 9 insertions(+), 8 deletions(-)","diff":"diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh\nindex cffe9fe..4b789b6 100755\n--- a/utils/rkisp1/rkisp1-capture.sh\n+++ b/utils/rkisp1/rkisp1-capture.sh\n@@ -68,14 +68,15 @@ configure_pipeline() {\n \n \t$mediactl -r\n \n-\t$mediactl -l \"'$sensor':0 -> 'rockchip-sy-mipi-dphy':0 [1]\"\n-\t$mediactl -l \"'rockchip-sy-mipi-dphy':1 -> 'rkisp1-isp-subdev':0 [1]\"\n-\t$mediactl -l \"'rkisp1-isp-subdev':2 -> 'rkisp1_mainpath':0 [1]\"\n+\t$mediactl -l \"'$sensor':0 -> 'rkisp1_isp':0 [1]\"\n+\t$mediactl -l \"'rkisp1_isp':2 -> 'rkisp1_resizer_mainpath':0 [1]\"\n+\t$mediactl -l \"'rkisp1_resizer_mainpath':1 -> 'rkisp1_mainpath':0 [1]\"\n \n \t$mediactl -V \"\\\"$sensor\\\":0 [$format]\"\n-\t$mediactl -V \"'rockchip-sy-mipi-dphy':1 [$format]\"\n-\t$mediactl -V \"'rkisp1-isp-subdev':0 [$format crop:(0,0)/$sensor_size]\"\n-\t$mediactl -V \"'rkisp1-isp-subdev':2 [fmt:$capture_mbus_code/$capture_size crop:(0,0)/$capture_size]\"\n+\t$mediactl -V \"'rkisp1_isp':0 [$format crop:(0,0)/$sensor_size]\"\n+\t$mediactl -V \"'rkisp1_isp':2 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]\"\n+\t$mediactl -V \"'rkisp1_resizer_mainpath':0 [fmt:$capture_mbus_code/$sensor_size crop:(0,0)/$sensor_size]\"\n+\t$mediactl -V \"'rkisp1_resizer_mainpath':1 [fmt:$capture_mbus_code/$capture_size]\"\n }\n \n # Capture frames\n@@ -161,8 +162,8 @@ fi\n \n sensor_name=$1\n \n-modprobe mipi_dphy_sy\n-modprobe video_rkisp1\n+modprobe phy_rockchip_dphy_rx0\n+modprobe rockchip_isp1\n \n sensor=$(find_sensor $sensor_name) || exit\n mdev=$(find_media_device rkisp1) || exit\n","prefixes":["libcamera-devel","v3","2/2"]}