diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-14 20:51:00 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 10:17:42 +0200 |
| commit | 2cbae7e63747c917b08a505e44b31ec8b4ee5583 (patch) | |
| tree | 0d36159dc7956c404740d45ce70c295ecb19422f /drivers/gpu/drm/drm_internal.h | |
| parent | 6548f4e7a3babf9fd6c52e02da419458e19e2db9 (diff) | |
drm: Extract drm_master_open
And pull out the primary_client check to make it really obvious that
this can't happen on control/render nodes. Bonus that we can avoid the
master lock in this case.
v2: Don't leak locks on error path (and simplify control flow while
at it), reported by Julia.
Cc: Julia Lawall <julia.lawall@lip6.fr>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1465930269-7883-6-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_internal.h')
| -rw-r--r-- | drivers/gpu/drm/drm_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index d29d426f633f..2b9a94f679ed 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -66,7 +66,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int drm_dropmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); -int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv); +int drm_master_open(struct drm_file *file_priv); /* drm_sysfs.c */ extern struct class *drm_class; |