Commit ca8e2ad7 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm: Introduce drm_dev_set_unique() 



Add a helper function that allows drivers to statically set the unique
name of the device. This will allow platform and USB drivers to get rid
of their DRM bus implementations and directly use drm_dev_alloc() and
drm_dev_register().

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 0c7dfd36

drivers/gpu/drm/drm_ioctl.c

+18 −6
Original line number Diff line number Diff line
@@ -131,14 +131,26 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) 
	if (master->unique != NULL)

		drm_unset_busid(dev, master);



	if (dev->driver->bus && dev->driver->bus->set_busid) {

		ret = dev->driver->bus->set_busid(dev, master);

	if (ret)

		goto err;

	return 0;

err:

		if (ret) {

			drm_unset_busid(dev, master);

			return ret;

		}

	} else {

		if (WARN(dev->unique == NULL,

			 "No drm_bus.set_busid() implementation provided by "

			 "%ps. Use drm_dev_set_unique() to set the unique "

			 "name explicitly.", dev->driver))

			return -EINVAL;



		master->unique = kstrdup(dev->unique, GFP_KERNEL);

		if (master->unique)

			master->unique_len = strlen(dev->unique);

	}



	return 0;

}



/**

 * Get a mapping information.

drivers/gpu/drm/drm_stub.c

+26 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ static void drm_dev_release(struct kref *ref) 
	drm_minor_free(dev, DRM_MINOR_CONTROL);



	mutex_destroy(&dev->master_mutex);

	kfree(dev->unique);

	kfree(dev);

}
@@ -777,3 +778,28 @@ void drm_dev_unregister(struct drm_device *dev) 
	drm_minor_unregister(dev, DRM_MINOR_CONTROL);

}

EXPORT_SYMBOL(drm_dev_unregister);



/**

 * drm_dev_set_unique - Set the unique name of a DRM device

 * @dev: device of which to set the unique name

 * @fmt: format string for unique name

 *

 * Sets the unique name of a DRM device using the specified format string and

 * a variable list of arguments. Drivers can use this at driver probe time if

 * the unique name of the devices they drive is static.

 *

 * Return: 0 on success or a negative error code on failure.

 */

int drm_dev_set_unique(struct drm_device *dev, const char *fmt, ...)

{

	va_list ap;



	kfree(dev->unique);



	va_start(ap, fmt);

	dev->unique = kvasprintf(GFP_KERNEL, fmt, ap);

	va_end(ap);



	return dev->unique ? 0 : -ENOMEM;

}

EXPORT_SYMBOL(drm_dev_set_unique);

include/drm/drmP.h

+2 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ struct drm_device { 
	struct drm_minor *render;		/**< Render node */

	atomic_t unplugged;			/**< Flag whether dev is dead */

	struct inode *anon_inode;		/**< inode for private address-space */

	char *unique;				/**< unique name of the device */

	/*@} */



	/** \name Locks */
@@ -1617,6 +1618,7 @@ void drm_dev_ref(struct drm_device *dev); 
void drm_dev_unref(struct drm_device *dev);

int drm_dev_register(struct drm_device *dev, unsigned long flags);

void drm_dev_unregister(struct drm_device *dev);

int drm_dev_set_unique(struct drm_device *dev, const char *fmt, ...);



struct drm_minor *drm_minor_acquire(unsigned int minor_id);

void drm_minor_release(struct drm_minor *minor);

CRA Git | Maintained and supported by SUSTech CRA and CCSE