From: Dave Airlie <airlied@gmail.com>
Date: Thu, 7 Aug 2014 21:30:53 +0000 (+1000)
Subject: Revert "drm: drop redundant drm_file->is_master"
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7963e9db1b1f842fdc53309baa8714d38e9f5681;p=pandora-kernel.git

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
---

Reading git-diff-tree failed