Re: [PATCH v1 5/8] drm/msm/dpu: stop manually removing debugfs files for the DPU plane

On 12/1/2021 2:26 PM, Dmitry Baryshkov wrote:

DRM code handles removing all debugfs recursively. Drop plane-specific code to perform that.

Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org

Reviewed-by: Abhinav Kumar quic_abhinavk@quicinc.com

---

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 28 ++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index f80ee3ba9a8a..d3176f58708e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -110,7 +110,6 @@ struct dpu_plane { struct dpu_mdss_cfg *catalog;

/* debugfs related stuff */

• struct dentry *debugfs_root; struct dpu_debugfs_regset32 debugfs_src; struct dpu_debugfs_regset32 debugfs_scaler; struct dpu_debugfs_regset32 debugfs_csc;

@@ -1368,15 +1367,16 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane) struct dpu_kms *kms = _dpu_plane_get_kms(plane); const struct dpu_sspp_cfg *cfg = pdpu->pipe_hw->cap; const struct dpu_sspp_sub_blks *sblk = cfg->sblk;

• struct dentry *debugfs_root;

  /* create overall sub-directory for the pipe */

• pdpu->debugfs_root =

• debugfs_root = debugfs_create_dir(plane->name, plane->dev->primary->debugfs_root);

  /* don't error check these */ debugfs_create_xul("features", 0600,

• 	pdpu->debugfs_root, (unsigned long *)&pdpu->pipe_hw->cap->features);
  

• 	debugfs_root, (unsigned long *)&pdpu->pipe_hw->cap->features);
  
  

  /* add register dump support */ dpu_debugfs_setup_regset32(&pdpu->debugfs_src,

@@ -1384,7 +1384,7 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane) sblk->src_blk.len, kms); dpu_debugfs_create_regset32("src_blk", 0400,

• 	pdpu->debugfs_root, &pdpu->debugfs_src);
  

• 	debugfs_root, &pdpu->debugfs_src);
  
  

  if (cfg->features & BIT(DPU_SSPP_SCALER_QSEED3) || cfg->features & BIT(DPU_SSPP_SCALER_QSEED3LITE) ||

@@ -1395,7 +1395,7 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane) sblk->scaler_blk.len, kms); dpu_debugfs_create_regset32("scaler_blk", 0400,

• 		pdpu->debugfs_root,
  

• 		debugfs_root,
  	&pdpu->debugfs_scaler);
  

  }

@@ -1406,24 +1406,24 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane) sblk->csc_blk.len, kms); dpu_debugfs_create_regset32("csc_blk", 0400,

• 		pdpu->debugfs_root, &pdpu->debugfs_csc);
  

• 		debugfs_root, &pdpu->debugfs_csc);
  

  }

  debugfs_create_u32("xin_id", 0400,

• 	pdpu->debugfs_root,
  

• 	debugfs_root,
  (u32 *) &cfg->xin_id);
  

  debugfs_create_u32("clk_ctrl", 0400,

• 	pdpu->debugfs_root,
  

• 	debugfs_root,
  (u32 *) &cfg->clk_ctrl);
  

  debugfs_create_x32("creq_vblank", 0600,

• 	pdpu->debugfs_root,
  

• 	debugfs_root,
  (u32 *) &sblk->creq_vblank);
  

  debugfs_create_x32("danger_vblank", 0600,

• 	pdpu->debugfs_root,
  

• 	debugfs_root,
  (u32 *) &sblk->danger_vblank);
  
  

  return 0;

@@ -1440,13 +1440,6 @@ static int dpu_plane_late_register(struct drm_plane *plane) return _dpu_plane_init_debugfs(plane); }

-static void dpu_plane_early_unregister(struct drm_plane *plane) -{

• struct dpu_plane *pdpu = to_dpu_plane(plane);
• debugfs_remove_recursive(pdpu->debugfs_root);

-}

• static bool dpu_plane_format_mod_supported(struct drm_plane *plane, uint32_t format, uint64_t modifier) {

@@ -1472,7 +1465,6 @@ static const struct drm_plane_funcs dpu_plane_funcs = { .atomic_duplicate_state = dpu_plane_duplicate_state, .atomic_destroy_state = dpu_plane_destroy_state, .late_register = dpu_plane_late_register,

• .early_unregister = dpu_plane_early_unregister,
  

  .format_mod_supported = dpu_plane_format_mod_supported, };