Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c07dcd61 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Document device unplug infrastructure 



While at it, also ocd and give them a consistent drm_dev_ prefix, like
the other device instance functionality. Plus move the functions into
the right places.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170802115604.12734-3-daniel.vetter@ffwll.ch
parent e4672e55

drivers/gpu/drm/drm_drv.c

+21 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ struct drm_minor *drm_minor_acquire(unsigned int minor_id) 


	if (!minor) {

		return ERR_PTR(-ENODEV);

	} else if (drm_device_is_unplugged(minor->dev)) {

	} else if (drm_dev_is_unplugged(minor->dev)) {

		drm_dev_unref(minor->dev);

		return ERR_PTR(-ENODEV);

	}
@@ -364,7 +364,22 @@ void drm_put_dev(struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_put_dev);



void drm_unplug_dev(struct drm_device *dev)

static void drm_device_set_unplugged(struct drm_device *dev)

{

	smp_wmb();

	atomic_set(&dev->unplugged, 1);

}



/**

 * drm_dev_unplug - unplug a DRM device

 * @dev: DRM device

 *

 * This unplugs a hotpluggable DRM device, which makes it inaccessible to

 * userspace operations. Entry-points can use drm_dev_is_unplugged(). This

 * essentially unregisters the device like drm_dev_unregister(), but can be

 * called while there are still open users of @dev.

 */

void drm_dev_unplug(struct drm_device *dev)

{

	/* for a USB device */

	if (drm_core_check_feature(dev, DRIVER_MODESET))
@@ -383,7 +398,7 @@ void drm_unplug_dev(struct drm_device *dev) 
	}

	mutex_unlock(&drm_global_mutex);

}

EXPORT_SYMBOL(drm_unplug_dev);

EXPORT_SYMBOL(drm_dev_unplug);



/*

 * DRM internal mount
@@ -835,6 +850,9 @@ EXPORT_SYMBOL(drm_dev_register); 
 * drm_dev_register() but does not deallocate the device. The caller must call

 * drm_dev_unref() to drop their final reference.

 *

 * A special form of unregistering for hotpluggable devices is drm_dev_unplug(),

 * which can be called while there are still open users of @dev.

 *

 * This should be called first in the device teardown code to make sure

 * userspace can't access the device instance any more.

 */

drivers/gpu/drm/drm_file.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int drm_release(struct inode *inode, struct file *filp) 


	if (!--dev->open_count) {

		drm_lastclose(dev);

		if (drm_device_is_unplugged(dev))

		if (drm_dev_is_unplugged(dev))

			drm_put_dev(dev);

	}

	mutex_unlock(&drm_global_mutex);

drivers/gpu/drm/drm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct drm_vma_offset_node *node;

	int ret;



	if (drm_device_is_unplugged(dev))

	if (drm_dev_is_unplugged(dev))

		return -ENODEV;



	drm_vma_offset_lock_lookup(dev->vma_offset_manager);

drivers/gpu/drm/drm_gem_cma_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, 
	struct drm_device *dev = priv->minor->dev;

	struct drm_vma_offset_node *node;



	if (drm_device_is_unplugged(dev))

	if (drm_dev_is_unplugged(dev))

		return -ENODEV;



	drm_vma_offset_lock_lookup(dev->vma_offset_manager);

drivers/gpu/drm/drm_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata, 
	struct drm_device *dev = file_priv->minor->dev;

	int retcode;



	if (drm_device_is_unplugged(dev))

	if (drm_dev_is_unplugged(dev))

		return -ENODEV;



	retcode = drm_ioctl_permit(flags, file_priv);
@@ -765,7 +765,7 @@ long drm_ioctl(struct file *filp, 


	dev = file_priv->minor->dev;



	if (drm_device_is_unplugged(dev))

	if (drm_dev_is_unplugged(dev))

		return -ENODEV;



	is_driver_ioctl = nr >= DRM_COMMAND_BASE && nr < DRM_COMMAND_END;