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

Commit b63e6aa5 authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

drm: proc: Use minor->index to label things, not PDE->name 



Use minor->index to label things, not the name field from the proc_dir_entry
of the /proc/dwm/<minor>/ directory.

Also, use "%u" not "%d" to render the value and use a 12-byte buffer in which
to render the integer, not a 16-byte buffer.  The longest string an unsigned
int can give you is 10 chars (4294967295) plus a NUL, so round up to 12 as the
stack is likely to be 4- or 8-byte aligned.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ce089b54

drivers/gpu/drm/drm_proc.c

+5 −8
Original line number Diff line number Diff line
@@ -116,14 +116,13 @@ static int drm_proc_create_files(const struct drm_info_list *files, int count, 
		ent = proc_create_data(files[i].name, S_IRUGO, root,

				       &drm_proc_fops, tmp);

		if (!ent) {

			DRM_ERROR("Cannot create /proc/dri/%s/%s\n",

				  root->name, files[i].name);

			DRM_ERROR("Cannot create /proc/dri/%u/%s\n",

				  minor->index, files[i].name);

			list_del(&tmp->list);

			kfree(tmp);

			ret = -1;

			goto fail;

		}



	}

	return 0;
@@ -137,7 +136,6 @@ static int drm_proc_create_files(const struct drm_info_list *files, int count, 
 * Initialize the DRI proc filesystem for a device

 *

 * \param dev DRM device

 * \param minor device minor number

 * \param root DRI proc dir entry.

 * \param dev_root resulting DRI device proc dir entry.

 * \return root entry pointer on success, or NULL on failure.
@@ -146,14 +144,13 @@ static int drm_proc_create_files(const struct drm_info_list *files, int count, 
 * "/proc/dri/%minor%/", and each entry in proc_list as

 * "/proc/dri/%minor%/%name%".

 */

int drm_proc_init(struct drm_minor *minor, int minor_id,

		  struct proc_dir_entry *root)

int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root)

{

	char name[64];

	char name[12];

	int ret;



	INIT_LIST_HEAD(&minor->proc_nodes.list);

	sprintf(name, "%d", minor_id);

	sprintf(name, "%u", minor->index);

	minor->proc_root = proc_mkdir(name, root);

	if (!minor->proc_root) {

		DRM_ERROR("Cannot create /proc/dri/%s\n", name);

drivers/gpu/drm/drm_stub.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type) 
	idr_replace(&drm_minors_idr, new_minor, minor_id);



	if (type == DRM_MINOR_LEGACY) {

		ret = drm_proc_init(new_minor, minor_id, drm_proc_root);

		ret = drm_proc_init(new_minor, drm_proc_root);

		if (ret) {

			DRM_ERROR("DRM: Failed to initialize /proc/dri.\n");

			goto err_mem;

include/drm/drmP.h

+1 −2
Original line number Diff line number Diff line
@@ -1546,8 +1546,7 @@ extern struct idr drm_minors_idr; 
extern struct drm_local_map *drm_getsarea(struct drm_device *dev);



				/* Proc support (drm_proc.h) */

extern int drm_proc_init(struct drm_minor *minor, int minor_id,

			 struct proc_dir_entry *root);

extern int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root);

extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);



				/* Debugfs support */