| Message ID | 20211201222633.2476780-7-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 927e8bcaa783286172c478d182f550f30bfe36bb |
| Headers | show |
| Series | [v1,1/8] drm/msm/dpu: move disable_danger out of plane subdir | expand |
On 12/1/2021 2:26 PM, Dmitry Baryshkov wrote: > DRM code handles removing all debugfs recursively. Drop CRTC-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_crtc.c | 15 ++++----------- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 --- > 2 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index d290809d59bd..9899f7424131 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1424,15 +1424,16 @@ DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state); > static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) > { > struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > + struct dentry *debugfs_root; > > - dpu_crtc->debugfs_root = debugfs_create_dir(dpu_crtc->name, > + debugfs_root = debugfs_create_dir(dpu_crtc->name, > crtc->dev->primary->debugfs_root); > > debugfs_create_file("status", 0400, > - dpu_crtc->debugfs_root, > + debugfs_root, > dpu_crtc, &_dpu_debugfs_status_fops); > debugfs_create_file("state", 0600, > - dpu_crtc->debugfs_root, > + debugfs_root, > &dpu_crtc->base, > &dpu_crtc_debugfs_state_fops); > > @@ -1450,13 +1451,6 @@ static int dpu_crtc_late_register(struct drm_crtc *crtc) > return _dpu_crtc_init_debugfs(crtc); > } > > -static void dpu_crtc_early_unregister(struct drm_crtc *crtc) > -{ > - struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > - > - debugfs_remove_recursive(dpu_crtc->debugfs_root); > -} > - > static const struct drm_crtc_funcs dpu_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .destroy = dpu_crtc_destroy, > @@ -1465,7 +1459,6 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { > .atomic_duplicate_state = dpu_crtc_duplicate_state, > .atomic_destroy_state = dpu_crtc_destroy_state, > .late_register = dpu_crtc_late_register, > - .early_unregister = dpu_crtc_early_unregister, > .verify_crc_source = dpu_crtc_verify_crc_source, > .set_crc_source = dpu_crtc_set_crc_source, > .enable_vblank = msm_crtc_enable_vblank, > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h > index 4328e133d71c..b8785c394fcc 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h > @@ -129,7 +129,6 @@ struct dpu_crtc_frame_event { > * @drm_requested_vblank : Whether vblanks have been enabled in the encoder > * @property_info : Opaque structure for generic property support > * @property_defaults : Array of default values for generic property support > - * @debugfs_root : Parent of debugfs node > * @vblank_cb_count : count of vblank callback since last reset > * @play_count : frame count between crtc enable and disable > * @vblank_cb_time : ktime at vblank count reset > @@ -160,8 +159,6 @@ struct dpu_crtc { > struct drm_pending_vblank_event *event; > u32 vsync_count; > > - struct dentry *debugfs_root; > - > u32 vblank_cb_count; > u64 play_count; > ktime_t vblank_cb_time; >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index d290809d59bd..9899f7424131 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1424,15 +1424,16 @@ DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state); static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) { struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); + struct dentry *debugfs_root; - dpu_crtc->debugfs_root = debugfs_create_dir(dpu_crtc->name, + debugfs_root = debugfs_create_dir(dpu_crtc->name, crtc->dev->primary->debugfs_root); debugfs_create_file("status", 0400, - dpu_crtc->debugfs_root, + debugfs_root, dpu_crtc, &_dpu_debugfs_status_fops); debugfs_create_file("state", 0600, - dpu_crtc->debugfs_root, + debugfs_root, &dpu_crtc->base, &dpu_crtc_debugfs_state_fops); @@ -1450,13 +1451,6 @@ static int dpu_crtc_late_register(struct drm_crtc *crtc) return _dpu_crtc_init_debugfs(crtc); } -static void dpu_crtc_early_unregister(struct drm_crtc *crtc) -{ - struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); - - debugfs_remove_recursive(dpu_crtc->debugfs_root); -} - static const struct drm_crtc_funcs dpu_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = dpu_crtc_destroy, @@ -1465,7 +1459,6 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { .atomic_duplicate_state = dpu_crtc_duplicate_state, .atomic_destroy_state = dpu_crtc_destroy_state, .late_register = dpu_crtc_late_register, - .early_unregister = dpu_crtc_early_unregister, .verify_crc_source = dpu_crtc_verify_crc_source, .set_crc_source = dpu_crtc_set_crc_source, .enable_vblank = msm_crtc_enable_vblank, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h index 4328e133d71c..b8785c394fcc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h @@ -129,7 +129,6 @@ struct dpu_crtc_frame_event { * @drm_requested_vblank : Whether vblanks have been enabled in the encoder * @property_info : Opaque structure for generic property support * @property_defaults : Array of default values for generic property support - * @debugfs_root : Parent of debugfs node * @vblank_cb_count : count of vblank callback since last reset * @play_count : frame count between crtc enable and disable * @vblank_cb_time : ktime at vblank count reset @@ -160,8 +159,6 @@ struct dpu_crtc { struct drm_pending_vblank_event *event; u32 vsync_count; - struct dentry *debugfs_root; - u32 vblank_cb_count; u64 play_count; ktime_t vblank_cb_time;
DRM code handles removing all debugfs recursively. Drop CRTC-specific code to perform that. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 15 ++++----------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 3 --- 2 files changed, 4 insertions(+), 14 deletions(-)