From: Rob Clark Subject: [PATCH] fixup! drm/msm: Separate locking of buffer resources from struct_mutex Date: Fri, 16 Jun 2017 10:22:07 -0400 Message-ID: <20170616142207.20821-1-robdclark@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: "Susheelendra, Sushmita" , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Clark , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Chris Wilson List-Id: dri-devel@lists.freedesktop.org LS0tCk9rLCAybmQgZml4dXAgdG8gaGFuZGxlIHZtYXAgc2hyaW5raW5nLgoKIGRyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2dlbS5jIHwgNDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9nZW0uYwppbmRleCBmNWQxZjg0Li4zMTkwZTA1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L21zbV9nZW0uYwpAQCAtNDIsNiArNDIsOSBAQCBlbnVtIHsKIAlPQkpfTE9DS19TSFJJTktFUiwK IH07CiAKK3N0YXRpYyB2b2lkIG1zbV9nZW1fdnVubWFwX2xvY2tlZChzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKm9iaik7CisKKwogc3RhdGljIGRtYV9hZGRyX3QgcGh5c2FkZHIoc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmopCiB7CiAJc3RydWN0IG1zbV9nZW1fb2JqZWN0ICptc21fb2JqID0gdG9f bXNtX2JvKG9iaik7CkBAIC00ODQsNiArNDg3LDcgQEAgaW50IG1zbV9nZW1fZHVtYl9tYXBfb2Zm c2V0KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHZvaWQg Km1zbV9nZW1fZ2V0X3ZhZGRyKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVj dCBtc21fZ2VtX29iamVjdCAqbXNtX29iaiA9IHRvX21zbV9ibyhvYmopOworCWludCByZXQgPSAw OwogCiAJbXV0ZXhfbG9jaygmbXNtX29iai0+bG9jayk7CiAKQEAgLTQ5MiwyMiArNDk2LDM1IEBA IHZvaWQgKm1zbV9nZW1fZ2V0X3ZhZGRyKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogCQly ZXR1cm4gRVJSX1BUUigtRUJVU1kpOwogCX0KIAorCS8qIGluY3JlbWVudCB2bWFwX2NvdW50ICpi ZWZvcmUqIHZtYXAoKSBjYWxsLCBzbyBzaHJpbmtlciBjYW4KKwkgKiBjaGVjayB2bWFwX2NvdW50 IChpc192dW5tYXBhYmxlKCkpIG91dHNpZGUgb2YgbXNtX29iai0+bG9jay4KKwkgKiBUaGlzIGd1 YXJhbnRlZXMgdGhhdCB3ZSB3b24ndCB0cnkgdG8gbXNtX2dlbV92dW5tYXAoKSB0aGlzCisJICog c2FtZSBvYmplY3QgZnJvbSB3aXRoaW4gdGhlIHZtYXAoKSBjYWxsICh3aGlsZSB3ZSBhbHJlYWR5 CisJICogaG9sZCBtc21fb2JqLT5sb2NrKQorCSAqLworCW1zbV9vYmotPnZtYXBfY291bnQrKzsK KwogCWlmICghbXNtX29iai0+dmFkZHIpIHsKIAkJc3RydWN0IHBhZ2UgKipwYWdlcyA9IGdldF9w YWdlcyhvYmopOwogCQlpZiAoSVNfRVJSKHBhZ2VzKSkgewotCQkJbXV0ZXhfdW5sb2NrKCZtc21f b2JqLT5sb2NrKTsKLQkJCXJldHVybiBFUlJfQ0FTVChwYWdlcyk7CisJCQlyZXQgPSBQVFJfRVJS KHBhZ2VzKTsKKwkJCWdvdG8gZmFpbDsKIAkJfQogCQltc21fb2JqLT52YWRkciA9IHZtYXAocGFn ZXMsIG9iai0+c2l6ZSA+PiBQQUdFX1NISUZULAogCQkJCVZNX01BUCwgcGdwcm90X3dyaXRlY29t YmluZShQQUdFX0tFUk5FTCkpOwogCQlpZiAobXNtX29iai0+dmFkZHIgPT0gTlVMTCkgewotCQkJ bXV0ZXhfdW5sb2NrKCZtc21fb2JqLT5sb2NrKTsKLQkJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0p OworCQkJcmV0ID0gLUVOT01FTTsKKwkJCWdvdG8gZmFpbDsKIAkJfQogCX0KLQltc21fb2JqLT52 bWFwX2NvdW50Kys7CisKIAltdXRleF91bmxvY2soJm1zbV9vYmotPmxvY2spOwogCXJldHVybiBt c21fb2JqLT52YWRkcjsKKworZmFpbDoKKwltc21fb2JqLT52bWFwX2NvdW50LS07CisJbXV0ZXhf dW5sb2NrKCZtc21fb2JqLT5sb2NrKTsKKwlyZXR1cm4gRVJSX1BUUihyZXQpOwogfQogCiB2b2lk IG1zbV9nZW1fcHV0X3ZhZGRyKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQpAQCAtNTU0LDcg KzU3MSw3IEBAIHZvaWQgbXNtX2dlbV9wdXJnZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikK IAogCXB1dF9pb3ZhKG9iaik7CiAKLQltc21fZ2VtX3Z1bm1hcChvYmopOworCW1zbV9nZW1fdnVu bWFwX2xvY2tlZChvYmopOwogCiAJcHV0X3BhZ2VzKG9iaik7CiAKQEAgLTU3NiwxMCArNTkzLDEy IEBAIHZvaWQgbXNtX2dlbV9wdXJnZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAltdXRl eF91bmxvY2soJm1zbV9vYmotPmxvY2spOwogfQogCi12b2lkIG1zbV9nZW1fdnVubWFwKHN0cnVj dCBkcm1fZ2VtX29iamVjdCAqb2JqKQorc3RhdGljIHZvaWQgbXNtX2dlbV92dW5tYXBfbG9ja2Vk KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBtc21fZ2VtX29iamVjdCAq bXNtX29iaiA9IHRvX21zbV9ibyhvYmopOwogCisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZt c21fb2JqLT5sb2NrKSk7CisKIAlpZiAoIW1zbV9vYmotPnZhZGRyIHx8IFdBUk5fT04oIWlzX3Z1 bm1hcGFibGUobXNtX29iaikpKQogCQlyZXR1cm47CiAKQEAgLTU4Nyw2ICs2MDYsMTUgQEAgdm9p ZCBtc21fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAltc21fb2JqLT52 YWRkciA9IE5VTEw7CiB9CiAKK3ZvaWQgbXNtX2dlbV92dW5tYXAoc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmopCit7CisJc3RydWN0IG1zbV9nZW1fb2JqZWN0ICptc21fb2JqID0gdG9fbXNtX2Jv KG9iaik7CisKKwltdXRleF9sb2NrX25lc3RlZCgmbXNtX29iai0+bG9jaywgT0JKX0xPQ0tfU0hS SU5LRVIpOworCW1zbV9nZW1fdnVubWFwX2xvY2tlZChvYmopOworCW11dGV4X3VubG9jaygmbXNt X29iai0+bG9jayk7Cit9CisKIC8qIG11c3QgYmUgY2FsbGVkIGJlZm9yZSBfbW92ZV90b19hY3Rp dmUoKS4uICovCiBpbnQgbXNtX2dlbV9zeW5jX29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg Km9iaiwKIAkJc3RydWN0IG1zbV9mZW5jZV9jb250ZXh0ICpmY3R4LCBib29sIGV4Y2x1c2l2ZSkK QEAgLTc5OSw3ICs4MjcsNyBAQCB2b2lkIG1zbV9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmopCiAKIAkJZHJtX3ByaW1lX2dlbV9kZXN0cm95KG9iaiwgbXNtX29iai0+ c2d0KTsKIAl9IGVsc2UgewotCQltc21fZ2VtX3Z1bm1hcChvYmopOworCQltc21fZ2VtX3Z1bm1h cF9sb2NrZWQob2JqKTsKIAkJcHV0X3BhZ2VzKG9iaik7CiAJfQogCi0tIAoyLjkuNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxp bmcgbGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5vCg==