From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 16/26] drm/radeon: remove recursive mutex implementation Date: Wed, 25 Apr 2012 14:46:33 +0200 Message-ID: <1335358003-2987-17-git-send-email-deathsimple@vodafone.de> References: <1335358003-2987-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id C58D8A0D47 for ; Wed, 25 Apr 2012 05:46:54 -0700 (PDT) In-Reply-To: <1335358003-2987-1-git-send-email-deathsimple@vodafone.de> 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 Tm90IG5lZWRlZCBhbnltb3JlLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVh dGhzaW1wbGVAdm9kYWZvbmUuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u aCAgICAgICAgfCAgIDQ0ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jICAgICB8ICAgMTAgKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2dhcnQuYyAgIHwgICAxNiArKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2dlbS5jICAgIHwgICAgNCArLQogNSBmaWxlcyBjaGFuZ2VkLCAxNyBp bnNlcnRpb25zKCspLCA1OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbi5oIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAppbmRl eCA3OWEzOGRhLi40M2QwNDY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKQEAgLTE1NSw0OCAr MTU1LDYgQEAgc3RhdGljIGlubGluZSBpbnQgcmFkZW9uX2F0cm1fZ2V0X2Jpb3NfY2h1bmsodWlu dDhfdCAqYmlvcywgaW50IG9mZnNldCwgaW50IGxlbikKICNlbmRpZgogYm9vbCByYWRlb25fZ2V0 X2Jpb3Moc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpOwogCi0KLS8qCi0gKiBNdXRleCB3aGlj aCBhbGxvd3MgcmVjdXJzaXZlIGxvY2tpbmcgZnJvbSB0aGUgc2FtZSBwcm9jZXNzLgotICovCi1z dHJ1Y3QgcmFkZW9uX211dGV4IHsKLQlzdHJ1Y3QgbXV0ZXgJCW11dGV4OwotCXN0cnVjdCB0YXNr X3N0cnVjdAkqb3duZXI7Ci0JaW50CQkJbGV2ZWw7Ci19OwotCi1zdGF0aWMgaW5saW5lIHZvaWQg cmFkZW9uX211dGV4X2luaXQoc3RydWN0IHJhZGVvbl9tdXRleCAqbXV0ZXgpCi17Ci0JbXV0ZXhf aW5pdCgmbXV0ZXgtPm11dGV4KTsKLQltdXRleC0+b3duZXIgPSBOVUxMOwotCW11dGV4LT5sZXZl bCA9IDA7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZCByYWRlb25fbXV0ZXhfbG9jayhzdHJ1Y3Qg cmFkZW9uX211dGV4ICptdXRleCkKLXsKLQlpZiAobXV0ZXhfdHJ5bG9jaygmbXV0ZXgtPm11dGV4 KSkgewotCQkvKiBUaGUgbXV0ZXggd2FzIHVubG9ja2VkIGJlZm9yZSwgc28gaXQncyBvdXJzIG5v dyAqLwotCQltdXRleC0+b3duZXIgPSBjdXJyZW50OwotCX0gZWxzZSBpZiAobXV0ZXgtPm93bmVy ICE9IGN1cnJlbnQpIHsKLQkJLyogQW5vdGhlciBwcm9jZXNzIGxvY2tlZCB0aGUgbXV0ZXgsIHRh a2UgaXQgKi8KLQkJbXV0ZXhfbG9jaygmbXV0ZXgtPm11dGV4KTsKLQkJbXV0ZXgtPm93bmVyID0g Y3VycmVudDsKLQl9Ci0JLyogT3RoZXJ3aXNlIHRoZSBtdXRleCB3YXMgYWxyZWFkeSBsb2NrZWQg YnkgdGhpcyBwcm9jZXNzICovCi0KLQltdXRleC0+bGV2ZWwrKzsKLX0KLQotc3RhdGljIGlubGlu ZSB2b2lkIHJhZGVvbl9tdXRleF91bmxvY2soc3RydWN0IHJhZGVvbl9tdXRleCAqbXV0ZXgpCi17 Ci0JaWYgKC0tbXV0ZXgtPmxldmVsID4gMCkKLQkJcmV0dXJuOwotCi0JbXV0ZXgtPm93bmVyID0g TlVMTDsKLQltdXRleF91bmxvY2soJm11dGV4LT5tdXRleCk7Ci19Ci0KLQogLyoKICAqIER1bW15 IHBhZ2UKICAqLwpAQCAtMTUwNiw3ICsxNDY0LDcgQEAgc3RydWN0IHJhZGVvbl9kZXZpY2Ugewog CXN0cnVjdCByYWRlb25fZ2VtCQlnZW07CiAJc3RydWN0IHJhZGVvbl9wbQkJcG07CiAJdWludDMy X3QJCQliaW9zX3NjcmF0Y2hbUkFERU9OX0JJT1NfTlVNX1NDUkFUQ0hdOwotCXN0cnVjdCByYWRl b25fbXV0ZXgJCWNzX211dGV4OworCXN0cnVjdCBtdXRleAkJCWNzX211dGV4OwogCXN0cnVjdCBy YWRlb25fd2IJCXdiOwogCXN0cnVjdCByYWRlb25fZHVtbXlfcGFnZQlkdW1teV9wYWdlOwogCWJv b2wJCQkJc2h1dGRvd247CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVv bl9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYwppbmRleCAwMmVlZTRi Li5jMzI3M2I4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMKQEAgLTUxMiw5ICs1MTIs OSBAQCBpbnQgcmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIAlzdHJ1Y3QgcmFkZW9uX2NzX3BhcnNlciBwYXJz ZXI7CiAJaW50IHI7CiAKLQlyYWRlb25fbXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCW11 dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKIAlpZiAoIXJkZXYtPmFjY2VsX3dvcmtpbmcpIHsK LQkJcmFkZW9uX211dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCQltdXRleF91bmxvY2so JnJkZXYtPmNzX211dGV4KTsKIAkJcmV0dXJuIC1FQlVTWTsKIAl9CiAJLyogaW5pdGlhbGl6ZSBw YXJzZXIgKi8KQEAgLTUyOCw3ICs1MjgsNyBAQCBpbnQgcmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIAkJRFJN X0VSUk9SKCJGYWlsZWQgdG8gaW5pdGlhbGl6ZSBwYXJzZXIgIVxuIik7CiAJCXJhZGVvbl9jc19w YXJzZXJfZmluaSgmcGFyc2VyLCByKTsKIAkJciA9IHJhZGVvbl9jc19oYW5kbGVfbG9ja3VwKHJk ZXYsIHIpOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4 X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQlyZXR1cm4gcjsKIAl9CiAJciA9IHJhZGVvbl9j c19wYXJzZXJfcmVsb2NzKCZwYXJzZXIpOwpAQCAtNTM3LDcgKzUzNyw3IEBAIGludCByYWRlb25f Y3NfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9m aWxlICpmaWxwKQogCQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcGFyc2UgcmVsb2NhdGlvbiAlZCFc biIsIHIpOwogCQlyYWRlb25fY3NfcGFyc2VyX2ZpbmkoJnBhcnNlciwgcik7CiAJCXIgPSByYWRl b25fY3NfaGFuZGxlX2xvY2t1cChyZGV2LCByKTsKLQkJcmFkZW9uX211dGV4X3VubG9jaygmcmRl di0+Y3NfbXV0ZXgpOworCQltdXRleF91bmxvY2soJnJkZXYtPmNzX211dGV4KTsKIAkJcmV0dXJu IHI7CiAJfQogCXIgPSByYWRlb25fY3NfaWJfY2h1bmsocmRldiwgJnBhcnNlcik7CkBAIC01NTEs NyArNTUxLDcgQEAgaW50IHJhZGVvbl9jc19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCiBvdXQ6CiAJcmFkZW9uX2NzX3BhcnNl cl9maW5pKCZwYXJzZXIsIHIpOwogCXIgPSByYWRlb25fY3NfaGFuZGxlX2xvY2t1cChyZGV2LCBy KTsKLQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfdW5sb2Nr KCZyZGV2LT5jc19tdXRleCk7CiAJcmV0dXJuIHI7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZGV2aWNlLmMKaW5kZXggOGE0YTIxMC4uOTRmODU2MSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fZGV2aWNlLmMKQEAgLTcyMiw3ICs3MjIsNyBAQCBpbnQgcmFkZW9uX2Rldmlj ZV9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LAogCiAJLyogbXV0ZXggaW5pdGlhbGl6 YXRpb24gYXJlIGFsbCBkb25lIGhlcmUgc28gd2UKIAkgKiBjYW4gcmVjYWxsIGZ1bmN0aW9uIHdp dGhvdXQgaGF2aW5nIGxvY2tpbmcgaXNzdWVzICovCi0JcmFkZW9uX211dGV4X2luaXQoJnJkZXYt PmNzX211dGV4KTsKKwltdXRleF9pbml0KCZyZGV2LT5jc19tdXRleCk7CiAJZm9yIChpID0gMDsg aSA8IFJBREVPTl9OVU1fUklOR1M7ICsraSkKIAkJbXV0ZXhfaW5pdCgmcmRldi0+cmluZ1tpXS5t dXRleCk7CiAJbXV0ZXhfaW5pdCgmcmRldi0+ZGNfaHdfaTJjX211dGV4KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dhcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2dhcnQuYwppbmRleCAyMjBkYmI4Li5iNGE0OTgyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nYXJ0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fZ2FydC5jCkBAIC0zNTYsMTMgKzM1NiwxMyBAQCBpbnQgcmFkZW9uX3Zt X21hbmFnZXJfc3VzcGVuZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIHsKIAlzdHJ1Y3Qg cmFkZW9uX3ZtICp2bSwgKnRtcDsKIAotCXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRl eCk7CisJbXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCS8qIHVuYmluZCBhbGwgYWN0aXZl IHZtICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtLCB0bXAsICZyZGV2LT52bV9tYW5h Z2VyLmxydV92bSwgbGlzdCkgewogCQlyYWRlb25fdm1fdW5iaW5kX2xvY2tlZChyZGV2LCB2bSk7 CiAJfQogCXJkZXYtPnZtX21hbmFnZXIuZnVuY3MtPmZpbmkocmRldik7Ci0JcmFkZW9uX211dGV4 X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgp OwogCXJldHVybiByYWRlb25fc2FfYm9fbWFuYWdlcl9zdXNwZW5kKHJkZXYsICZyZGV2LT52bV9t YW5hZ2VyLnNhX21hbmFnZXIpOwogfQogCkBAIC00ODAsOSArNDgwLDkgQEAgaW50IHJhZGVvbl92 bV9ib19hZGQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJaWYgKGxhc3RfcGZuID4gdm0t Pmxhc3RfcGZuKSB7CiAJCS8qIGdyb3cgdmEgc3BhY2UgMzJNIGJ5IDMyTSAqLwogCQl1bnNpZ25l ZCBhbGlnbiA9ICgoMzIgPDwgMjApID4+IDEyKSAtIDE7Ci0JCXJhZGVvbl9tdXRleF9sb2NrKCZy ZGV2LT5jc19tdXRleCk7CisJCW11dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKIAkJcmFkZW9u X3ZtX3VuYmluZF9sb2NrZWQocmRldiwgdm0pOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2 LT5jc19tdXRleCk7CisJCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCQl2bS0+bGFz dF9wZm4gPSAobGFzdF9wZm4gKyBhbGlnbikgJiB+YWxpZ247CiAJfQogCWhlYWQgPSAmdm0tPnZh OwpAQCAtNTk4LDkgKzU5OCw5IEBAIGludCByYWRlb25fdm1fYm9fcm12KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAogCQlyZXR1cm4gMDsKIAogCW11dGV4X2xvY2soJnZtLT5tdXRleCk7Ci0J cmFkZW9uX211dGV4X2xvY2soJnJkZXYtPmNzX211dGV4KTsKKwltdXRleF9sb2NrKCZyZGV2LT5j c19tdXRleCk7CiAJcmFkZW9uX3ZtX2JvX3VwZGF0ZV9wdGUocmRldiwgdm0sIGJvLCBOVUxMKTsK LQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZy ZGV2LT5jc19tdXRleCk7CiAJbGlzdF9kZWwoJmJvX3ZhLT52bV9saXN0KTsKIAltdXRleF91bmxv Y2soJnZtLT5tdXRleCk7CiAJbGlzdF9kZWwoJmJvX3ZhLT5ib19saXN0KTsKQEAgLTY0NSw5ICs2 NDUsOSBAQCB2b2lkIHJhZGVvbl92bV9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBz dHJ1Y3QgcmFkZW9uX3ZtICp2bSkKIAogCW11dGV4X2xvY2soJnZtLT5tdXRleCk7CiAKLQlyYWRl b25fbXV0ZXhfbG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCW11dGV4X2xvY2soJnJkZXYtPmNzX211 dGV4KTsKIAlyYWRlb25fdm1fdW5iaW5kX2xvY2tlZChyZGV2LCB2bSk7Ci0JcmFkZW9uX211dGV4 X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOworCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgp OwogCiAJLyogcmVtb3ZlIGFsbCBibyAqLwogCXIgPSByYWRlb25fYm9fcmVzZXJ2ZShyZGV2LT5z YV9tYW5hZ2VyLmJvLCBmYWxzZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5jCmluZGV4 IGUxNWNiMWYuLmJkNDUyMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFk ZW9uX2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2dlbS5jCkBAIC0x NTcsMTEgKzE1NywxMSBAQCB2b2lkIHJhZGVvbl9nZW1fb2JqZWN0X2Nsb3NlKHN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqLAogc3RhdGljIGludCByYWRlb25fZ2VtX2hhbmRsZV9sb2NrdXAoc3Ry dWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByKQogewogCWlmIChyID09IC1FREVBRExLKSB7 Ci0JCXJhZGVvbl9tdXRleF9sb2NrKCZyZGV2LT5jc19tdXRleCk7CisJCW11dGV4X2xvY2soJnJk ZXYtPmNzX211dGV4KTsKIAkJciA9IHJhZGVvbl9ncHVfcmVzZXQocmRldik7CiAJCWlmICghcikK IAkJCXIgPSAtRUFHQUlOOwotCQlyYWRlb25fbXV0ZXhfdW5sb2NrKCZyZGV2LT5jc19tdXRleCk7 CisJCW11dGV4X3VubG9jaygmcmRldi0+Y3NfbXV0ZXgpOwogCX0KIAlyZXR1cm4gcjsKIH0KLS0g CjEuNy41LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==