Skip to content

Commit 927e8bc

Browse files
lumagrobclark
authored andcommitted
drm/msm/dpu: stop manually removing debugfs files for the DPU CRTC
DRM code handles removing all debugfs recursively. Drop CRTC-specific code to perform that. Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Rob Clark <[email protected]>
1 parent 4d45cac commit 927e8bc

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,15 +1424,16 @@ DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state);
14241424
static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
14251425
{
14261426
struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
1427+
struct dentry *debugfs_root;
14271428

1428-
dpu_crtc->debugfs_root = debugfs_create_dir(dpu_crtc->name,
1429+
debugfs_root = debugfs_create_dir(dpu_crtc->name,
14291430
crtc->dev->primary->debugfs_root);
14301431

14311432
debugfs_create_file("status", 0400,
1432-
dpu_crtc->debugfs_root,
1433+
debugfs_root,
14331434
dpu_crtc, &_dpu_debugfs_status_fops);
14341435
debugfs_create_file("state", 0600,
1435-
dpu_crtc->debugfs_root,
1436+
debugfs_root,
14361437
&dpu_crtc->base,
14371438
&dpu_crtc_debugfs_state_fops);
14381439

@@ -1450,13 +1451,6 @@ static int dpu_crtc_late_register(struct drm_crtc *crtc)
14501451
return _dpu_crtc_init_debugfs(crtc);
14511452
}
14521453

1453-
static void dpu_crtc_early_unregister(struct drm_crtc *crtc)
1454-
{
1455-
struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
1456-
1457-
debugfs_remove_recursive(dpu_crtc->debugfs_root);
1458-
}
1459-
14601454
static const struct drm_crtc_funcs dpu_crtc_funcs = {
14611455
.set_config = drm_atomic_helper_set_config,
14621456
.destroy = dpu_crtc_destroy,
@@ -1465,7 +1459,6 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = {
14651459
.atomic_duplicate_state = dpu_crtc_duplicate_state,
14661460
.atomic_destroy_state = dpu_crtc_destroy_state,
14671461
.late_register = dpu_crtc_late_register,
1468-
.early_unregister = dpu_crtc_early_unregister,
14691462
.verify_crc_source = dpu_crtc_verify_crc_source,
14701463
.set_crc_source = dpu_crtc_set_crc_source,
14711464
.enable_vblank = msm_crtc_enable_vblank,

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ struct dpu_crtc_frame_event {
129129
* @drm_requested_vblank : Whether vblanks have been enabled in the encoder
130130
* @property_info : Opaque structure for generic property support
131131
* @property_defaults : Array of default values for generic property support
132-
* @debugfs_root : Parent of debugfs node
133132
* @vblank_cb_count : count of vblank callback since last reset
134133
* @play_count : frame count between crtc enable and disable
135134
* @vblank_cb_time : ktime at vblank count reset
@@ -160,8 +159,6 @@ struct dpu_crtc {
160159
struct drm_pending_vblank_event *event;
161160
u32 vsync_count;
162161

163-
struct dentry *debugfs_root;
164-
165162
u32 vblank_cb_count;
166163
u64 play_count;
167164
ktime_t vblank_cb_time;

0 commit comments

Comments
 (0)