[Freedreno] [PATCH 04/25] drm/msm/dpu: move SSPP debugfs creation to dpu_kms.c

[Abhinav Kumar]

On 2/9/2022 9:24 AM, Dmitry Baryshkov wrote:
> As SSPP blocks are now visible through dpu_kms->rm.sspp_blocks, move
> SSPP debugfs creation from dpu_plane to dpu_kms.
> 

Change is fine by itself, but is it really needed?
Wouldnt it be better to keep dpu_debugfs_sspp_init in dpu_plane.c?

> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h |  1 -
>   drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c     | 19 +++++++++++++++++++
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c   | 16 ----------------
>   3 files changed, 19 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> index f805c30643b1..674f311f99b4 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
> @@ -415,7 +415,6 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx,
>    */
>   void dpu_hw_sspp_destroy(struct dpu_hw_pipe *ctx);
>   
> -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root);
>   int _dpu_hw_sspp_init_debugfs(struct dpu_hw_pipe *hw_pipe, struct dpu_kms *kms, struct dentry *entry);
>   
>   #endif /*_DPU_HW_SSPP_H */
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index 4d2b75f3bc89..8196b11fe2f3 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -259,6 +259,25 @@ void dpu_debugfs_create_regset32(const char *name, umode_t mode,
>   	debugfs_create_file(name, mode, parent, regset, &dpu_fops_regset32);
>   }
>   
> +static void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root)
> +{
> +	struct dentry *entry = debugfs_create_dir("sspp", debugfs_root);
> +	int i;
> +
> +	if (IS_ERR(entry))
> +		return;
> +
> +	for (i = SSPP_NONE; i < SSPP_MAX; i++) {
> +		struct dpu_hw_pipe *pipe_hw;
> +
> +		if (!dpu_kms->rm.sspp_blks[i - SSPP_NONE])
> +			continue;
> +
> +		pipe_hw = to_dpu_hw_pipe(dpu_kms->rm.sspp_blks[i - SSPP_NONE]);
> +		_dpu_hw_sspp_init_debugfs(pipe_hw, dpu_kms, entry);
> +	}
> +}
> +
>   static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
>   {
>   	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 146dbccd79cd..37742f74a7bf 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1359,22 +1359,6 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable)
>   	_dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL);
>   	pm_runtime_put_sync(&dpu_kms->pdev->dev);
>   }
> -
> -/* SSPP live inside dpu_plane private data only. Enumerate them here. */
> -void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root)
> -{
> -	struct drm_plane *plane;
> -	struct dentry *entry = debugfs_create_dir("sspp", debugfs_root);
> -
> -	if (IS_ERR(entry))
> -		return;
> -
> -	drm_for_each_plane(plane, dpu_kms->dev) {
> -		struct dpu_plane *pdpu = to_dpu_plane(plane);
> -
> -		_dpu_hw_sspp_init_debugfs(pdpu->pipe_hw, dpu_kms, entry);
> -	}
> -}
>   #endif
>   
>   static bool dpu_plane_format_mod_supported(struct drm_plane *plane,