From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 21/27] drm/radeon: remove recursive mutex implementation Date: Tue, 1 May 2012 13:19:31 -0400 Message-ID: <1335892777-7357-22-git-send-email-j.glisse@gmail.com> References: <ยท> <1335892777-7357-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-qa0-f48.google.com (mail-qa0-f48.google.com [209.85.216.48]) by gabe.freedesktop.org (Postfix) with ESMTP id D0C0D9EB56 for ; Tue, 1 May 2012 10:20:26 -0700 (PDT) Received: by mail-qa0-f48.google.com with SMTP id y23so2625266qad.14 for ; Tue, 01 May 2012 10:20:26 -0700 (PDT) In-Reply-To: <1335892777-7357-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 ZUB2b2RhZm9uZS5kZT4KUmV2aWV3ZWQtYnk6IEplcm9tZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICAgNDQg Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2NzLmMgICAgIHwgICAxMCArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFk ZW9uX2RldmljZS5jIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Fy dC5jICAgfCAgIDE2ICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f Z2VtLmMgICAgfCAgICA0ICstCiA1IGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDU5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u LmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCmluZGV4IGEyMzE1NjYuLmQ1NzMz NTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaApAQCAtMTU1LDQ4ICsxNTUsNiBAQCBzdGF0aWMg aW5saW5lIGludCByYWRlb25fYXRybV9nZXRfYmlvc19jaHVuayh1aW50OF90ICpiaW9zLCBpbnQg b2Zmc2V0LCBpbnQgbGVuKQogI2VuZGlmCiBib29sIHJhZGVvbl9nZXRfYmlvcyhzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldik7CiAKLQotLyoKLSAqIE11dGV4IHdoaWNoIGFsbG93cyByZWN1cnNp dmUgbG9ja2luZyBmcm9tIHRoZSBzYW1lIHByb2Nlc3MuCi0gKi8KLXN0cnVjdCByYWRlb25fbXV0 ZXggewotCXN0cnVjdCBtdXRleAkJbXV0ZXg7Ci0Jc3RydWN0IHRhc2tfc3RydWN0CSpvd25lcjsK LQlpbnQJCQlsZXZlbDsKLX07Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25fbXV0ZXhfaW5p dChzdHJ1Y3QgcmFkZW9uX211dGV4ICptdXRleCkKLXsKLQltdXRleF9pbml0KCZtdXRleC0+bXV0 ZXgpOwotCW11dGV4LT5vd25lciA9IE5VTEw7Ci0JbXV0ZXgtPmxldmVsID0gMDsKLX0KLQotc3Rh dGljIGlubGluZSB2b2lkIHJhZGVvbl9tdXRleF9sb2NrKHN0cnVjdCByYWRlb25fbXV0ZXggKm11 dGV4KQotewotCWlmIChtdXRleF90cnlsb2NrKCZtdXRleC0+bXV0ZXgpKSB7Ci0JCS8qIFRoZSBt dXRleCB3YXMgdW5sb2NrZWQgYmVmb3JlLCBzbyBpdCdzIG91cnMgbm93ICovCi0JCW11dGV4LT5v d25lciA9IGN1cnJlbnQ7Ci0JfSBlbHNlIGlmIChtdXRleC0+b3duZXIgIT0gY3VycmVudCkgewot CQkvKiBBbm90aGVyIHByb2Nlc3MgbG9ja2VkIHRoZSBtdXRleCwgdGFrZSBpdCAqLwotCQltdXRl eF9sb2NrKCZtdXRleC0+bXV0ZXgpOwotCQltdXRleC0+b3duZXIgPSBjdXJyZW50OwotCX0KLQkv KiBPdGhlcndpc2UgdGhlIG11dGV4IHdhcyBhbHJlYWR5IGxvY2tlZCBieSB0aGlzIHByb2Nlc3Mg Ki8KLQotCW11dGV4LT5sZXZlbCsrOwotfQotCi1zdGF0aWMgaW5saW5lIHZvaWQgcmFkZW9uX211 dGV4X3VubG9jayhzdHJ1Y3QgcmFkZW9uX211dGV4ICptdXRleCkKLXsKLQlpZiAoLS1tdXRleC0+ bGV2ZWwgPiAwKQotCQlyZXR1cm47Ci0KLQltdXRleC0+b3duZXIgPSBOVUxMOwotCW11dGV4X3Vu bG9jaygmbXV0ZXgtPm11dGV4KTsKLX0KLQotCiAvKgogICogRHVtbXkgcGFnZQogICovCkBAIC0x NTA1LDcgKzE0NjMsNyBAQCBzdHJ1Y3QgcmFkZW9uX2RldmljZSB7CiAJc3RydWN0IHJhZGVvbl9n ZW0JCWdlbTsKIAlzdHJ1Y3QgcmFkZW9uX3BtCQlwbTsKIAl1aW50MzJfdAkJCWJpb3Nfc2NyYXRj aFtSQURFT05fQklPU19OVU1fU0NSQVRDSF07Ci0Jc3RydWN0IHJhZGVvbl9tdXRleAkJY3NfbXV0 ZXg7CisJc3RydWN0IG11dGV4CQkJY3NfbXV0ZXg7CiAJc3RydWN0IHJhZGVvbl93YgkJd2I7CiAJ c3RydWN0IHJhZGVvbl9kdW1teV9wYWdlCWR1bW15X3BhZ2U7CiAJYm9vbAkJCQlzaHV0ZG93bjsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jCmluZGV4IGEwODI2YmIuLjM4ZTE0OTYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYwpAQCAtNTA1LDkgKzUwNSw5IEBAIGludCByYWRlb25f Y3NfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9m aWxlICpmaWxwKQogCXN0cnVjdCByYWRlb25fY3NfcGFyc2VyIHBhcnNlcjsKIAlpbnQgcjsKIAot CXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfbG9jaygmcmRldi0+ Y3NfbXV0ZXgpOwogCWlmICghcmRldi0+YWNjZWxfd29ya2luZykgewotCQlyYWRlb25fbXV0ZXhf dW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgp OwogCQlyZXR1cm4gLUVCVVNZOwogCX0KIAkvKiBpbml0aWFsaXplIHBhcnNlciAqLwpAQCAtNTIx LDcgKzUyMSw3IEBAIGludCByYWRlb25fY3NfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxwKQogCQlEUk1fRVJST1IoIkZhaWxlZCB0 byBpbml0aWFsaXplIHBhcnNlciAhXG4iKTsKIAkJcmFkZW9uX2NzX3BhcnNlcl9maW5pKCZwYXJz ZXIsIHIpOwogCQlyID0gcmFkZW9uX2NzX2hhbmRsZV9sb2NrdXAocmRldiwgcik7Ci0JCXJhZGVv bl9tdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwkJbXV0ZXhfdW5sb2NrKCZyZGV2LT5j c19tdXRleCk7CiAJCXJldHVybiByOwogCX0KIAlyID0gcmFkZW9uX2NzX3BhcnNlcl9yZWxvY3Mo JnBhcnNlcik7CkBAIC01MzAsNyArNTMwLDcgQEAgaW50IHJhZGVvbl9jc19pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCiAJCQlE Uk1fRVJST1IoIkZhaWxlZCB0byBwYXJzZSByZWxvY2F0aW9uICVkIVxuIiwgcik7CiAJCXJhZGVv bl9jc19wYXJzZXJfZmluaSgmcGFyc2VyLCByKTsKIAkJciA9IHJhZGVvbl9jc19oYW5kbGVfbG9j a3VwKHJkZXYsIHIpOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJ CW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQlyZXR1cm4gcjsKIAl9CiAJciA9IHJh ZGVvbl9jc19pYl9jaHVuayhyZGV2LCAmcGFyc2VyKTsKQEAgLTU0NCw3ICs1NDQsNyBAQCBpbnQg cmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVj dCBkcm1fZmlsZSAqZmlscCkKIG91dDoKIAlyYWRlb25fY3NfcGFyc2VyX2ZpbmkoJnBhcnNlciwg cik7CiAJciA9IHJhZGVvbl9jc19oYW5kbGVfbG9ja3VwKHJkZXYsIHIpOwotCXJhZGVvbl9tdXRl eF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKKwltdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4 KTsKIAlyZXR1cm4gcjsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwpp bmRleCAxZGFjMjdkLi41ZGY1M2RkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZp Y2UuYwpAQCAtNzIyLDcgKzcyMiw3IEBAIGludCByYWRlb25fZGV2aWNlX2luaXQoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYsCiAKIAkvKiBtdXRleCBpbml0aWFsaXphdGlvbiBhcmUgYWxsIGRv bmUgaGVyZSBzbyB3ZQogCSAqIGNhbiByZWNhbGwgZnVuY3Rpb24gd2l0aG91dCBoYXZpbmcgbG9j a2luZyBpc3N1ZXMgKi8KLQlyYWRlb25fbXV0ZXhfaW5pdCgmcmRldi0+Y3NfbXV0ZXgpOworCW11 dGV4X2luaXQoJnJkZXYtPmNzX211dGV4KTsKIAlmb3IgKGkgPSAwOyBpIDwgUkFERU9OX05VTV9S SU5HUzsgKytpKQogCQltdXRleF9pbml0KCZyZGV2LT5yaW5nW2ldLm11dGV4KTsKIAltdXRleF9p bml0KCZyZGV2LT5kY19od19pMmNfbXV0ZXgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fZ2FydC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Fy dC5jCmluZGV4IDhlYmExYzYuLjcxYjI4ZTkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9nYXJ0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f Z2FydC5jCkBAIC0zNTYsMTMgKzM1NiwxMyBAQCBpbnQgcmFkZW9uX3ZtX21hbmFnZXJfc3VzcGVu ZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIHsKIAlzdHJ1Y3QgcmFkZW9uX3ZtICp2bSwg KnRtcDsKIAotCXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfbG9j aygmcmRldi0+Y3NfbXV0ZXgpOwogCS8qIHVuYmluZCBhbGwgYWN0aXZlIHZtICovCiAJbGlzdF9m b3JfZWFjaF9lbnRyeV9zYWZlKHZtLCB0bXAsICZyZGV2LT52bV9tYW5hZ2VyLmxydV92bSwgbGlz dCkgewogCQlyYWRlb25fdm1fdW5iaW5kX2xvY2tlZChyZGV2LCB2bSk7CiAJfQogCXJkZXYtPnZt X21hbmFnZXIuZnVuY3MtPmZpbmkocmRldik7Ci0JcmFkZW9uX211dGV4X3VubG9jaygmcmRldi0+ Y3NfbXV0ZXgpOworCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCXJldHVybiByYWRl b25fc2FfYm9fbWFuYWdlcl9zdXNwZW5kKHJkZXYsICZyZGV2LT52bV9tYW5hZ2VyLnNhX21hbmFn ZXIpOwogfQogCkBAIC00NzgsOSArNDc4LDkgQEAgaW50IHJhZGVvbl92bV9ib19hZGQoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJaWYgKGxhc3RfcGZuID4gdm0tPmxhc3RfcGZuKSB7CiAJ CS8qIGdyb3cgdmEgc3BhY2UgMzJNIGJ5IDMyTSAqLwogCQl1bnNpZ25lZCBhbGlnbiA9ICgoMzIg PDwgMjApID4+IDEyKSAtIDE7Ci0JCXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7 CisJCW11dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKIAkJcmFkZW9uX3ZtX3VuYmluZF9sb2Nr ZWQocmRldiwgdm0pOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJ CW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQl2bS0+bGFzdF9wZm4gPSAobGFzdF9w Zm4gKyBhbGlnbikgJiB+YWxpZ247CiAJfQogCWhlYWQgPSAmdm0tPnZhOwpAQCAtNTk2LDkgKzU5 Niw5IEBAIGludCByYWRlb25fdm1fYm9fcm12KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAog CQlyZXR1cm4gMDsKIAogCW11dGV4X2xvY2soJnZtLT5tdXRleCk7Ci0JcmFkZW9uX211dGV4X2xv Y2soJnJkZXYtPmNzX211dGV4KTsKKwltdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CiAJcmFk ZW9uX3ZtX2JvX3VwZGF0ZV9wdGUocmRldiwgdm0sIGJvLCBOVUxMKTsKLQlyYWRlb25fbXV0ZXhf dW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7 CiAJbGlzdF9kZWwoJmJvX3ZhLT52bV9saXN0KTsKIAltdXRleF91bmxvY2soJnZtLT5tdXRleCk7 CiAJbGlzdF9kZWwoJmJvX3ZhLT5ib19saXN0KTsKQEAgLTY0Myw5ICs2NDMsOSBAQCB2b2lkIHJh ZGVvbl92bV9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBzdHJ1Y3QgcmFkZW9uX3Zt ICp2bSkKIAogCW11dGV4X2xvY2soJnZtLT5tdXRleCk7CiAKLQlyYWRlb25fbXV0ZXhfbG9jaygm cmRldi0+Y3NfbXV0ZXgpOworCW11dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKIAlyYWRlb25f dm1fdW5iaW5kX2xvY2tlZChyZGV2LCB2bSk7Ci0JcmFkZW9uX211dGV4X3VubG9jaygmcmRldi0+ Y3NfbXV0ZXgpOworCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCiAJLyogcmVtb3Zl IGFsbCBibyAqLwogCXIgPSByYWRlb25fYm9fcmVzZXJ2ZShyZGV2LT5zYV9tYW5hZ2VyLmJvLCBm YWxzZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5jCmluZGV4IGUxNWNiMWYuLmJkNDUy MWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5jCkBAIC0xNTcsMTEgKzE1NywxMSBA QCB2b2lkIHJhZGVvbl9nZW1fb2JqZWN0X2Nsb3NlKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2Jq LAogc3RhdGljIGludCByYWRlb25fZ2VtX2hhbmRsZV9sb2NrdXAoc3RydWN0IHJhZGVvbl9kZXZp Y2UgKnJkZXYsIGludCByKQogewogCWlmIChyID09IC1FREVBRExLKSB7Ci0JCXJhZGVvbl9tdXRl eF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsK IAkJciA9IHJhZGVvbl9ncHVfcmVzZXQocmRldik7CiAJCWlmICghcikKIAkJCXIgPSAtRUFHQUlO OwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4X3VubG9j aygmcmRldi0+Y3NfbXV0ZXgpOwogCX0KIAlyZXR1cm4gcjsKIH0KLS0gCjEuNy43LjYKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==