diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-08-08 07:30:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-08-08 07:30:53 +1000 |
| commit | 7963e9db1b1f842fdc53309baa8714d38e9f5681 (patch) | |
| tree | 9829f2d38b6df9f5a07c349766e77b002cb34539 /drivers/gpu/drm/drm_ioctl.c | |
| parent | fa1d0ee69ca8c123dd791d52830a2e146985ce85 (diff) | |
| download | linux-7963e9db1b1f842fdc53309baa8714d38e9f5681.tar.gz | |
Revert "drm: drop redundant drm_file->is_master"
This reverts commit 48ba813701eb14b3008edefef4a0789b328e278c. Thanks to Chris: "drm_file->is_master is not synomous with having drm_file->master == drm_file->minor->master. This is because drm_file->master is the same for all drm_files of the same generation and so when there is a master, every drm_file believes itself to be the master. Confusion ensues and things go pear shaped when one file is closed and there is no master anymore." Conflicts: drivers/gpu/drm/drm_drv.c drivers/gpu/drm/drm_stub.c
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index d3d1a8c72e98..40be746b7e68 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -607,7 +607,7 @@ static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) return -EACCES; /* MASTER is only for master or control clients */ - if (unlikely((flags & DRM_MASTER) && !drm_is_master(file_priv) && + if (unlikely((flags & DRM_MASTER) && !file_priv->is_master && !drm_is_control_client(file_priv))) return -EACCES; |