Skip to contentSkip to conversation

drm/i915: Really fix the debug unregister code

PATCH In review Ben Widawsky 2 participants 2 messages Jul 7, 2013 – Jul 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Really fix the debug unregister code

This smells like a missing git add, but unregister was not handled properly in:
commit c032d5491a4d8d56d8364f4919364815b55d3437

Author: Daniel Vetter <[email protected]>
Date:   Thu Jul 4 20:39:49 2013 +0200

drm/i915: convert debugfs creation/destruction to table

fops is already the pointer that we want when incrementally removing.

One really bad side effect of this failure is all tests in our test suite will fail after module_reload fails.

This fix was actually lazily authored by Chris.

---
 drivers/gpu/drm/i915/i915_debugfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -2
index b49d731..d870f27 100644
@@ -2420,8 +2420,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
 				 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;
-
+			(struct drm_info_list *)i915_debugfs_files[i].fops;
 		drm_debugfs_remove_files(info_list, 1, minor);
 	}
 }
Signature · 1 line
1.8.3.2
#1 lore raw
Quoted 10 lines · Ben Widawsky

This smells like a missing git add, but unregister was not handled properly in:
commit c032d5491a4d8d56d8364f4919364815b55d3437

Author: Daniel Vetter <[email protected]>
Date:   Thu Jul 4 20:39:49 2013 +0200

drm/i915: convert debugfs creation/destruction to table

fops is already the pointer that we want when incrementally removing.

Quoted 8 lines

One really bad side effect of this failure is all tests in our test suite will fail after module_reload fails.

This fix was actually lazily authored by Chris.

Fixed by merging the right version of my patch (the one you've actually looked at ...). My apologies for the mess I've caused here. -Daniel

Quoted 25 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -2
index b49d731..d870f27 100644
@@ -2420,8 +2420,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
 				 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;
-
+			(struct drm_info_list *)i915_debugfs_files[i].fops;
 		drm_debugfs_remove_files(info_list, 1, minor);
 	}
 }
Signature · 6 lines
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch