From: Dave Airlie Subject: [PATCH] drm/radeon: add locking around atombios scratch space usage Date: Tue, 11 Nov 2014 09:16:15 +1000 Message-ID: <1415661375-1671-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 340BD6E219 for ; Mon, 10 Nov 2014 15:16:19 -0800 (PST) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAANGHSm013971 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 10 Nov 2014 18:16:18 -0500 Received: from dreadlord-bne-redhat-com.bne.redhat.com (dhcp-40-7.bne.redhat.com [10.64.40.7]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAANGG9v013204 for ; Mon, 10 Nov 2014 18:16:17 -0500 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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCldoaWxlIGRldmVsb3Bpbmcg TVNUIHN1cHBvcnQgSSBub3RpY2VkIEkgb2Z0ZW4gZ290IHRoZSB3cm9uZyBkYXRhCmJhY2sgZnJv bSBhIHRyYW5zYWN0aW9uLCBpbiBhIHJhY3kgZmFzaGlvbi4gSSBub3RpY2VkIHRoZSBzY3JhdGNo CnNwYWNlIHdhc24ndCBsb2NrZWQgYWdhaW5zdCBjb25jdXJyZW50IHVzZXJzLgoKQmFzZWQgb24g YSBwYXRjaCBieSBBbGV4LCBidXQgSSd2ZSBtYWRlIGl0IGEgYml0IG1vcmUgb2J2aW91cyB3aGVu CnRoaW5ncyBhcmUgbG9ja2VkLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRA cmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b20uYyAgICAgICAgICB8 IDExICsrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b20uaCAgICAgICAgICB8 ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b21iaW9zX2RwLmMgICB8ICA0ICsrKy0K IGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vYXRvbWJpb3NfaTJjLmMgIHwgIDQgKysrLQogZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMgfCAgMSArCiA1IGZpbGVzIGNoYW5nZWQs IDE5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9hdG9tLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b20uYwppbmRl eCA2ZjI2ZWI3Li5iZWM0MWM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0 b20uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b20uYwpAQCAtMTIxOCw3ICsxMjE4 LDcgQEAgZnJlZToKIAlyZXR1cm4gcmV0OwogfQogCi1pbnQgYXRvbV9leGVjdXRlX3RhYmxlKHN0 cnVjdCBhdG9tX2NvbnRleHQgKmN0eCwgaW50IGluZGV4LCB1aW50MzJfdCAqIHBhcmFtcykKK2lu dCBhdG9tX2V4ZWN1dGVfdGFibGVfc2NyYXRjaF91bmxvY2tlZChzdHJ1Y3QgYXRvbV9jb250ZXh0 ICpjdHgsIGludCBpbmRleCwgdWludDMyX3QgKiBwYXJhbXMpCiB7CiAJaW50IHI7CiAKQEAgLTEy MzksNiArMTIzOSwxNSBAQCBpbnQgYXRvbV9leGVjdXRlX3RhYmxlKHN0cnVjdCBhdG9tX2NvbnRl eHQgKmN0eCwgaW50IGluZGV4LCB1aW50MzJfdCAqIHBhcmFtcykKIAlyZXR1cm4gcjsKIH0KIAor aW50IGF0b21fZXhlY3V0ZV90YWJsZShzdHJ1Y3QgYXRvbV9jb250ZXh0ICpjdHgsIGludCBpbmRl eCwgdWludDMyX3QgKiBwYXJhbXMpCit7CisJaW50IHI7CisJbXV0ZXhfbG9jaygmY3R4LT5zY3Jh dGNoX211dGV4KTsKKwlyID0gYXRvbV9leGVjdXRlX3RhYmxlX3NjcmF0Y2hfdW5sb2NrZWQoY3R4 LCBpbmRleCwgcGFyYW1zKTsKKwltdXRleF91bmxvY2soJmN0eC0+c2NyYXRjaF9tdXRleCk7CisJ cmV0dXJuIHI7Cit9CisKIHN0YXRpYyBpbnQgYXRvbV9paW9fbGVuW10gPSB7IDEsIDIsIDMsIDMs IDMsIDMsIDQsIDQsIDQsIDMgfTsKIAogc3RhdGljIHZvaWQgYXRvbV9pbmRleF9paW8oc3RydWN0 IGF0b21fY29udGV4dCAqY3R4LCBpbnQgYmFzZSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vYXRvbS5oIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9hdG9tLmgKaW5kZXggYmY5 ZTZmMi4uNmRmZmUxNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9hdG9tLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9hdG9tLmgKQEAgLTEyNSw2ICsxMjUsNyBAQCBz dHJ1Y3QgY2FyZF9pbmZvIHsKIHN0cnVjdCBhdG9tX2NvbnRleHQgewogCXN0cnVjdCBjYXJkX2lu Zm8gKmNhcmQ7CiAJc3RydWN0IG11dGV4IG11dGV4OworCXN0cnVjdCBtdXRleCBzY3JhdGNoX211 dGV4OwogCXZvaWQgKmJpb3M7CiAJdWludDMyX3QgY21kX3RhYmxlLCBkYXRhX3RhYmxlOwogCXVp bnQxNl90ICppaW87CkBAIC0xNDYsNiArMTQ3LDcgQEAgZXh0ZXJuIGludCBhdG9tX3JlZ19kZWJ1 ZzsKIAogc3RydWN0IGF0b21fY29udGV4dCAqYXRvbV9wYXJzZShzdHJ1Y3QgY2FyZF9pbmZvICos IHZvaWQgKik7CiBpbnQgYXRvbV9leGVjdXRlX3RhYmxlKHN0cnVjdCBhdG9tX2NvbnRleHQgKiwg aW50LCB1aW50MzJfdCAqKTsKK2ludCBhdG9tX2V4ZWN1dGVfdGFibGVfc2NyYXRjaF91bmxvY2tl ZChzdHJ1Y3QgYXRvbV9jb250ZXh0ICosIGludCwgdWludDMyX3QgKik7CiBpbnQgYXRvbV9hc2lj X2luaXQoc3RydWN0IGF0b21fY29udGV4dCAqKTsKIHZvaWQgYXRvbV9kZXN0cm95KHN0cnVjdCBh dG9tX2NvbnRleHQgKik7CiBib29sIGF0b21fcGFyc2VfZGF0YV9oZWFkZXIoc3RydWN0IGF0b21f Y29udGV4dCAqY3R4LCBpbnQgaW5kZXgsIHVpbnQxNl90ICpzaXplLApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9hdG9tYmlvc19kcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9hdG9tYmlvc19kcC5jCmluZGV4IGJkOTZhZTcuLjBmMzlkOTYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vYXRvbWJpb3NfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL2F0b21iaW9zX2RwLmMKQEAgLTEwMCw2ICsxMDAsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9w cm9jZXNzX2F1eF9jaChzdHJ1Y3QgcmFkZW9uX2kyY19jaGFuICpjaGFuLAogCW1lbXNldCgmYXJn cywgMCwgc2l6ZW9mKGFyZ3MpKTsKIAogCW11dGV4X2xvY2soJmNoYW4tPm11dGV4KTsKKwltdXRl eF9sb2NrKCZyZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0LT5zY3JhdGNoX211dGV4KTsKIAog CWJhc2UgPSAodW5zaWduZWQgY2hhciAqKShyZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0LT5z Y3JhdGNoICsgMSk7CiAKQEAgLTExMyw3ICsxMTQsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9wcm9j ZXNzX2F1eF9jaChzdHJ1Y3QgcmFkZW9uX2kyY19jaGFuICpjaGFuLAogCWlmIChBU0lDX0lTX0RD RTQocmRldikpCiAJCWFyZ3MudjIudWNIUERfSUQgPSBjaGFuLT5yZWMuaHBkOwogCi0JYXRvbV9l eGVjdXRlX3RhYmxlKHJkZXYtPm1vZGVfaW5mby5hdG9tX2NvbnRleHQsIGluZGV4LCAodWludDMy X3QgKikmYXJncyk7CisJYXRvbV9leGVjdXRlX3RhYmxlX3NjcmF0Y2hfdW5sb2NrZWQocmRldi0+ bW9kZV9pbmZvLmF0b21fY29udGV4dCwgaW5kZXgsICh1aW50MzJfdCAqKSZhcmdzKTsKIAogCSph Y2sgPSBhcmdzLnYxLnVjUmVwbHlTdGF0dXM7CiAKQEAgLTE0Nyw2ICsxNDgsNyBAQCBzdGF0aWMg aW50IHJhZGVvbl9wcm9jZXNzX2F1eF9jaChzdHJ1Y3QgcmFkZW9uX2kyY19jaGFuICpjaGFuLAog CiAJciA9IHJlY3ZfYnl0ZXM7CiBkb25lOgorCW11dGV4X3VubG9jaygmcmRldi0+bW9kZV9pbmZv LmF0b21fY29udGV4dC0+c2NyYXRjaF9tdXRleCk7CiAJbXV0ZXhfdW5sb2NrKCZjaGFuLT5tdXRl eCk7CiAKIAlyZXR1cm4gcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vYXRv bWJpb3NfaTJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL2F0b21iaW9zX2kyYy5jCmluZGV4 IDljNTcwZmIuLjQxNTc3ODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vYXRv bWJpb3NfaTJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9hdG9tYmlvc19pMmMuYwpA QCAtNDgsNiArNDgsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9wcm9jZXNzX2kyY19jaChzdHJ1Y3Qg cmFkZW9uX2kyY19jaGFuICpjaGFuLAogCW1lbXNldCgmYXJncywgMCwgc2l6ZW9mKGFyZ3MpKTsK IAogCW11dGV4X2xvY2soJmNoYW4tPm11dGV4KTsKKwltdXRleF9sb2NrKCZyZGV2LT5tb2RlX2lu Zm8uYXRvbV9jb250ZXh0LT5zY3JhdGNoX211dGV4KTsKIAogCWJhc2UgPSAodW5zaWduZWQgY2hh ciAqKXJkZXYtPm1vZGVfaW5mby5hdG9tX2NvbnRleHQtPnNjcmF0Y2g7CiAKQEAgLTgyLDcgKzgz LDcgQEAgc3RhdGljIGludCByYWRlb25fcHJvY2Vzc19pMmNfY2goc3RydWN0IHJhZGVvbl9pMmNf Y2hhbiAqY2hhbiwKIAlhcmdzLnVjU2xhdmVBZGRyID0gc2xhdmVfYWRkciA8PCAxOwogCWFyZ3Mu dWNMaW5lTnVtYmVyID0gY2hhbi0+cmVjLmkyY19pZDsKIAotCWF0b21fZXhlY3V0ZV90YWJsZShy ZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0LCBpbmRleCwgKHVpbnQzMl90ICopJmFyZ3MpOwor CWF0b21fZXhlY3V0ZV90YWJsZV9zY3JhdGNoX3VubG9ja2VkKHJkZXYtPm1vZGVfaW5mby5hdG9t X2NvbnRleHQsIGluZGV4LCAodWludDMyX3QgKikmYXJncyk7CiAKIAkvKiBlcnJvciAqLwogCWlm IChhcmdzLnVjU3RhdHVzICE9IEhXX0FTU0lTVEVEX0kyQ19TVEFUVVNfU1VDQ0VTUykgewpAQCAt OTUsNiArOTYsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9wcm9jZXNzX2kyY19jaChzdHJ1Y3QgcmFk ZW9uX2kyY19jaGFuICpjaGFuLAogCQlyYWRlb25fYXRvbV9jb3B5X3N3YXAoYnVmLCBiYXNlLCBu dW0sIGZhbHNlKTsKIAogZG9uZToKKwltdXRleF91bmxvY2soJnJkZXYtPm1vZGVfaW5mby5hdG9t X2NvbnRleHQtPnNjcmF0Y2hfbXV0ZXgpOwogCW11dGV4X3VubG9jaygmY2hhbi0+bXV0ZXgpOwog CiAJcmV0dXJuIHI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9k ZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCmluZGV4IDBk NzdkY2UuLmU2M2M5YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCkBA IC05NTAsNiArOTUwLDcgQEAgaW50IHJhZGVvbl9hdG9tYmlvc19pbml0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2KQogCX0KIAogCW11dGV4X2luaXQoJnJkZXYtPm1vZGVfaW5mby5hdG9tX2Nv bnRleHQtPm11dGV4KTsKKwltdXRleF9pbml0KCZyZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0 LT5zY3JhdGNoX211dGV4KTsKIAlyYWRlb25fYXRvbV9pbml0aWFsaXplX2Jpb3Nfc2NyYXRjaF9y ZWdzKHJkZXYtPmRkZXYpOwogCWF0b21fYWxsb2NhdGVfZmJfc2NyYXRjaChyZGV2LT5tb2RlX2lu Zm8uYXRvbV9jb250ZXh0KTsKIAlyZXR1cm4gMDsKLS0gCjEuOS4zCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=