android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: call drm_unplug_minor() from drm_put_minor()

Browse Source 
This protects drm_unplug_minor() against repeated calls so we can use it
in drm_put_minor(). This allows us to further simplify it in follow-ups as
we no longer do minor-destruction in both functions but only in
drm_unplug_minor().
Also add kernel-doc comments about what these calls do.

[airlied: fixup for changes to kdev stuff]
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
David Herrmann
2013-10-20 18:55:40 +02:00
committed by Dave Airlie
parent 02ee4e9455
commit f73aca50b7
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/drm/drm_stub.c
View File

@ -324,10 +324,30 @@ err_idr:
EXPORT_SYMBOL(drm_get_minor);
/**
* Put a secondary minor number.
* drm_unplug_minor - Unplug DRM minor
* @minor: Minor to unplug
*
* \param sec_minor - structure to be released
* \return always zero
* Unplugs the given DRM minor but keeps the object. So after this returns,
* minor->dev is still valid so existing open-files can still access it to get
* device information from their drm_file ojects.
* If the minor is already unplugged or if @minor is NULL, nothing is done.
* The global DRM mutex must be held by the caller.
*/
static void drm_unplug_minor(struct drm_minor *minor)
{
if (!minor || !device_is_registered(minor->kdev))
return;
drm_sysfs_device_remove(minor);
}
/**
* drm_put_minor - Destroy DRM minor
* @minor_p: Double pointer to DRM minor
*
* This calls drm_unplug_minor() on the given minor and then frees it. The minor
* pointer is reset to NULL before this returns.
* The global DRM mutex must be held by the caller.
*/
int drm_put_minor(struct drm_minor **minor_p)
{
@ -339,7 +359,7 @@ int drm_put_minor(struct drm_minor **minor_p)
drm_debugfs_cleanup(minor);
#endif
drm_sysfs_device_remove(minor);
drm_unplug_minor(minor);
idr_remove(&drm_minors_idr, minor->index);
@ -349,11 +369,6 @@ int drm_put_minor(struct drm_minor **minor_p)
}
EXPORT_SYMBOL(drm_put_minor);
static void drm_unplug_minor(struct drm_minor *minor)
{
drm_sysfs_device_remove(minor);
}
/**
* Called via drm_exit() at module unload time or when pci device is
* unplugged.