diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-14 20:50:58 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-16 10:16:58 +0200 |
| commit | 34a839c689b093dac6bccc4e0aa6feffcf4c970e (patch) | |
| tree | 4a6a6414c47a98daae69d218c100a6a8a846d736 /drivers/gpu/drm/drm_fops.c | |
| parent | 1a75a222f5ca1063249b5c92972d32dcc3c8966e (diff) | |
| download | op-kernel-dev-34a839c689b093dac6bccc4e0aa6feffcf4c970e.zip op-kernel-dev-34a839c689b093dac6bccc4e0aa6feffcf4c970e.tar.gz | |
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_fops.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 2fd4f42..bfbf138 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -185,7 +185,7 @@ int drm_new_set_master(struct drm_device *dev, struct drm_file *fpriv) lockdep_assert_held_once(&dev->master_mutex); /* 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) return -ENOMEM; |
