summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_internal.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-06-14 20:50:58 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-06-16 10:16:58 +0200
commit34a839c689b093dac6bccc4e0aa6feffcf4c970e (patch)
tree4a6a6414c47a98daae69d218c100a6a8a846d736 /drivers/gpu/drm/drm_internal.h
parentdrm: Hide hw.lock cleanup in filp->release better (diff)
downloadlinux-34a839c689b093dac6bccc4e0aa6feffcf4c970e.tar.xz
linux-34a839c689b093dac6bccc4e0aa6feffcf4c970e.zip
drm: Link directly from drm_master to drm_device
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
Diffstat (limited to 'drivers/gpu/drm/drm_internal.h')
-rw-r--r--drivers/gpu/drm/drm_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 56a9b1cf99d7..f5c1d17fa51f 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -92,7 +92,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);
-struct drm_master *drm_master_create(struct drm_minor *minor);
+struct drm_master *drm_master_create(struct drm_device *dev);
/* drm_debugfs.c */
#if defined(CONFIG_DEBUG_FS)