From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 04/15] drm/radeon: add an exclusive lock for GPU reset v2 Date: Tue, 10 Jul 2012 14:51:13 +0200 Message-ID: <1341924684-563-4-git-send-email-deathsimple@vodafone.de> References: <1341924684-563-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 CFE509EEAB for ; Tue, 10 Jul 2012 05:51:28 -0700 (PDT) In-Reply-To: <1341924684-563-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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogSmVyb21lIEdsaXNzZSA8amdsaXNzZUByZWRoYXQuY29tPgoKR1BVIHJlc2V0IG5lZWQg dG8gYmUgZXhjbHVzaXZlLCBvbmUgaGFwcGVuaW5nIGF0IGEgdGltZS4gRm9yIHRoaXMKYWRkIGEg cncgc2VtYXBob3JlIHNvIHRoYXQgYW55IHBhdGggdGhhdCB0cmlnZ2VyIEdQVSBhY3Rpdml0aWVz CmhhdmUgdG8gdGFrZSB0aGUgc2VtYXBob3JlIGFzIGEgcmVhZGVyIHRodXMgYWxsb3dpbmcgY29u Y3VyZW5jeS4KClRoZSBHUFUgcmVzZXQgcGF0aCB0YWtlIHRoZSBzZW1hcGhvcmUgYXMgYSB3cml0 ZXIgZW5zdXJpbmcgdGhhdApubyBjb25jdXJyZW50IHJlc2V0IHRha2UgcGxhY2UuCgp2MjogaW5p dCBydyBzZW1hcGhvcmUKClNpZ25lZC1vZmYtYnk6IEplcm9tZSBHbGlzc2UgPGpnbGlzc2VAcmVk aGF0LmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdA YW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICAg IDEgKwogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyAgICAgfCAgICA1ICsrKysr CiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyB8ICAgIDMgKysrCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYyAgICB8ICAgIDggKysrKysrKysKIDQgZmls ZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uLmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCmluZGV4 IDU4NjFlYzguLjQ0ODc4NzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFk ZW9uLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaApAQCAtMTQ0Niw2ICsx NDQ2LDcgQEAgc3RydWN0IHJhZGVvbl9kZXZpY2UgewogCXN0cnVjdCBkZXZpY2UJCQkqZGV2Owog CXN0cnVjdCBkcm1fZGV2aWNlCQkqZGRldjsKIAlzdHJ1Y3QgcGNpX2RldgkJCSpwZGV2OworCXN0 cnVjdCByd19zZW1hcGhvcmUJCWV4Y2x1c2l2ZV9sb2NrOwogCS8qIEFTSUMgKi8KIAl1bmlvbiBy YWRlb25fYXNpY19jb25maWcJY29uZmlnOwogCWVudW0gcmFkZW9uX2ZhbWlseQkJZmFtaWx5Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyBiL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMKaW5kZXggZDVhZWMwOS4uNTUzZGE2NyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9jcy5jCkBAIC00OTksNyArNDk5LDkgQEAgaW50IHJhZGVvbl9j c19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbHApCiAJc3RydWN0IHJhZGVvbl9jc19wYXJzZXIgcGFyc2VyOwogCWludCByOwogCisJ ZG93bl9yZWFkKCZyZGV2LT5leGNsdXNpdmVfbG9jayk7CiAJaWYgKCFyZGV2LT5hY2NlbF93b3Jr aW5nKSB7CisJCXVwX3JlYWQoJnJkZXYtPmV4Y2x1c2l2ZV9sb2NrKTsKIAkJcmV0dXJuIC1FQlVT WTsKIAl9CiAJLyogaW5pdGlhbGl6ZSBwYXJzZXIgKi8KQEAgLTUxMiw2ICs1MTQsNyBAQCBpbnQg cmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVj dCBkcm1fZmlsZSAqZmlscCkKIAlpZiAocikgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBpbml0 aWFsaXplIHBhcnNlciAhXG4iKTsKIAkJcmFkZW9uX2NzX3BhcnNlcl9maW5pKCZwYXJzZXIsIHIp OworCQl1cF9yZWFkKCZyZGV2LT5leGNsdXNpdmVfbG9jayk7CiAJCXIgPSByYWRlb25fY3NfaGFu ZGxlX2xvY2t1cChyZGV2LCByKTsKIAkJcmV0dXJuIHI7CiAJfQpAQCAtNTIwLDYgKzUyMyw3IEBA IGludCByYWRlb25fY3NfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwg c3RydWN0IGRybV9maWxlICpmaWxwKQogCQlpZiAociAhPSAtRVJFU1RBUlRTWVMpCiAJCQlEUk1f RVJST1IoIkZhaWxlZCB0byBwYXJzZSByZWxvY2F0aW9uICVkIVxuIiwgcik7CiAJCXJhZGVvbl9j c19wYXJzZXJfZmluaSgmcGFyc2VyLCByKTsKKwkJdXBfcmVhZCgmcmRldi0+ZXhjbHVzaXZlX2xv Y2spOwogCQlyID0gcmFkZW9uX2NzX2hhbmRsZV9sb2NrdXAocmRldiwgcik7CiAJCXJldHVybiBy OwogCX0KQEAgLTUzMyw2ICs1MzcsNyBAQCBpbnQgcmFkZW9uX2NzX2lvY3RsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIAl9CiBvdXQ6 CiAJcmFkZW9uX2NzX3BhcnNlcl9maW5pKCZwYXJzZXIsIHIpOworCXVwX3JlYWQoJnJkZXYtPmV4 Y2x1c2l2ZV9sb2NrKTsKIAlyID0gcmFkZW9uX2NzX2hhbmRsZV9sb2NrdXAocmRldiwgcik7CiAJ cmV0dXJuIHI7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9k ZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCmluZGV4IGY2 NTRiYTguLjI1NGZkYjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCkBA IC03MzQsNiArNzM0LDcgQEAgaW50IHJhZGVvbl9kZXZpY2VfaW5pdChzdHJ1Y3QgcmFkZW9uX2Rl dmljZSAqcmRldiwKIAltdXRleF9pbml0KCZyZGV2LT5nZW0ubXV0ZXgpOwogCW11dGV4X2luaXQo JnJkZXYtPnBtLm11dGV4KTsKIAlpbml0X3J3c2VtKCZyZGV2LT5wbS5tY2xrX2xvY2spOworCWlu aXRfcndzZW0oJnJkZXYtPmV4Y2x1c2l2ZV9sb2NrKTsKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZy ZGV2LT5pcnEudmJsYW5rX3F1ZXVlKTsKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZyZGV2LT5pcnEu aWRsZV9xdWV1ZSk7CiAJciA9IHJhZGVvbl9nZW1faW5pdChyZGV2KTsKQEAgLTk4OCw2ICs5ODks NyBAQCBpbnQgcmFkZW9uX2dwdV9yZXNldChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAlp bnQgcjsKIAlpbnQgcmVzY2hlZDsKIAorCWRvd25fd3JpdGUoJnJkZXYtPmV4Y2x1c2l2ZV9sb2Nr KTsKIAlyYWRlb25fc2F2ZV9iaW9zX3NjcmF0Y2hfcmVncyhyZGV2KTsKIAkvKiBibG9jayBUVE0g Ki8KIAlyZXNjaGVkID0gdHRtX2JvX2xvY2tfZGVsYXllZF93b3JrcXVldWUoJnJkZXYtPm1tYW4u YmRldik7CkBAIC0xMDA3LDYgKzEwMDksNyBAQCBpbnQgcmFkZW9uX2dwdV9yZXNldChzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldikKIAkJZGV2X2luZm8ocmRldi0+ZGV2LCAiR1BVIHJlc2V0IGZh aWxlZFxuIik7CiAJfQogCisJdXBfd3JpdGUoJnJkZXYtPmV4Y2x1c2l2ZV9sb2NrKTsKIAlyZXR1 cm4gcjsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYwppbmRleCBkOWIwODA5Li5i MGJlOWM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9nZW0uYwpAQCAtMjE1LDEyICsyMTUs MTQgQEAgaW50IHJhZGVvbl9nZW1fY3JlYXRlX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCiAJdWludDMyX3QgaGFuZGxlOwogCWludCByOwogCisJZG93bl9yZWFkKCZy ZGV2LT5leGNsdXNpdmVfbG9jayk7CiAJLyogY3JlYXRlIGEgZ2VtIG9iamVjdCB0byBjb250YWlu IHRoaXMgb2JqZWN0IGluICovCiAJYXJncy0+c2l6ZSA9IHJvdW5kdXAoYXJncy0+c2l6ZSwgUEFH RV9TSVpFKTsKIAlyID0gcmFkZW9uX2dlbV9vYmplY3RfY3JlYXRlKHJkZXYsIGFyZ3MtPnNpemUs IGFyZ3MtPmFsaWdubWVudCwKIAkJCQkJYXJncy0+aW5pdGlhbF9kb21haW4sIGZhbHNlLAogCQkJ CQlmYWxzZSwgJmdvYmopOwogCWlmIChyKSB7CisJCXVwX3JlYWQoJnJkZXYtPmV4Y2x1c2l2ZV9s b2NrKTsKIAkJciA9IHJhZGVvbl9nZW1faGFuZGxlX2xvY2t1cChyZGV2LCByKTsKIAkJcmV0dXJu IHI7CiAJfQpAQCAtMjI4LDEwICsyMzAsMTIgQEAgaW50IHJhZGVvbl9nZW1fY3JlYXRlX2lvY3Rs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJLyogZHJvcCByZWZlcmVuY2Ug ZnJvbSBhbGxvY2F0ZSAtIGhhbmRsZSBob2xkcyBpdCBub3cgKi8KIAlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZV91bmxvY2tlZChnb2JqKTsKIAlpZiAocikgeworCQl1cF9yZWFkKCZyZGV2LT5l eGNsdXNpdmVfbG9jayk7CiAJCXIgPSByYWRlb25fZ2VtX2hhbmRsZV9sb2NrdXAocmRldiwgcik7 CiAJCXJldHVybiByOwogCX0KIAlhcmdzLT5oYW5kbGUgPSBoYW5kbGU7CisJdXBfcmVhZCgmcmRl di0+ZXhjbHVzaXZlX2xvY2spOwogCXJldHVybiAwOwogfQogCkBAIC0yNDAsNiArMjQ0LDcgQEAg aW50IHJhZGVvbl9nZW1fc2V0X2RvbWFpbl9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAogewogCS8qIHRyYW5zaXRpb24gdGhlIEJPIHRvIGEgZG9tYWluIC0KIAkgKiBq dXN0IHZhbGlkYXRlIHRoZSBCTyBpbnRvIGEgY2VydGFpbiBkb21haW4gKi8KKwlzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9yYWRlb25f Z2VtX3NldF9kb21haW4gKmFyZ3MgPSBkYXRhOwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ29i ajsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpyb2JqOwpAQCAtMjQ3LDEwICsyNTIsMTIgQEAgaW50IHJh ZGVvbl9nZW1fc2V0X2RvbWFpbl9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCiAJLyogZm9yIG5vdyBpZiBzb21lb25lIHJlcXVlc3RzIGRvbWFpbiBDUFUgLQogCSAq IGp1c3QgbWFrZSBzdXJlIHRoZSBidWZmZXIgaXMgZmluaXNoZWQgd2l0aCAqLworCWRvd25fcmVh ZCgmcmRldi0+ZXhjbHVzaXZlX2xvY2spOwogCiAJLyoganVzdCBkbyBhIEJPIHdhaXQgZm9yIG5v dyAqLwogCWdvYmogPSBkcm1fZ2VtX29iamVjdF9sb29rdXAoZGV2LCBmaWxwLCBhcmdzLT5oYW5k bGUpOwogCWlmIChnb2JqID09IE5VTEwpIHsKKwkJdXBfcmVhZCgmcmRldi0+ZXhjbHVzaXZlX2xv Y2spOwogCQlyZXR1cm4gLUVOT0VOVDsKIAl9CiAJcm9iaiA9IGdlbV90b19yYWRlb25fYm8oZ29i aik7CkBAIC0yNTgsNiArMjY1LDcgQEAgaW50IHJhZGVvbl9nZW1fc2V0X2RvbWFpbl9pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCXIgPSByYWRlb25fZ2VtX3NldF9k b21haW4oZ29iaiwgYXJncy0+cmVhZF9kb21haW5zLCBhcmdzLT53cml0ZV9kb21haW4pOwogCiAJ ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoZ29iaik7CisJdXBfcmVhZCgmcmRl di0+ZXhjbHVzaXZlX2xvY2spOwogCXIgPSByYWRlb25fZ2VtX2hhbmRsZV9sb2NrdXAocm9iai0+ cmRldiwgcik7CiAJcmV0dXJuIHI7CiB9Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=