@@ -110,7 +110,6 @@ struct dpu_plane {
110110 struct dpu_mdss_cfg * catalog ;
111111
112112 /* debugfs related stuff */
113- struct dentry * debugfs_root ;
114113 struct dpu_debugfs_regset32 debugfs_src ;
115114 struct dpu_debugfs_regset32 debugfs_scaler ;
116115 struct dpu_debugfs_regset32 debugfs_csc ;
@@ -1360,23 +1359,24 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane)
13601359 struct dpu_kms * kms = _dpu_plane_get_kms (plane );
13611360 const struct dpu_sspp_cfg * cfg = pdpu -> pipe_hw -> cap ;
13621361 const struct dpu_sspp_sub_blks * sblk = cfg -> sblk ;
1362+ struct dentry * debugfs_root ;
13631363
13641364 /* create overall sub-directory for the pipe */
1365- pdpu -> debugfs_root =
1365+ debugfs_root =
13661366 debugfs_create_dir (plane -> name ,
13671367 plane -> dev -> primary -> debugfs_root );
13681368
13691369 /* don't error check these */
13701370 debugfs_create_xul ("features" , 0600 ,
1371- pdpu -> debugfs_root , (unsigned long * )& pdpu -> pipe_hw -> cap -> features );
1371+ debugfs_root , (unsigned long * )& pdpu -> pipe_hw -> cap -> features );
13721372
13731373 /* add register dump support */
13741374 dpu_debugfs_setup_regset32 (& pdpu -> debugfs_src ,
13751375 sblk -> src_blk .base + cfg -> base ,
13761376 sblk -> src_blk .len ,
13771377 kms );
13781378 dpu_debugfs_create_regset32 ("src_blk" , 0400 ,
1379- pdpu -> debugfs_root , & pdpu -> debugfs_src );
1379+ debugfs_root , & pdpu -> debugfs_src );
13801380
13811381 if (cfg -> features & BIT (DPU_SSPP_SCALER_QSEED3 ) ||
13821382 cfg -> features & BIT (DPU_SSPP_SCALER_QSEED3LITE ) ||
@@ -1387,7 +1387,7 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane)
13871387 sblk -> scaler_blk .len ,
13881388 kms );
13891389 dpu_debugfs_create_regset32 ("scaler_blk" , 0400 ,
1390- pdpu -> debugfs_root ,
1390+ debugfs_root ,
13911391 & pdpu -> debugfs_scaler );
13921392 }
13931393
@@ -1398,24 +1398,24 @@ static int _dpu_plane_init_debugfs(struct drm_plane *plane)
13981398 sblk -> csc_blk .len ,
13991399 kms );
14001400 dpu_debugfs_create_regset32 ("csc_blk" , 0400 ,
1401- pdpu -> debugfs_root , & pdpu -> debugfs_csc );
1401+ debugfs_root , & pdpu -> debugfs_csc );
14021402 }
14031403
14041404 debugfs_create_u32 ("xin_id" ,
14051405 0400 ,
1406- pdpu -> debugfs_root ,
1406+ debugfs_root ,
14071407 (u32 * ) & cfg -> xin_id );
14081408 debugfs_create_u32 ("clk_ctrl" ,
14091409 0400 ,
1410- pdpu -> debugfs_root ,
1410+ debugfs_root ,
14111411 (u32 * ) & cfg -> clk_ctrl );
14121412 debugfs_create_x32 ("creq_vblank" ,
14131413 0600 ,
1414- pdpu -> debugfs_root ,
1414+ debugfs_root ,
14151415 (u32 * ) & sblk -> creq_vblank );
14161416 debugfs_create_x32 ("danger_vblank" ,
14171417 0600 ,
1418- pdpu -> debugfs_root ,
1418+ debugfs_root ,
14191419 (u32 * ) & sblk -> danger_vblank );
14201420
14211421 return 0 ;
@@ -1432,13 +1432,6 @@ static int dpu_plane_late_register(struct drm_plane *plane)
14321432 return _dpu_plane_init_debugfs (plane );
14331433}
14341434
1435- static void dpu_plane_early_unregister (struct drm_plane * plane )
1436- {
1437- struct dpu_plane * pdpu = to_dpu_plane (plane );
1438-
1439- debugfs_remove_recursive (pdpu -> debugfs_root );
1440- }
1441-
14421435static bool dpu_plane_format_mod_supported (struct drm_plane * plane ,
14431436 uint32_t format , uint64_t modifier )
14441437{
@@ -1464,7 +1457,6 @@ static const struct drm_plane_funcs dpu_plane_funcs = {
14641457 .atomic_duplicate_state = dpu_plane_duplicate_state ,
14651458 .atomic_destroy_state = dpu_plane_destroy_state ,
14661459 .late_register = dpu_plane_late_register ,
1467- .early_unregister = dpu_plane_early_unregister ,
14681460 .format_mod_supported = dpu_plane_format_mod_supported ,
14691461};
14701462
0 commit comments