From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5/9] drm/radeon: take exclusive_lock in read mode during ring tests, v4 Date: Tue, 26 Aug 2014 18:35:06 +0200 Message-ID: <1409070910-2549-5-git-send-email-deathsimple@vodafone.de> References: <1409070910-2549-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 pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id CB0906E493 for ; Tue, 26 Aug 2014 09:35:34 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 4993F2613FB for ; Tue, 26 Aug 2014 18:35:34 +0200 (CEST) Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix1.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rgO703mS3Kup for ; Tue, 26 Aug 2014 18:35:24 +0200 (CEST) Received: from smtp-03.vodafone.de (smtp-03.vodafone.de [10.215.254.38]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 18DBC261405 for ; Tue, 26 Aug 2014 18:35:24 +0200 (CEST) Received: from smtp-03.vodafone.de ([127.0.0.1]) by localhost (xsmail-dmz7.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R1y3cR5vSH3P for ; Tue, 26 Aug 2014 18:35:11 +0200 (CEST) In-Reply-To: <1409070910-2549-1-git-send-email-deathsimple@vodafone.de> 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 RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ CgpUaGlzIGlzIG5lZWRlZCBmb3IgdGhlIG5leHQgY29tbWl0LCBiZWNhdXNlIHRoZSBsb2NrdXAg ZGV0ZWN0aW9uCndpbGwgbmVlZCB0aGUgcmVhZCBsb2NrIHRvIHJ1bi4KCnY0IChjaGspOiBzcGxp dCBvdXQgZm9yY2VkIGZlbmNlIGNvbXBsZXRpb24sIHJlbW92ZSB1bnJlbGF0ZWQgY2hhbmdlcywK ICAgICAgICAgIGFkZCBhbmQgaGFuZGxlIGluX3Jlc2V0IGZsYWcKClNpZ25lZC1vZmYtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBjYW5vbmljYWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMgICAgICB8ICA3ICsrKysrKwogZHJpdmVycy9ncHUv ZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMgIHwgMzkgKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kaXNwbGF5LmMgfCAgNCAr KystCiA0IGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmggYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbi5oCmluZGV4IDgyMWJmNTEuLmY1MjhhZTggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb24uaApAQCAtMjMyNiw3ICsyMzI2LDcgQEAgc3RydWN0IHJhZGVvbl9kZXZpY2Ug ewogCWJvb2wJCQkJbmVlZF9kbWEzMjsKIAlib29sCQkJCWFjY2VsX3dvcmtpbmc7CiAJYm9vbAkJ CQlmYXN0ZmJfd29ya2luZzsgLyogSUdQIGZlYXR1cmUqLwotCWJvb2wJCQkJbmVlZHNfcmVzZXQ7 CisJYm9vbAkJCQluZWVkc19yZXNldCwgaW5fcmVzZXQ7CiAJc3RydWN0IHJhZGVvbl9zdXJmYWNl X3JlZyBzdXJmYWNlX3JlZ3NbUkFERU9OX0dFTV9NQVhfU1VSRkFDRVNdOwogCWNvbnN0IHN0cnVj dCBmaXJtd2FyZSAqbWVfZnc7CS8qIGFsbCBmYW1pbHkgTUUgZmlybXdhcmUgKi8KIAljb25zdCBz dHJ1Y3QgZmlybXdhcmUgKnBmcF9mdzsJLyogcjYvNzAwIFBGUCBmaXJtd2FyZSAqLwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2NzLmMKaW5kZXggYzkxZDhjOC4uMDZjYmM5YSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9jcy5jCkBAIC02NTIsNiArNjUyLDEzIEBAIGludCByYWRlb25fY3NfaW9j dGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpm aWxwKQogCQl1cF9yZWFkKCZyZGV2LT5leGNsdXNpdmVfbG9jayk7CiAJCXJldHVybiAtRUJVU1k7 CiAJfQorCWlmIChyZGV2LT5pbl9yZXNldCkgeworCQl1cF9yZWFkKCZyZGV2LT5leGNsdXNpdmVf bG9jayk7CisJCXIgPSByYWRlb25fZ3B1X3Jlc2V0KHJkZXYpOworCQlpZiAoIXIpCisJCQlyID0g LUVBR0FJTjsKKwkJcmV0dXJuIHI7CisJfQogCS8qIGluaXRpYWxpemUgcGFyc2VyICovCiAJbWVt c2V0KCZwYXJzZXIsIDAsIHNpemVvZihzdHJ1Y3QgcmFkZW9uX2NzX3BhcnNlcikpOwogCXBhcnNl ci5maWxwID0gZmlscDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMKaW5kZXgg YmNhN2Q0NS4uOWY2NjYzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMK QEAgLTE2NzMsNiArMTY3Myw3IEBAIGludCByYWRlb25fZ3B1X3Jlc2V0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2KQogCQlyZXR1cm4gMDsKIAl9CiAKKwlyZGV2LT5pbl9yZXNldCA9IHRydWU7 CiAJcmRldi0+bmVlZHNfcmVzZXQgPSBmYWxzZTsKIAogCXJhZGVvbl9zYXZlX2Jpb3Nfc2NyYXRj aF9yZWdzKHJkZXYpOwpAQCAtMTY5MSw3ICsxNjkyLDYgQEAgaW50IHJhZGVvbl9ncHVfcmVzZXQo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCX0KIAl9CiAKLXJldHJ5OgogCXIgPSByYWRl b25fYXNpY19yZXNldChyZGV2KTsKIAlpZiAoIXIpIHsKIAkJZGV2X2luZm8ocmRldi0+ZGV2LCAi R1BVIHJlc2V0IHN1Y2NlZWRlZCwgdHJ5aW5nIHRvIHJlc3VtZVxuIik7CkBAIC0xNzAwLDI2ICsx NzAwLDEyIEBAIHJldHJ5OgogCiAJcmFkZW9uX3Jlc3RvcmVfYmlvc19zY3JhdGNoX3JlZ3MocmRl dik7CiAKLQlpZiAoIXIpIHsKLQkJZm9yIChpID0gMDsgaSA8IFJBREVPTl9OVU1fUklOR1M7ICsr aSkgeworCWZvciAoaSA9IDA7IGkgPCBSQURFT05fTlVNX1JJTkdTOyArK2kpIHsKKwkJaWYgKCFy ICYmIHJpbmdfZGF0YVtpXSkgewogCQkJcmFkZW9uX3JpbmdfcmVzdG9yZShyZGV2LCAmcmRldi0+ cmluZ1tpXSwKIAkJCQkJICAgIHJpbmdfc2l6ZXNbaV0sIHJpbmdfZGF0YVtpXSk7Ci0JCQlyaW5n X3NpemVzW2ldID0gMDsKLQkJCXJpbmdfZGF0YVtpXSA9IE5VTEw7Ci0JCX0KLQotCQlyID0gcmFk ZW9uX2liX3JpbmdfdGVzdHMocmRldik7Ci0JCWlmIChyKSB7Ci0JCQlkZXZfZXJyKHJkZXYtPmRl diwgImliIHJpbmcgdGVzdCBmYWlsZWQgKCVkKS5cbiIsIHIpOwotCQkJaWYgKHNhdmVkKSB7Ci0J CQkJc2F2ZWQgPSBmYWxzZTsKLQkJCQlyYWRlb25fc3VzcGVuZChyZGV2KTsKLQkJCQlnb3RvIHJl dHJ5OwotCQkJfQotCQl9Ci0JfSBlbHNlIHsKLQkJcmFkZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9j b21wbGV0aW9uKHJkZXYpOwotCQlmb3IgKGkgPSAwOyBpIDwgUkFERU9OX05VTV9SSU5HUzsgKytp KSB7CisJCX0gZWxzZSB7CisJCQlyYWRlb25fZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24o cmRldiwgaSk7CiAJCQlrZnJlZShyaW5nX2RhdGFbaV0pOwogCQl9CiAJfQpAQCAtMTc1MSwxOSAr MTczNywyOCBAQCByZXRyeToKIAkvKiByZXNldCBocGQgc3RhdGUgKi8KIAlyYWRlb25faHBkX2lu aXQocmRldik7CiAKKwl0dG1fYm9fdW5sb2NrX2RlbGF5ZWRfd29ya3F1ZXVlKCZyZGV2LT5tbWFu LmJkZXYsIHJlc2NoZWQpOworCWRvd25ncmFkZV93cml0ZSgmcmRldi0+ZXhjbHVzaXZlX2xvY2sp OworCiAJZHJtX2hlbHBlcl9yZXN1bWVfZm9yY2VfbW9kZShyZGV2LT5kZGV2KTsKIAogCS8qIHNl dCB0aGUgcG93ZXIgc3RhdGUgaGVyZSBpbiBjYXNlIHdlIGFyZSBhIFBYIHN5c3RlbSBvciBoZWFk bGVzcyAqLwogCWlmICgocmRldi0+cG0ucG1fbWV0aG9kID09IFBNX01FVEhPRF9EUE0pICYmIHJk ZXYtPnBtLmRwbV9lbmFibGVkKQogCQlyYWRlb25fcG1fY29tcHV0ZV9jbG9ja3MocmRldik7CiAK LQl0dG1fYm9fdW5sb2NrX2RlbGF5ZWRfd29ya3F1ZXVlKCZyZGV2LT5tbWFuLmJkZXYsIHJlc2No ZWQpOwotCWlmIChyKSB7CisJaWYgKCFyKSB7CisJCXIgPSByYWRlb25faWJfcmluZ190ZXN0cyhy ZGV2KTsKKwkJaWYgKHIgJiYgc2F2ZWQpCisJCQlyID0gLUVBR0FJTjsKKwl9IGVsc2UgewogCQkv KiBiYWQgbmV3cywgaG93IHRvIHRlbGwgaXQgdG8gdXNlcnNwYWNlID8gKi8KIAkJZGV2X2luZm8o cmRldi0+ZGV2LCAiR1BVIHJlc2V0IGZhaWxlZFxuIik7CiAJfQogCi0JdXBfd3JpdGUoJnJkZXYt PmV4Y2x1c2l2ZV9sb2NrKTsKKwlyZGV2LT5uZWVkc19yZXNldCA9IHIgPT0gLUVBR0FJTjsKKwly ZGV2LT5pbl9yZXNldCA9IGZhbHNlOworCisJdXBfcmVhZCgmcmRldi0+ZXhjbHVzaXZlX2xvY2sp OwogCXJldHVybiByOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kaXNwbGF5LmMK aW5kZXggM2ZkZjg3My4uYmQwZDY4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Rp c3BsYXkuYwpAQCAtNDA1LDcgKzQwNSw5IEBAIHN0YXRpYyB2b2lkIHJhZGVvbl9mbGlwX3dvcmtf ZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29yaykKIAkJciA9IHJhZGVvbl9mZW5jZV93YWl0 KHdvcmstPmZlbmNlLCBmYWxzZSk7CiAJCWlmIChyID09IC1FREVBRExLKSB7CiAJCQl1cF9yZWFk KCZyZGV2LT5leGNsdXNpdmVfbG9jayk7Ci0JCQlyID0gcmFkZW9uX2dwdV9yZXNldChyZGV2KTsK KwkJCWRvIHsKKwkJCQlyID0gcmFkZW9uX2dwdV9yZXNldChyZGV2KTsKKwkJCX0gd2hpbGUgKHIg PT0gLUVBR0FJTik7CiAJCQlkb3duX3JlYWQoJnJkZXYtPmV4Y2x1c2l2ZV9sb2NrKTsKIAkJfQog CQlpZiAocikKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=