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

Commit 71d39483 authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm: move "struct drm_magic_entry" to drm_auth.c 



In drm_release(), we currently call drm_remove_magic() if the drm_file
has a drm-magic attached. Therefore, once drm_master_release() is called,
the magic-list _must_ be empty.

By dropping the no-op cleanup, we can move "struct drm_magic_entry" to
drm_auth.c and avoid exposing it to all of DRM.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 03decbe5

drivers/gpu/drm/drm_auth.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,12 @@ 




#include <drm/drmP.h>

#include <drm/drmP.h>





struct drm_magic_entry {

	struct list_head head;

	struct drm_hash_item hash_item;

	struct drm_file *priv;

};



/**

/**

 * Find the file with the given magic number.

 * Find the file with the given magic number.

 *

 *

drivers/gpu/drm/drm_drv.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -133,7 +133,6 @@ EXPORT_SYMBOL(drm_master_get); 
static void drm_master_destroy(struct kref *kref)

static void drm_master_destroy(struct kref *kref)

{

{

	struct drm_master *master = container_of(kref, struct drm_master, refcount);

	struct drm_master *master = container_of(kref, struct drm_master, refcount);

	struct drm_magic_entry *pt, *next;

	struct drm_device *dev = master->minor->dev;

	struct drm_device *dev = master->minor->dev;

	struct drm_map_list *r_list, *list_temp;

	struct drm_map_list *r_list, *list_temp;
@@ -154,12 +153,6 @@ static void drm_master_destroy(struct kref *kref) 
		master->unique_len = 0;

		master->unique_len = 0;

	}

	}





	list_for_each_entry_safe(pt, next, &master->magicfree, head) {

		list_del(&pt->head);

		drm_ht_remove_item(&master->magiclist, &pt->hash_item);

		kfree(pt);

	}



	drm_ht_remove(&master->magiclist);

	drm_ht_remove(&master->magiclist);





	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

include/drm/drmP.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -290,12 +290,6 @@ struct drm_ioctl_desc { 
#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)			\

#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)			\

	[DRM_IOCTL_NR(DRM_##ioctl)] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}

	[DRM_IOCTL_NR(DRM_##ioctl)] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}





struct drm_magic_entry {

	struct list_head head;

	struct drm_hash_item hash_item;

	struct drm_file *priv;

};



/**

/**

 * DMA buffer.

 * DMA buffer.

 */

 */