[libcamera-devel] [PATCH v3 2/2] utils: rkisp1: sync topology with upstream driver in capture script

[Niklas Söderlund]

Hi Helen,

On 2020-02-13 02:35:46 +0100, Niklas Söderlund wrote:
> Hi Helen,
> 
> Thanks for your patch.
> 
> On 2020-01-24 17:25:38 -0300, Helen Koike wrote:
> > 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 at collabora.com>
> 
> Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> 
> I tested this series together with the RkISP1 driver in v5.6-rc1 and it 
> works as intended, I intend to merge it tomorrow in libcamera unless 
> there is pushback.

I have now pushed this series to master.

> 
> > 
> > ---
> > 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
> > -- 
> > 2.24.0
> > 
> 
> -- 
> Regards,
> Niklas Söderlund

-- 
Regards,
Niklas Söderlund