[{"id":3701,"web_url":"https://patchwork.libcamera.org/comment/3701/","msgid":"<20200213013544.GD3013231@oden.dyn.berto.se>","date":"2020-02-13T01:35:44","subject":"Re: [libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology\n\twith upstream driver in capture script","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Helen,\n\nThanks for your patch.\n\nOn 2020-01-24 17:25:38 -0300, Helen Koike wrote:\n> rkisp1 kernel driver was merged upstream with minor changes in the\n> topology from the original driver libcamera based it's first support to\n> rkisp1.\n> \n> Adapt 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> \n> Signed-off-by: Helen Koike <helen.koike@collabora.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nI tested this series together with the RkISP1 driver in v5.6-rc1 and it \nworks as intended, I intend to merge it tomorrow in libcamera unless \nthere is pushback.\n\n> \n> ---\n> changes in v3:\n> * Enable link between resizer and capture in mainpath\n> \n> changes 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(-)\n> \n> diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh\n> index 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> -- \n> 2.24.0\n>","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 14A6160F3C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Feb 2020 02:35:47 +0100 (CET)","by mail-lj1-x243.google.com with SMTP id y6so4664196lji.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 12 Feb 2020 17:35:47 -0800 (PST)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\th19sm383300lji.86.2020.02.12.17.35.45\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 12 Feb 2020 17:35:45 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=VDo12A5wacnbrd7q2KKYni2gYyYI04obqene/phQb6g=;\n\tb=FaOW0eotIaeiXeuIKS05JKRFm+4ckKqhn0KwMHLM9PO31HZEv8XvfZ+xy+7twRFUZe\n\tWvWPqUC5GSXgXxLs44lHBHhRWraBFtx19lyP4RaRkK3NflhV/AUxbZZ6seHD8sgXNy3b\n\thNPgs9Qqopsc8p4U3IX3Uq7OyAQJ9Nmm5Z299mCCM8VX0KFWMb2wub+A0n8xjHnpGLLc\n\tFqvOuwcdY20+NeCkTHPQWjHeUgjhCwb9VrFyKbpyKMS7HdWJHtWBY0jjDxf5XNmZLME+\n\tXQD2xpCbEmK767Nan49PG3FqU49EgufLWORzPZR1iy4b0izvjNlSEgFI9W1RUzUtJheY\n\tViSQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=VDo12A5wacnbrd7q2KKYni2gYyYI04obqene/phQb6g=;\n\tb=NjvNRG3N5C5i3k+2+tl91p27pvJuzueaF5GtD/8asPbEekH4zrVnxUl4E4yes/GYst\n\tFf8j8iLrPS1dHPnmsIRkTuSyx/nUwbH6Y/gpSLaw0yqshK4QFeEQZ4XjE+58m/0zd+A5\n\tpcIKnQzTsCEOL3A2ruccLt282w3BJNPCZGCfyAKuwO1zmTiY0NVmEQyPyFfHL0VDP6gS\n\tl+Mjf8ilGJsYy5CPug1ifqL3q0OOn4NLfn82CEQZDvjFlf33YIsrEvBc0C3n8n7x0GXa\n\twvHtoPmLLWMenbwwxvs74SGxzqzwzoVcf6JFrT2HRXaRS3E/n5Crmb5cCaeZ3ogQYW/3\n\tfrog==","X-Gm-Message-State":"APjAAAU7xDqC2Wj7fXZ0FaI5E5EEj+DH/hN/Zr0i7uf8Speq7ISeVNF+\n\tay7FeXZJ5lA//Ef2Y5wWbDniYg==","X-Google-Smtp-Source":"APXvYqyTZl5l5ib9KC6vbe5+FpN3C9tzV3WtheB/CGiOCp73BX8A6u3xg3xDJBloNmT0zFXnoUCAVA==","X-Received":"by 2002:a2e:8698:: with SMTP id l24mr9504532lji.94.1581557746219;\n\tWed, 12 Feb 2020 17:35:46 -0800 (PST)","Date":"Thu, 13 Feb 2020 02:35:44 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Helen Koike <helen.koike@collabora.com>","Cc":"libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com, \n\tkernel@collabora.com, heiko@sntech.de, tfiga@chromium.org,\n\tjoacim.zetterling@gmail.com","Message-ID":"<20200213013544.GD3013231@oden.dyn.berto.se>","References":"<20200124202538.764733-1-helen.koike@collabora.com>\n\t<20200124202538.764733-2-helen.koike@collabora.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200124202538.764733-2-helen.koike@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology\n\twith upstream driver in capture script","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 13 Feb 2020 01:35:47 -0000"}},{"id":3712,"web_url":"https://patchwork.libcamera.org/comment/3712/","msgid":"<20200213141814.GH3013231@oden.dyn.berto.se>","date":"2020-02-13T14:18:14","subject":"Re: [libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology\n\twith upstream driver in capture script","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Helen,\n\nOn 2020-02-13 02:35:46 +0100, Niklas Söderlund wrote:\n> Hi Helen,\n> \n> Thanks for your patch.\n> \n> On 2020-01-24 17:25:38 -0300, Helen Koike wrote:\n> > rkisp1 kernel driver was merged upstream with minor changes in the\n> > topology from the original driver libcamera based it's first support to\n> > rkisp1.\n> > \n> > Adapt 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> > \n> > Signed-off-by: Helen Koike <helen.koike@collabora.com>\n> \n> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> \n> I tested this series together with the RkISP1 driver in v5.6-rc1 and it \n> works as intended, I intend to merge it tomorrow in libcamera unless \n> there is pushback.\n\nI have now pushed this series to master.\n\n> \n> > \n> > ---\n> > changes in v3:\n> > * Enable link between resizer and capture in mainpath\n> > \n> > changes 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(-)\n> > \n> > diff --git a/utils/rkisp1/rkisp1-capture.sh b/utils/rkisp1/rkisp1-capture.sh\n> > index 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> > -- \n> > 2.24.0\n> > \n> \n> -- \n> Regards,\n> Niklas Söderlund","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A26976043D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Feb 2020 15:18:16 +0100 (CET)","by mail-lj1-x243.google.com with SMTP id v17so6789018ljg.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Feb 2020 06:18:16 -0800 (PST)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\tr10sm1911168ljk.9.2020.02.13.06.18.14\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 13 Feb 2020 06:18:15 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=yyIRHTfp08qVEme+Wfab/Oi7zMcUlFDgt+AaWmap0FM=;\n\tb=xArZm0yNo58rjB9ZohvnyYdJBpeiPq1n/iQTtgNukpYUKIxEbnznw3cF8FBv5KQ69h\n\t0wfo8d4ULF3IsXB/Qc6yztqFlqay96xrtm7aTfE/37IcO/4KKIrshDs/WOHdTs/zDvdw\n\tfwov6gNFKG9jzOPnGVe70krEMEax4wYQfvnwZV38DLEoYz3yzQiP4dTKyYl5gn80A259\n\t/6SgPHfniogJteifiDTHcMU5N8C+pGvwF+HiYcs7CsTF8GJfh8voMEDRNiUEAWCxHti8\n\tXRVt1cwL0U+80ScrVnOLl7Jre9Qbqf3ATw8TgRHV6iIyn0x+7sEtFDt0gK3RQdmFAJYI\n\tuffQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=yyIRHTfp08qVEme+Wfab/Oi7zMcUlFDgt+AaWmap0FM=;\n\tb=d5BAhFEANqat8nbytLoP44GUwUoTmbg31KjNfZYSUf5I1xJNV5HfORj9DkS3bAvbHu\n\tRlpLX4RhcjxiEZnK7Rlcjke4wEbgLsxzwWZLolb7QOx20KJhK9Lh2qM4ewam4imFbkGs\n\trkJl9YnZHr3gyRZmVoP+ohx/k6NFgBzVMkXZqlpOSd0/523tKy+WmWDmcB1Jby7lFb71\n\tBavJQvCPeIlgdORY4Sa4Cz7z4GYnVzUWtinnPHh3I15RDziyj2Pe3Jl0IpqRowtzu79K\n\tyzFTV+LDVQMprX68uHkNmwTOyum0ydbIc4j7WfG4oT/3R7KCYzPpkySJ5V2Ij9v0BeUK\n\txjMw==","X-Gm-Message-State":"APjAAAXwy6F/c8aadtArmp6zzXBEi+uNUV0I2HZh0qXUIxiSNWO2EEAO\n\tiXgXpVKGS55g4S+KVmDTRwyBvA==","X-Google-Smtp-Source":"APXvYqxeKjtxfoK5pZ77IUbTD6MxOB03hhIwBw3Mxoh4wklltiW+A5+j5IJ0pXNRtvwMZQKyuUpaig==","X-Received":"by 2002:a2e:96c6:: with SMTP id d6mr11434336ljj.4.1581603495926; \n\tThu, 13 Feb 2020 06:18:15 -0800 (PST)","Date":"Thu, 13 Feb 2020 15:18:14 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Helen Koike <helen.koike@collabora.com>","Cc":"libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com, \n\tkernel@collabora.com, heiko@sntech.de, tfiga@chromium.org,\n\tjoacim.zetterling@gmail.com","Message-ID":"<20200213141814.GH3013231@oden.dyn.berto.se>","References":"<20200124202538.764733-1-helen.koike@collabora.com>\n\t<20200124202538.764733-2-helen.koike@collabora.com>\n\t<20200213013544.GD3013231@oden.dyn.berto.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200213013544.GD3013231@oden.dyn.berto.se>","Subject":"Re: [libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology\n\twith upstream driver in capture script","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 13 Feb 2020 14:18:16 -0000"}}]