drm/i915: convert debugfs creation/destruction to table
Subsystems (2)
PATCH 1/1 drm/i915: convert debugfs creation/destruction to table
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
v2: Fix up the debugfs unregister code.
--- drivers/gpu/drm/i915/i915_debugfs.c | 94 ++++++++++++------------------------- drivers/gpu/drm/i915/i915_irq.c | 4 -- 2 files changed, 30 insertions(+), 68 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +30 -64
@@ -2373,61 +2373,35 @@ static struct drm_info_list i915_debugfs_list[] = { };#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) +struct i915_debugfs_files { +const char *name; +const struct file_operations *fops; +} i915_debugfs_files[] = { + {"i915_wedged" , &i915_wedged_fops}, + {"i915_max_freq" , &i915_max_freq_fops}, + {"i915_min_freq" , &i915_min_freq_fops}, + {"i915_cache_sharing" , &i915_cache_sharing_fops}, + {"i915_ring_stop" , &i915_ring_stop_fops}, + {"i915_gem_drop_caches" , &i915_drop_caches_fops}, + {"i915_error_state" , &i915_error_state_fops}, + {"i915_next_seqno" , &i915_next_seqno_fops}, +}; +int i915_debugfs_init (struct drm_minor *minor) { -int ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_wedged" , - &i915_wedged_fops); -if (ret) -return ret; +int ret, i; ret =i915_forcewake_create (minor->debugfs_root, minor);if (ret)return ret; - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_max_freq" , - &i915_max_freq_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_min_freq" , - &i915_min_freq_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_cache_sharing" , - &i915_cache_sharing_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_ring_stop" , - &i915_ring_stop_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_gem_drop_caches" , - &i915_drop_caches_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_error_state" , - &i915_error_state_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_next_seqno" , - &i915_next_seqno_fops); -if (ret) -return ret; +for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { + ret =i915_debugfs_create (minor->debugfs_root, minor, + i915_debugfs_files[i].name, + i915_debugfs_files[i].fops); +if (ret) +return ret; + } return drm_debugfs_create_files(i915_debugfs_list, I915_DEBUGFS_ENTRIES,
@@ -2436,26 +2410,18 @@ int i915_debugfs_init(struct drm_minor *minor)void i915_debugfs_cleanup (struct drm_minor *minor) { +int i; +drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor);drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops,1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_wedged_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_max_freq_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_min_freq_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_cache_sharing_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_drop_caches_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_ring_stop_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_error_state_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_next_seqno_fops, -1 , minor); +for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { +struct drm_info_list *info_list = + (struct drm_info_list *) &i915_debugfs_files[i].fops; + +drm_debugfs_remove_files (info_list,1 , minor); + } }#endif /* CONFIG_DEBUG_FS */
drivers/gpu/drm/i915/i915_irq.c +0 -4
@@ -225,10 +225,6 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,if (!cpt_can_enable_serr_int (dev))return ; -I915_WRITE (SERR_INT ,SERR_INT_TRANS_A_FIFO_UNDERRUN | -SERR_INT_TRANS_B_FIFO_UNDERRUN | -SERR_INT_TRANS_C_FIFO_UNDERRUN ); -ibx_enable_display_interrupt (dev_priv,SDE_ERROR_CPT ); }else {ibx_disable_display_interrupt (dev_priv,SDE_ERROR_CPT );
Signature · 1 line
1.8.1.4
PATCH 1/1 drm/i915: convert debugfs creation/destruction to table
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
--- drivers/gpu/drm/i915/i915_debugfs.c | 94 ++++++++++++------------------------- 1 file changed, 30 insertions(+), 64 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +30 -64
@@ -2373,61 +2373,35 @@ static struct drm_info_list i915_debugfs_list[] = { };#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list) +struct i915_debugfs_files { +const char *name; +const struct file_operations *fops; +} i915_debugfs_files[] = { + {"i915_wedged" , &i915_wedged_fops}, + {"i915_max_freq" , &i915_max_freq_fops}, + {"i915_min_freq" , &i915_min_freq_fops}, + {"i915_cache_sharing" , &i915_cache_sharing_fops}, + {"i915_ring_stop" , &i915_ring_stop_fops}, + {"i915_gem_drop_caches" , &i915_drop_caches_fops}, + {"i915_error_state" , &i915_error_state_fops}, + {"i915_next_seqno" , &i915_next_seqno_fops}, +}; +int i915_debugfs_init (struct drm_minor *minor) { -int ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_wedged" , - &i915_wedged_fops); -if (ret) -return ret; +int ret, i; ret =i915_forcewake_create (minor->debugfs_root, minor);if (ret)return ret; - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_max_freq" , - &i915_max_freq_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_min_freq" , - &i915_min_freq_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_cache_sharing" , - &i915_cache_sharing_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_ring_stop" , - &i915_ring_stop_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_gem_drop_caches" , - &i915_drop_caches_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_error_state" , - &i915_error_state_fops); -if (ret) -return ret; - - ret =i915_debugfs_create (minor->debugfs_root, minor, -"i915_next_seqno" , - &i915_next_seqno_fops); -if (ret) -return ret; +for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { + ret =i915_debugfs_create (minor->debugfs_root, minor, + i915_debugfs_files[i].name, + i915_debugfs_files[i].fops); +if (ret) +return ret; + } return drm_debugfs_create_files(i915_debugfs_list, I915_DEBUGFS_ENTRIES,
@@ -2436,26 +2410,18 @@ int i915_debugfs_init(struct drm_minor *minor)void i915_debugfs_cleanup (struct drm_minor *minor) { +int i; +drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor);drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops,1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_wedged_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_max_freq_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_min_freq_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_cache_sharing_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_drop_caches_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_ring_stop_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_error_state_fops, -1 , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_next_seqno_fops, -1 , minor); +for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { +struct drm_info_list *info_list = + (struct drm_info_list *) i915_debugfs_files[i].fops; + +drm_debugfs_remove_files (info_list,1 , minor); + } }#endif /* CONFIG_DEBUG_FS */
Signature · 1 line
1.8.1.4
Quoted 8 lines · Daniel Vetter
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
Signed-off-by Daniel Vetter <[email protected]>
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
Quoted 10 lines · Ben Widawsky
Quoted 8 lines · Daniel Vetter
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
Signed-off-by Daniel Vetter <[email protected]>Acked-by Ben Widawsky <[email protected]>
And merged.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
2013/7/5 Daniel Vetter <[email protected]>:
Quoted 5 lines · Ben Widawsky
Quoted 4 lines · Daniel Vetter
Quoted 3 lines
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
Signed-off-by Daniel Vetter <[email protected]>Acked-by Ben Widawsky <[email protected]>And merged.
And another patch which you decided to abandon got desperate because it didn't want to die, so it tried to hide inside this patch instead of being sent to /dev/null:
Quoted 9 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Quoted 13 lines · Paulo Zanoni
2013/7/5 Daniel Vetter <[email protected]>:
Quoted 12 lines · Ben Widawsky
Quoted 10 lines · Daniel Vetter
Quoted 8 lines
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
Signed-off-by Daniel Vetter <[email protected]>Acked-by Ben Widawsky <[email protected]>
Quoted 7 lines
Quoted 1 line
And merged.
And another patch which you decided to abandon got desperate because it didn't want to die, so it tried to hide inside this patch instead of being sent to
/dev/null:
Oops, this seems to be indeed the most mis-laid diff hunk I've ever written ;-) Thanks for catching it again, I've dropped it from the patch in dinq.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 20 lines · Daniel Vetter
Quoted 19 lines · Paulo Zanoni
2013/7/5 Daniel Vetter <[email protected]>:
Quoted 5 lines · Ben Widawsky
Quoted 4 lines · Daniel Vetter
Quoted 3 lines
At least for the common cases where we only need special file operations. The forcewake file is still rather more special.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
v2: Fix up the debugfs unregister code.
v3: Actually squash in the right fixup.
Signed-off-by Daniel Vetter <[email protected]>Acked-by Ben Widawsky <[email protected]>And merged.
And another patch which you decided to abandon got desperate because it didn't want to die, so it tried to hide inside this patch instead of being sent to
/dev/null:
Quoted 5 lines
Oops, this seems to be indeed the most mis-laid diff hunk I've ever written ;-) Thanks for catching it again, I've dropped it from the patch in dinq.
Actually I've merged an old version of the patch, which was broken in other ways, too (which Ben spotted). Hopefully the right version is now in dinq.
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch