redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

drm: Link directly from drm_master to drm_device

Browse source 
Master-based auth only exists for the legacy/primary drm_minor, hence
there can only be one per device. The goal here is to untangle the
epic dereference games of minor->master and master->minor which is
just massively confusing.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1465930269-7883-4-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2016-06-14 20:50:58 +02:00
parent 1a75a222f5
commit 34a839c689
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/drm_drv.c
View file

@ -93,7 +93,7 @@ void drm_ut_debug_printk(const char *function_name, const char *format, ...)
} }
EXPORT_SYMBOL(drm_ut_debug_printk); EXPORT_SYMBOL(drm_ut_debug_printk);
struct drm_master *drm_master_create(struct drm_minor *minor) struct drm_master *drm_master_create(struct drm_device *dev)
{ {
struct drm_master *master; struct drm_master *master;
@ -105,7 +105,7 @@ struct drm_master *drm_master_create(struct drm_minor *minor)
spin_lock_init(&master->lock.spinlock); spin_lock_init(&master->lock.spinlock);
init_waitqueue_head(&master->lock.lock_queue); init_waitqueue_head(&master->lock.lock_queue);
idr_init(&master->magic_map); idr_init(&master->magic_map);
master->minor = minor; master->dev = dev;
return master; return master;
} }
@ -120,7 +120,7 @@ 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_device *dev = master->minor->dev; struct drm_device *dev = master->dev;
if (dev->driver->master_destroy) if (dev->driver->master_destroy)
dev->driver->master_destroy(dev, master); dev->driver->master_destroy(dev, master);

2
drivers/gpu/drm/drm_fops.c
View file

@ -185,7 +185,7 @@ int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv)
lockdep_assert_held_once(&dev->master_mutex); lockdep_assert_held_once(&dev->master_mutex);
/* create a new master */ /* create a new master */
fpriv->minor->master = drm_master_create(fpriv->minor); fpriv->minor->master = drm_master_create(fpriv->minor->dev);
if (!fpriv->minor->master) if (!fpriv->minor->master)
return -ENOMEM; return -ENOMEM;

2
drivers/gpu/drm/drm_internal.h
View file

@ -92,7 +92,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
int drm_dropmaster_ioctl(struct drm_device *dev, void *data, int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
struct drm_master *drm_master_create(struct drm_minor *minor); struct drm_master *drm_master_create(struct drm_device *dev);
/* drm_debugfs.c */ /* drm_debugfs.c */
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)

7
include/drm/drmP.h
View file

@ -379,16 +379,19 @@ struct drm_lock_data {
* struct drm_master - drm master structure * struct drm_master - drm master structure
* *
* @refcount: Refcount for this master object. * @refcount: Refcount for this master object.
* @minor: Link back to minor char device we are master for. Immutable. * @dev: Link back to the DRM device
* @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex. * @unique: Unique identifier: e.g. busid. Protected by drm_global_mutex.
* @unique_len: Length of unique field. Protected by drm_global_mutex. * @unique_len: Length of unique field. Protected by drm_global_mutex.
* @magic_map: Map of used authentication tokens. Protected by struct_mutex. * @magic_map: Map of used authentication tokens. Protected by struct_mutex.
* @lock: DRI lock information. * @lock: DRI lock information.
* @driver_priv: Pointer to driver-private information. * @driver_priv: Pointer to driver-private information.
*
* Note that master structures are only relevant for the legacy/primary device
* nodes, hence there can only be one per device, not one per drm_minor.
*/ */
struct drm_master { struct drm_master {
struct kref refcount; struct kref refcount;
struct drm_minor *minor; struct drm_device *dev;
char *unique; char *unique;
int unique_len; int unique_len;
struct idr magic_map; struct idr magic_map;