diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-08-07 23:30:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-08-07 23:30:53 +0200 |
| commit | 7963e9db1b1f842fdc53309baa8714d38e9f5681 (patch) | |
| tree | 9829f2d38b6df9f5a07c349766e77b002cb34539 /drivers/gpu/drm/drm_lock.c | |
| parent | Merge tag 'drm/tegra/for-3.17-rc1' of git://anongit.freedesktop.org/tegra/lin... (diff) | |
| download | linux-7963e9db1b1f842fdc53309baa8714d38e9f5681.tar.xz linux-7963e9db1b1f842fdc53309baa8714d38e9f5681.zip | |
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_lock.c')
| -rw-r--r-- | drivers/gpu/drm/drm_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index ea1572596578..e26b59e385ff 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -112,7 +112,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) /* don't set the block all signals on the master process for now * really probably not the correct answer but lets us debug xkb * xserver for now */ - if (!drm_is_master(file_priv)) { + if (!file_priv->is_master) { sigemptyset(&dev->sigmask); sigaddset(&dev->sigmask, SIGSTOP); sigaddset(&dev->sigmask, SIGTSTP); |