]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "drm: drop redundant drm_file->is_master"
authorDave Airlie <airlied@gmail.com>
Thu, 7 Aug 2014 21:30:53 +0000 (07:30 +1000)
committerDave Airlie <airlied@gmail.com>
Thu, 7 Aug 2014 21:30:53 +0000 (07:30 +1000)
commit4bad65ef9f5ee74967adc505e3a688ce08c0df78
tree9829f2d38b6df9f5a07c349766e77b002cb34539
parent6f1f10b36711913a13dfd7f6fdd93086993f0906
Revert "drm: drop redundant drm_file->is_master"

This reverts commit e82486b6f36a4629d1864e6e166c6bc72ecf8f84.

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
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_drv.c
drivers/gpu/drm/drm_fops.c
drivers/gpu/drm/drm_ioctl.c
drivers/gpu/drm/drm_lock.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/staging/imx-drm/imx-drm-core.c
include/drm/drmP.h