From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 05/12] drm/legacy: move lock cleanup for master into lock file Date: Tue, 23 Apr 2019 12:00:34 +1000 Message-ID: <20190423020041.32702-6-airlied@gmail.com> References: <20190423020041.32702-1-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02457892FE for ; Tue, 23 Apr 2019 02:00:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86E93308FC20 for ; Tue, 23 Apr 2019 02:00:48 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (unknown [10.64.33.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF7675C29A for ; Tue, 23 Apr 2019 02:00:47 +0000 (UTC) In-Reply-To: <20190423020041.32702-1-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgbWFrZXMgaXQgZWFz aWVyIHRvIHJlbW92ZSBsZWdhY3kgY29kZSBsYXRlci4KClNpZ25lZC1vZmYtYnk6IERhdmUgQWly bGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMg ICB8IDE0ICstLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2xlZ2FjeS5oIHwgIDEg KwogZHJpdmVycy9ncHUvZHJtL2RybV9sb2NrLmMgICB8IDE2ICsrKysrKysrKysrKysrKysKIDMg ZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F1 dGguYwppbmRleCAxNjY5YzQyYzQwZWQuLmVmOGM0MzUzODI5YiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9hdXRoLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdXRoLmMKQEAg LTI3NSwxOSArMjc1LDcgQEAgdm9pZCBkcm1fbWFzdGVyX3JlbGVhc2Uoc3RydWN0IGRybV9maWxl ICpmaWxlX3ByaXYpCiAJCWdvdG8gb3V0OwogCiAJaWYgKGRybV9jb3JlX2NoZWNrX2ZlYXR1cmUo ZGV2LCBEUklWRVJfTEVHQUNZKSkgewotCQkvKgotCQkgKiBTaW5jZSB0aGUgbWFzdGVyIGlzIGRp c2FwcGVhcmluZywgc28gaXMgdGhlCi0JCSAqIHBvc3NpYmlsaXR5IHRvIGxvY2suCi0JCSAqLwot CQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWlmIChtYXN0ZXItPmxvY2suaHdf bG9jaykgewotCQkJaWYgKGRldi0+c2lnZGF0YS5sb2NrID09IG1hc3Rlci0+bG9jay5od19sb2Nr KQotCQkJCWRldi0+c2lnZGF0YS5sb2NrID0gTlVMTDsKLQkJCW1hc3Rlci0+bG9jay5od19sb2Nr ID0gTlVMTDsKLQkJCW1hc3Rlci0+bG9jay5maWxlX3ByaXYgPSBOVUxMOwotCQkJd2FrZV91cF9p bnRlcnJ1cHRpYmxlX2FsbCgmbWFzdGVyLT5sb2NrLmxvY2tfcXVldWUpOwotCQl9Ci0JCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCQlkcm1fbGVnYWN5X2xvY2tfbWFzdGVyX2Ns ZWFudXAoZGV2LCBtYXN0ZXIpOwogCX0KIAogCWlmIChkZXYtPm1hc3RlciA9PSBmaWxlX3ByaXYt Pm1hc3RlcikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbGVnYWN5LmggYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2xlZ2FjeS5oCmluZGV4IDNkYzYyNjA5MGZjYi4uOTc0YzJiZTZiY2Q1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2xlZ2FjeS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fbGVnYWN5LmgKQEAgLTEyNiw0ICsxMjYsNSBAQCBpbnQgZHJtX2xlZ2FjeV9z Z19hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogaW50IGRybV9sZWdh Y3lfc2dfZnJlZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkgICAgICAg c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwogCit2b2lkIGRybV9sZWdhY3lfbG9ja19tYXN0 ZXJfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX21hc3RlciAqbWFz dGVyKTsKICNlbmRpZiAvKiBfX0RSTV9MRUdBQ1lfSF9fICovCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2xvY2suYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbG9jay5jCmluZGV4IDY3 YTFhMmNhNzE3NC4uYjM3ODc0YTE1ZTIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2xvY2suYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2xvY2suYwpAQCAtMzQ3LDMgKzM0Nywx OSBAQCB2b2lkIGRybV9sZWdhY3lfbG9ja19yZWxlYXNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBmaWxlICpmaWxwKQogCQkJCSAgICAgX0RSTV9MT0NLSU5HX0NPTlRFWFQoZmlsZV9w cml2LT5tYXN0ZXItPmxvY2suaHdfbG9jay0+bG9jaykpOwogCX0KIH0KKwordm9pZCBkcm1fbGVn YWN5X2xvY2tfbWFzdGVyX2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRy bV9tYXN0ZXIgKm1hc3RlcikKK3sKKwkvKgorCSAqIFNpbmNlIHRoZSBtYXN0ZXIgaXMgZGlzYXBw ZWFyaW5nLCBzbyBpcyB0aGUKKwkgKiBwb3NzaWJpbGl0eSB0byBsb2NrLgorCSAqLwltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJaWYgKG1hc3Rlci0+bG9jay5od19sb2NrKSB7CisJ CWlmIChkZXYtPnNpZ2RhdGEubG9jayA9PSBtYXN0ZXItPmxvY2suaHdfbG9jaykKKwkJCWRldi0+ c2lnZGF0YS5sb2NrID0gTlVMTDsKKwkJbWFzdGVyLT5sb2NrLmh3X2xvY2sgPSBOVUxMOworCQlt YXN0ZXItPmxvY2suZmlsZV9wcml2ID0gTlVMTDsKKwkJd2FrZV91cF9pbnRlcnJ1cHRpYmxlX2Fs bCgmbWFzdGVyLT5sb2NrLmxvY2tfcXVldWUpOworCX0KKwltdXRleF91bmxvY2soJmRldi0+c3Ry dWN0X211dGV4KTsKK30KLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVs