From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 15/24] drm/radeon: remove recursive mutex implementation Date: Wed, 25 Apr 2012 15:03:20 -0400 Message-ID: <1335380609-5804-16-git-send-email-j.glisse@gmail.com> References: <1335380609-5804-1-git-send-email-j.glisse@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 3ECDDA0923 for ; Wed, 25 Apr 2012 12:04:07 -0700 (PDT) Received: by mail-qc0-f177.google.com with SMTP id u28so327267qcs.36 for ; Wed, 25 Apr 2012 12:04:07 -0700 (PDT) In-Reply-To: <1335380609-5804-1-git-send-email-j.glisse@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+CgpOb3QgbmVl ZGVkIGFueW1vcmUuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxkZWF0aHNpbXBs ZUB2b2RhZm9uZS5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oICAgICAg ICB8ICAgNDQgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2NzLmMgICAgIHwgICAxMCArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2RldmljZS5jIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZ2FydC5jICAgfCAgIDE2ICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZ2VtLmMgICAgfCAgICA0ICstCiA1IGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlv bnMoKyksIDU5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uLmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCmluZGV4IGM3ZjE0 ZDcuLjZlYzQwMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaApAQCAtMTU1LDQ4ICsxNTUsNiBA QCBzdGF0aWMgaW5saW5lIGludCByYWRlb25fYXRybV9nZXRfYmlvc19jaHVuayh1aW50OF90ICpi aW9zLCBpbnQgb2Zmc2V0LCBpbnQgbGVuKQogI2VuZGlmCiBib29sIHJhZGVvbl9nZXRfYmlvcyhz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldik7CiAKLQotLyoKLSAqIE11dGV4IHdoaWNoIGFsbG93 cyByZWN1cnNpdmUgbG9ja2luZyBmcm9tIHRoZSBzYW1lIHByb2Nlc3MuCi0gKi8KLXN0cnVjdCBy YWRlb25fbXV0ZXggewotCXN0cnVjdCBtdXRleAkJbXV0ZXg7Ci0Jc3RydWN0IHRhc2tfc3RydWN0 CSpvd25lcjsKLQlpbnQJCQlsZXZlbDsKLX07Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25f bXV0ZXhfaW5pdChzdHJ1Y3QgcmFkZW9uX211dGV4ICptdXRleCkKLXsKLQltdXRleF9pbml0KCZt dXRleC0+bXV0ZXgpOwotCW11dGV4LT5vd25lciA9IE5VTEw7Ci0JbXV0ZXgtPmxldmVsID0gMDsK LX0KLQotc3RhdGljIGlubGluZSB2b2lkIHJhZGVvbl9tdXRleF9sb2NrKHN0cnVjdCByYWRlb25f bXV0ZXggKm11dGV4KQotewotCWlmIChtdXRleF90cnlsb2NrKCZtdXRleC0+bXV0ZXgpKSB7Ci0J CS8qIFRoZSBtdXRleCB3YXMgdW5sb2NrZWQgYmVmb3JlLCBzbyBpdCdzIG91cnMgbm93ICovCi0J CW11dGV4LT5vd25lciA9IGN1cnJlbnQ7Ci0JfSBlbHNlIGlmIChtdXRleC0+b3duZXIgIT0gY3Vy cmVudCkgewotCQkvKiBBbm90aGVyIHByb2Nlc3MgbG9ja2VkIHRoZSBtdXRleCwgdGFrZSBpdCAq LwotCQltdXRleF9sb2NrKCZtdXRleC0+bXV0ZXgpOwotCQltdXRleC0+b3duZXIgPSBjdXJyZW50 OwotCX0KLQkvKiBPdGhlcndpc2UgdGhlIG11dGV4IHdhcyBhbHJlYWR5IGxvY2tlZCBieSB0aGlz IHByb2Nlc3MgKi8KLQotCW11dGV4LT5sZXZlbCsrOwotfQotCi1zdGF0aWMgaW5saW5lIHZvaWQg cmFkZW9uX211dGV4X3VubG9jayhzdHJ1Y3QgcmFkZW9uX211dGV4ICptdXRleCkKLXsKLQlpZiAo LS1tdXRleC0+bGV2ZWwgPiAwKQotCQlyZXR1cm47Ci0KLQltdXRleC0+b3duZXIgPSBOVUxMOwot CW11dGV4X3VubG9jaygmbXV0ZXgtPm11dGV4KTsKLX0KLQotCiAvKgogICogRHVtbXkgcGFnZQog ICovCkBAIC0xNDk3LDcgKzE0NTUsNyBAQCBzdHJ1Y3QgcmFkZW9uX2RldmljZSB7CiAJc3RydWN0 IHJhZGVvbl9nZW0JCWdlbTsKIAlzdHJ1Y3QgcmFkZW9uX3BtCQlwbTsKIAl1aW50MzJfdAkJCWJp b3Nfc2NyYXRjaFtSQURFT05fQklPU19OVU1fU0NSQVRDSF07Ci0Jc3RydWN0IHJhZGVvbl9tdXRl eAkJY3NfbXV0ZXg7CisJc3RydWN0IG11dGV4CQkJY3NfbXV0ZXg7CiAJc3RydWN0IHJhZGVvbl93 YgkJd2I7CiAJc3RydWN0IHJhZGVvbl9kdW1teV9wYWdlCWR1bW15X3BhZ2U7CiAJYm9vbAkJCQlz aHV0ZG93bjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jCmluZGV4IGEwODI2YmIuLjM4ZTE0 OTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYwpAQCAtNTA1LDkgKzUwNSw5IEBAIGlu dCByYWRlb25fY3NfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3Ry dWN0IGRybV9maWxlICpmaWxwKQogCXN0cnVjdCByYWRlb25fY3NfcGFyc2VyIHBhcnNlcjsKIAlp bnQgcjsKIAotCXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfbG9j aygmcmRldi0+Y3NfbXV0ZXgpOwogCWlmICghcmRldi0+YWNjZWxfd29ya2luZykgewotCQlyYWRl b25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4X3VubG9jaygmcmRldi0+ Y3NfbXV0ZXgpOwogCQlyZXR1cm4gLUVCVVNZOwogCX0KIAkvKiBpbml0aWFsaXplIHBhcnNlciAq LwpAQCAtNTIxLDcgKzUyMSw3IEBAIGludCByYWRlb25fY3NfaW9jdGwoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxwKQogCQlEUk1fRVJST1Io IkZhaWxlZCB0byBpbml0aWFsaXplIHBhcnNlciAhXG4iKTsKIAkJcmFkZW9uX2NzX3BhcnNlcl9m aW5pKCZwYXJzZXIsIHIpOwogCQlyID0gcmFkZW9uX2NzX2hhbmRsZV9sb2NrdXAocmRldiwgcik7 Ci0JCXJhZGVvbl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwkJbXV0ZXhfdW5sb2Nr KCZyZGV2LT5jc19tdXRleCk7CiAJCXJldHVybiByOwogCX0KIAlyID0gcmFkZW9uX2NzX3BhcnNl cl9yZWxvY3MoJnBhcnNlcik7CkBAIC01MzAsNyArNTMwLDcgQEAgaW50IHJhZGVvbl9jc19pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZp bHApCiAJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwYXJzZSByZWxvY2F0aW9uICVkIVxuIiwgcik7 CiAJCXJhZGVvbl9jc19wYXJzZXJfZmluaSgmcGFyc2VyLCByKTsKIAkJciA9IHJhZGVvbl9jc19o YW5kbGVfbG9ja3VwKHJkZXYsIHIpOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19t dXRleCk7CisJCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQlyZXR1cm4gcjsKIAl9 CiAJciA9IHJhZGVvbl9jc19pYl9jaHVuayhyZGV2LCAmcGFyc2VyKTsKQEAgLTU0NCw3ICs1NDQs NyBAQCBpbnQgcmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIG91dDoKIAlyYWRlb25fY3NfcGFyc2VyX2Zpbmko JnBhcnNlciwgcik7CiAJciA9IHJhZGVvbl9jc19oYW5kbGVfbG9ja3VwKHJkZXYsIHIpOwotCXJh ZGVvbl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwltdXRleF91bmxvY2soJnJkZXYt PmNzX211dGV4KTsKIAlyZXR1cm4gcjsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9k ZXZpY2UuYwppbmRleCAxZGFjMjdkLi41ZGY1M2RkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9kZXZpY2UuYwpAQCAtNzIyLDcgKzcyMiw3IEBAIGludCByYWRlb25fZGV2aWNlX2luaXQo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAKIAkvKiBtdXRleCBpbml0aWFsaXphdGlvbiBh cmUgYWxsIGRvbmUgaGVyZSBzbyB3ZQogCSAqIGNhbiByZWNhbGwgZnVuY3Rpb24gd2l0aG91dCBo YXZpbmcgbG9ja2luZyBpc3N1ZXMgKi8KLQlyYWRlb25fbXV0ZXhfaW5pdCgmcmRldi0+Y3NfbXV0 ZXgpOworCW11dGV4X2luaXQoJnJkZXYtPmNzX211dGV4KTsKIAlmb3IgKGkgPSAwOyBpIDwgUkFE RU9OX05VTV9SSU5HUzsgKytpKQogCQltdXRleF9pbml0KCZyZGV2LT5yaW5nW2ldLm11dGV4KTsK IAltdXRleF9pbml0KCZyZGV2LT5kY19od19pMmNfbXV0ZXgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2FydC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZ2FydC5jCmluZGV4IDIyMGRiYjguLmI0YTQ5ODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2dhcnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9nYXJ0LmMKQEAgLTM1NiwxMyArMzU2LDEzIEBAIGludCByYWRlb25fdm1fbWFuYWdl cl9zdXNwZW5kKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogewogCXN0cnVjdCByYWRlb25f dm0gKnZtLCAqdG1wOwogCi0JcmFkZW9uX211dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKKwlt dXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAJLyogdW5iaW5kIGFsbCBhY3RpdmUgdm0gKi8K IAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUodm0sIHRtcCwgJnJkZXYtPnZtX21hbmFnZXIubHJ1 X3ZtLCBsaXN0KSB7CiAJCXJhZGVvbl92bV91bmJpbmRfbG9ja2VkKHJkZXYsIHZtKTsKIAl9CiAJ cmRldi0+dm1fbWFuYWdlci5mdW5jcy0+ZmluaShyZGV2KTsKLQlyYWRlb25fbXV0ZXhfdW5sb2Nr KCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAJcmV0 dXJuIHJhZGVvbl9zYV9ib19tYW5hZ2VyX3N1c3BlbmQocmRldiwgJnJkZXYtPnZtX21hbmFnZXIu c2FfbWFuYWdlcik7CiB9CiAKQEAgLTQ4MCw5ICs0ODAsOSBAQCBpbnQgcmFkZW9uX3ZtX2JvX2Fk ZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAlpZiAobGFzdF9wZm4gPiB2bS0+bGFzdF9w Zm4pIHsKIAkJLyogZ3JvdyB2YSBzcGFjZSAzMk0gYnkgMzJNICovCiAJCXVuc2lnbmVkIGFsaWdu ID0gKCgzMiA8PCAyMCkgPj4gMTIpIC0gMTsKLQkJcmFkZW9uX211dGV4X2xvY2soJnJkZXYtPmNz X211dGV4KTsKKwkJbXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQlyYWRlb25fdm1fdW5i aW5kX2xvY2tlZChyZGV2LCB2bSk7Ci0JCXJhZGVvbl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211 dGV4KTsKKwkJbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAJCXZtLT5sYXN0X3BmbiA9 IChsYXN0X3BmbiArIGFsaWduKSAmIH5hbGlnbjsKIAl9CiAJaGVhZCA9ICZ2bS0+dmE7CkBAIC01 OTgsOSArNTk4LDkgQEAgaW50IHJhZGVvbl92bV9ib19ybXYoc3RydWN0IHJhZGVvbl9kZXZpY2Ug KnJkZXYsCiAJCXJldHVybiAwOwogCiAJbXV0ZXhfbG9jaygmdm0tPm11dGV4KTsKLQlyYWRlb25f bXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCW11dGV4X2xvY2soJnJkZXYtPmNzX211dGV4 KTsKIAlyYWRlb25fdm1fYm9fdXBkYXRlX3B0ZShyZGV2LCB2bSwgYm8sIE5VTEwpOwotCXJhZGVv bl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwltdXRleF91bmxvY2soJnJkZXYtPmNz X211dGV4KTsKIAlsaXN0X2RlbCgmYm9fdmEtPnZtX2xpc3QpOwogCW11dGV4X3VubG9jaygmdm0t Pm11dGV4KTsKIAlsaXN0X2RlbCgmYm9fdmEtPmJvX2xpc3QpOwpAQCAtNjQ1LDkgKzY0NSw5IEBA IHZvaWQgcmFkZW9uX3ZtX2Zpbmkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHN0cnVjdCBy YWRlb25fdm0gKnZtKQogCiAJbXV0ZXhfbG9jaygmdm0tPm11dGV4KTsKIAotCXJhZGVvbl9tdXRl eF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOwog CXJhZGVvbl92bV91bmJpbmRfbG9ja2VkKHJkZXYsIHZtKTsKLQlyYWRlb25fbXV0ZXhfdW5sb2Nr KCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAKIAkv KiByZW1vdmUgYWxsIGJvICovCiAJciA9IHJhZGVvbl9ib19yZXNlcnZlKHJkZXYtPnNhX21hbmFn ZXIuYm8sIGZhbHNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2VtLmMKaW5kZXggZTE1Y2Ix Zi4uYmQ0NTIxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Vt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2VtLmMKQEAgLTE1NywxMSAr MTU3LDExIEBAIHZvaWQgcmFkZW9uX2dlbV9vYmplY3RfY2xvc2Uoc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmosCiBzdGF0aWMgaW50IHJhZGVvbl9nZW1faGFuZGxlX2xvY2t1cChzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiwgaW50IHIpCiB7CiAJaWYgKHIgPT0gLUVERUFETEspIHsKLQkJcmFk ZW9uX211dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKKwkJbXV0ZXhfbG9jaygmcmRldi0+Y3Nf bXV0ZXgpOwogCQlyID0gcmFkZW9uX2dwdV9yZXNldChyZGV2KTsKIAkJaWYgKCFyKQogCQkJciA9 IC1FQUdBSU47Ci0JCXJhZGVvbl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwkJbXV0 ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAJfQogCXJldHVybiByOwogfQotLSAKMS43Ljcu NgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK