Skip to contentSkip to conversation

drm: check for !kdev in drm_unplug_minor()

PATCH In review David Herrmann 2 participants 2 messages Nov 13, 2013 – Nov 14, 2013

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

PATCH 1/1 drm: check for !kdev in drm_unplug_minor()

We moved minor deallocation to drm_dev_free() in:
commit 8f6599da8e772fa8de54cdf98e9e03cbaf3946da
Author: David Herrmann <[email protected]>
Date: Sun Oct 20 18:55:45 2013 +0200

drm: delay minor destruction to drm_dev_free()

However, this causes a call to drm_unplug_minor(), which should just do nothing as drm_dev_unregister() already called this.

But a separate patch caused kdev lifetime changes:
commit 5bdebb183c9702a8c57a01dff09337be3de337a6
Author: Dave Airlie <[email protected]>
Date: Fri Oct 11 14:07:25 2013 +1000

drm/sysfs: sort out minor and connector device object lifetimes.

Thus making our dev_is_registered() call useles (and even segfault if it is NULL). Replace it with a simple !kdev test and we're fine.

---
 drivers/gpu/drm/drm_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_stub.c +1 -1
index c200136..f53d524 100644
@@ -338,7 +338,7 @@ err_idr:
  */
 static void drm_unplug_minor(struct drm_minor *minor)
 {
-	if (!minor || !device_is_registered(minor->kdev))
+	if (!minor || !minor->kdev)
 		return;
 
 #if defined(CONFIG_DEBUG_FS)
Signature · 1 line
1.8.4.2
Tested-by lu hua Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · David Herrmann

We moved minor deallocation to drm_dev_free() in:
commit 8f6599da8e772fa8de54cdf98e9e03cbaf3946da
Author: David Herrmann <[email protected]>
Date: Sun Oct 20 18:55:45 2013 +0200

drm: delay minor destruction to drm_dev_free()

However, this causes a call to drm_unplug_minor(), which should just do nothing as drm_dev_unregister() already called this.

But a separate patch caused kdev lifetime changes:
commit 5bdebb183c9702a8c57a01dff09337be3de337a6
Author: Dave Airlie <[email protected]>
Date: Fri Oct 11 14:07:25 2013 +1000

Quoted 8 lines

drm/sysfs: sort out minor and connector device object lifetimes.

Thus making our dev_is_registered() call useles (and even segfault if it is NULL). Replace it with a simple !kdev test and we're fine.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71208

Quoted 20 lines
---
 drivers/gpu/drm/drm_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_stub.c +1 -1
index c200136..f53d524 100644
@@ -338,7 +338,7 @@ err_idr:
  */
 static void drm_unplug_minor(struct drm_minor *minor)
 {
-	if (!minor || !device_is_registered(minor->kdev))
+	if (!minor || !minor->kdev)
 		return;
 
 #if defined(CONFIG_DEBUG_FS)
Signature · 1 line
1.8.4.2
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch