[PATCH v2 10/55] media: rkisp1: Access ISP version from info pointer

[paul.elder at ideasonboard.com]

Hi Laurent,

On Fri, Jul 01, 2022 at 02:06:28AM +0300, Laurent Pinchart wrote:
> The ISP version is stored in the media_device hw_revision field and
> access from there in the driver. Now that we store a pointer to the
> match data in the rkisp1_device structure, access the ISP version from
> there to make the code clearer and avoid depending on the media_device.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Reviewed-by: Dafna Hirschfeld <dafna at fastmail.com>

Reviewed-by: Paul Elder <paul.elder at ideasonboard.com>

> ---
>  drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c    | 4 ++--
>  drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 2 +-
>  drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c  | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index bc94a51124b0..69c60814ecc1 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -417,7 +417,7 @@ static int rkisp1_config_mipi(struct rkisp1_device *rkisp1)
>  	rkisp1_write(rkisp1, RKISP1_CIF_MIPI_CTRL, mipi_ctrl);
>  
>  	/* V12 could also use a newer csi2-host, but we don't want that yet */
> -	if (rkisp1->media_dev.hw_revision == RKISP1_V12)
> +	if (rkisp1->info->isp_ver == RKISP1_V12)
>  		rkisp1_write(rkisp1, RKISP1_CIF_ISP_CSI0_CTRL0, 0);
>  
>  	/* Configure Data Type and Virtual Channel */
> @@ -535,7 +535,7 @@ static void rkisp1_config_clk(struct rkisp1_device *rkisp1)
>  	rkisp1_write(rkisp1, RKISP1_CIF_VI_ICCL, val);
>  
>  	/* ensure sp and mp can run at the same time in V12 */
> -	if (rkisp1->media_dev.hw_revision == RKISP1_V12) {
> +	if (rkisp1->info->isp_ver == RKISP1_V12) {
>  		val = RKISP1_CIF_CLK_CTRL_MI_Y12 | RKISP1_CIF_CLK_CTRL_MI_SP |
>  		      RKISP1_CIF_CLK_CTRL_MI_RAW0 | RKISP1_CIF_CLK_CTRL_MI_RAW1 |
>  		      RKISP1_CIF_CLK_CTRL_MI_READ | RKISP1_CIF_CLK_CTRL_MI_RAWRD |
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> index c88a9c0fa86e..9da7dc1bc690 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
> @@ -1801,7 +1801,7 @@ static void rkisp1_init_params(struct rkisp1_params *params)
>  	params->vdev_fmt.fmt.meta.buffersize =
>  		sizeof(struct rkisp1_params_cfg);
>  
> -	if (params->rkisp1->media_dev.hw_revision == RKISP1_V12)
> +	if (params->rkisp1->info->isp_ver == RKISP1_V12)
>  		params->ops = &rkisp1_v12_params_ops;
>  	else
>  		params->ops = &rkisp1_v10_params_ops;
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
> index b7ae9166c52f..7d82356b5345 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
> @@ -427,7 +427,7 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats)
>  	stats->vdev_fmt.fmt.meta.buffersize =
>  		sizeof(struct rkisp1_stat_buffer);
>  
> -	if (stats->rkisp1->media_dev.hw_revision == RKISP1_V12)
> +	if (stats->rkisp1->info->isp_ver == RKISP1_V12)
>  		stats->ops = &rkisp1_v12_stats_ops;
>  	else
>  		stats->ops = &rkisp1_v10_stats_ops;