aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2014-08-08 07:30:53 +1000
committerDave Airlie <airlied@gmail.com>2014-08-08 07:30:53 +1000
commit7963e9db1b1f842fdc53309baa8714d38e9f5681 (patch)
tree9829f2d38b6df9f5a07c349766e77b002cb34539 /drivers/staging
parentfa1d0ee69ca8c123dd791d52830a2e146985ce85 (diff)
downloadlinux-stericsson-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/staging')
-rw-r--r--drivers/staging/imx-drm/imx-drm-core.c2
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++)