From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 07/14] drm: Only do the hw.lock cleanup in
	master_relase for !MODESET
Date: Tue, 14 Jun 2016 20:51:02 +0200
Message-ID: <1465930269-7883-8-git-send-email-daniel.vetter@ffwll.ch>
References: <1465930269-7883-1-git-send-email-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <1465930269-7883-1-git-send-email-daniel.vetter@ffwll.ch>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com>
List-Id: dri-devel@lists.freedesktop.org

QW5vdGhlciBwbGFjZSBnb25lIHdoZXJlIG1vZGVybiBkcml2ZXJzIGNvdWxkIGhhdmUgaGl0CmRl
di0+c3RydWN0X211dGV4LgoKVG8gYXZvaWQgdG9vIGRlZXBseSBuZXN0aW5nIGNvbnRyb2wgZmxv
dyByZXdvcmsgaXQgYSBiaXQuCgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu
dmV0dGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F1dGguYyB8IDIwICsr
KysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOCBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1dGguYyBiL2Ry
aXZlcnMvZ3B1L2RybS9kcm1fYXV0aC5jCmluZGV4IGUwMTVhN2VkYjE1NC4uYTU4YjJlYjBkMDA0
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1dGguYworKysgYi9kcml2ZXJzL2dw
dS9kcm0vZHJtX2F1dGguYwpAQCAtMjQ2LDExICsyNDYsMTQgQEAgaW50IGRybV9tYXN0ZXJfb3Bl
bihzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIHZvaWQgZHJtX21hc3Rlcl9yZWxlYXNlKHN0
cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBm
aWxlX3ByaXYtPm1pbm9yLT5kZXY7CisJc3RydWN0IGRybV9tYXN0ZXIgKm1hc3RlciA9IGZpbGVf
cHJpdi0+bWFzdGVyOworCiAKIAltdXRleF9sb2NrKCZkZXYtPm1hc3Rlcl9tdXRleCk7Ci0JaWYg
KGZpbGVfcHJpdi0+aXNfbWFzdGVyKSB7Ci0JCXN0cnVjdCBkcm1fbWFzdGVyICptYXN0ZXIgPSBm
aWxlX3ByaXYtPm1hc3RlcjsKKwlpZiAoIWZpbGVfcHJpdi0+aXNfbWFzdGVyKQorCQlnb3RvIG91
dF91bmxvY2s7CiAKKwlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfTU9E
RVNFVCkpIHsKIAkJLyoKIAkJICogU2luY2UgdGhlIG1hc3RlciBpcyBkaXNhcHBlYXJpbmcsIHNv
IGlzIHRoZQogCQkgKiBwb3NzaWJpbGl0eSB0byBsb2NrLgpAQCAtMjY0LDE5ICsyNjcsMjAgQEAg
dm9pZCBkcm1fbWFzdGVyX3JlbGVhc2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAJCQl3
YWtlX3VwX2ludGVycnVwdGlibGVfYWxsKCZtYXN0ZXItPmxvY2subG9ja19xdWV1ZSk7CiAJCX0K
IAkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJfQogCi0JCWlmIChmaWxlX3By
aXYtPm1pbm9yLT5tYXN0ZXIgPT0gZmlsZV9wcml2LT5tYXN0ZXIpIHsKLQkJCS8qIGRyb3AgdGhl
IHJlZmVyZW5jZSBoZWxkIG15IHRoZSBtaW5vciAqLwotCQkJaWYgKGRldi0+ZHJpdmVyLT5tYXN0
ZXJfZHJvcCkKLQkJCQlkZXYtPmRyaXZlci0+bWFzdGVyX2Ryb3AoZGV2LCBmaWxlX3ByaXYsIHRy
dWUpOwotCQkJZHJtX21hc3Rlcl9wdXQoJmZpbGVfcHJpdi0+bWlub3ItPm1hc3Rlcik7Ci0JCX0K
KwlpZiAoZmlsZV9wcml2LT5taW5vci0+bWFzdGVyID09IGZpbGVfcHJpdi0+bWFzdGVyKSB7CisJ
CS8qIGRyb3AgdGhlIHJlZmVyZW5jZSBoZWxkIG15IHRoZSBtaW5vciAqLworCQlpZiAoZGV2LT5k
cml2ZXItPm1hc3Rlcl9kcm9wKQorCQkJZGV2LT5kcml2ZXItPm1hc3Rlcl9kcm9wKGRldiwgZmls
ZV9wcml2LCB0cnVlKTsKKwkJZHJtX21hc3Rlcl9wdXQoJmZpbGVfcHJpdi0+bWlub3ItPm1hc3Rl
cik7CiAJfQogCiAJLyogZHJvcCB0aGUgbWFzdGVyIHJlZmVyZW5jZSBoZWxkIGJ5IHRoZSBmaWxl
IHByaXYgKi8KIAlpZiAoZmlsZV9wcml2LT5tYXN0ZXIpCiAJCWRybV9tYXN0ZXJfcHV0KCZmaWxl
X3ByaXYtPm1hc3Rlcik7CiAJZmlsZV9wcml2LT5pc19tYXN0ZXIgPSAwOworb3V0X3VubG9jazoK
IAltdXRleF91bmxvY2soJmRldi0+bWFzdGVyX211dGV4KTsKIH0KIAotLSAKMi44LjEKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls
aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy
ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=