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/staging/imx-drm | |
| parent | Merge tag 'drm/tegra/for-3.17-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next (diff) | |
| download | linux-dev-7963e9db1b1f842fdc53309baa8714d38e9f5681.tar.xz linux-dev-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/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 72913b299047..6f54ff4f9372 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -182,7 +182,7 @@ static void imx_drm_driver_preclose(struct drm_device *drm, { int i; - if (!drm_is_master(file)) + if (!file->is_master) return; for (i = 0; i < MAX_CRTC; i++) |