From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 19/62] drm/i915: Rename drm_gem_object_unreference_unlocked in preparation for lockless free Date: Fri, 3 Jun 2016 17:36:44 +0100 Message-ID: <1464971847-15809-20-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6ABA76EE2F for ; Fri, 3 Jun 2016 16:37:54 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a20so599510wma.3 for ; Fri, 03 Jun 2016 09:37:54 -0700 (PDT) In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDcgKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgMTAgKysrKystLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMgIHwgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX292ZXJsYXkuYyAgICB8ICAyICstCiA2IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlv bnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDJkOGNj NWYzYTc3Yi4uMzE2MTkyMDc3MTQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIzMDEs NiArMjMwMSwxMyBAQCBpOTE1X2dlbV9vYmplY3RfcHV0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiB9CiBfX2RlcHJlY2F0ZWQgZXh0ZXJuIHZvaWQgZHJtX2dlbV9vYmplY3RfdW5y ZWZlcmVuY2Uoc3RydWN0IGRybV9nZW1fb2JqZWN0ICopOwogCitzdGF0aWMgaW5saW5lIHZvaWQg X19hdHRyaWJ1dGVfXygobm9ubnVsbCkpCitpOTE1X2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2VfdW5sb2NrZWQoJm9iai0+YmFzZSk7Cit9CitfX2RlcHJlY2F0ZWQgZXh0ZXJuIHZvaWQg ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICopOworCiAvKgogICogT3B0aW1pc2VkIFNHTCBpdGVyYXRvciBmb3IgR0VNIG9iamVjdHMKICAq LwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZTg4N2QwN2RlYTRjLi41MGRmN2ExMWQ2YjEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzg3LDcgKzM4Nyw3IEBAIGk5MTVfZ2VtX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAKIAlyZXQgPSBkcm1fZ2VtX2hhbmRsZV9jcmVh dGUoZmlsZSwgJm9iai0+YmFzZSwgJmhhbmRsZSk7CiAJLyogZHJvcCByZWZlcmVuY2UgZnJvbSBh bGxvY2F0ZSAtIGhhbmRsZSBob2xkcyBpdCBub3cgKi8KLQlkcm1fZ2VtX29iamVjdF91bnJlZmVy ZW5jZV91bmxvY2tlZCgmb2JqLT5iYXNlKTsKKwlpOTE1X2dlbV9vYmplY3RfcHV0X3VubG9ja2Vk KG9iaik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTM1Niw3ICsxMzU2LDcgQEAg aTkxNV9nZW1fbW1hcF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAog CSAqIHBhZ2VzIGZyb20uCiAJICovCiAJaWYgKCFvYmotPmJhc2UuZmlscCkgewotCQlkcm1fZ2Vt X29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZCgmb2JqLT5iYXNlKTsKKwkJaTkxNV9nZW1fb2Jq ZWN0X3B1dF91bmxvY2tlZChvYmopOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTEzNjgs NyArMTM2OCw3IEBAIGk5MTVfZ2VtX21tYXBfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg dm9pZCAqZGF0YSwKIAkJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWE7CiAKIAkJaWYgKGRvd25f d3JpdGVfa2lsbGFibGUoJm1tLT5tbWFwX3NlbSkpIHsKLQkJCWRybV9nZW1fb2JqZWN0X3VucmVm ZXJlbmNlX3VubG9ja2VkKCZvYmotPmJhc2UpOworCQkJaTkxNV9nZW1fb2JqZWN0X3B1dF91bmxv Y2tlZChvYmopOwogCQkJcmV0dXJuIC1FSU5UUjsKIAkJfQogCQl2bWEgPSBmaW5kX3ZtYShtbSwg YWRkcik7CkBAIC0xMzc5LDcgKzEzNzksNyBAQCBpOTE1X2dlbV9tbWFwX2lvY3RsKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQlhZGRyID0gLUVOT01FTTsKIAkJdXBfd3Jp dGUoJm1tLT5tbWFwX3NlbSk7CiAJfQotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9j a2VkKCZvYmotPmJhc2UpOworCWk5MTVfZ2VtX29iamVjdF9wdXRfdW5sb2NrZWQob2JqKTsKIAlp ZiAoSVNfRVJSKCh2b2lkICopYWRkcikpCiAJCXJldHVybiBhZGRyOwogCkBAIC0zMzIwLDcgKzMz MjAsNyBAQCBpbnQgaTkxNV9nZW1fZ2V0X2NhY2hpbmdfaW9jdGwoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwKIAkJYnJlYWs7CiAJfQogCi0JZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2VfdW5sb2NrZWQoJm9iai0+YmFzZSk7CisJaTkxNV9nZW1fb2JqZWN0X3B1dF91bmxvY2tl ZChvYmopOwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV90aWxpbmcuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbGlu Zy5jCmluZGV4IDliMDk2ZDFlODE2NC4uYWRlYjA2MjFlMWYxIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV90aWxpbmcuYwpAQCAtMTcyLDcgKzE3Miw3IEBAIGk5MTVfZ2VtX3NldF90aWxp bmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAogCWlmICghaTkxNV90aWxp bmdfb2soZGV2LAogCQkJICAgIGFyZ3MtPnN0cmlkZSwgb2JqLT5iYXNlLnNpemUsIGFyZ3MtPnRp bGluZ19tb2RlKSkgewotCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZCgmb2Jq LT5iYXNlKTsKKwkJaTkxNV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChvYmopOwogCQlyZXR1cm4g LUVJTlZBTDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3VzZXJwdHIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYwppbmRl eCBjZDRhZjIyYjhjNTkuLmNhOGI4MmFiOTNkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3VzZXJwdHIuYwpAQCAtODQ1LDcgKzg0NSw3IEBAIGk5MTVfZ2VtX3VzZXJwdHJfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxl CiAJCXJldCA9IGRybV9nZW1faGFuZGxlX2NyZWF0ZShmaWxlLCAmb2JqLT5iYXNlLCAmaGFuZGxl KTsKIAogCS8qIGRyb3AgcmVmZXJlbmNlIGZyb20gYWxsb2NhdGUgLSBoYW5kbGUgaG9sZHMgaXQg bm93ICovCi0JZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoJm9iai0+YmFzZSk7 CisJaTkxNV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChvYmopOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3Njc1ZjEwODBh MGYuLjMwZjE4NTRiM2FiOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MTA0OTMsNyArMTA0OTMsNyBAQCBpbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGVfZm9yX21vZGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWZiID0gaW50ZWxfZnJhbWVidWZmZXJfY3JlYXRlKGRl diwgJm1vZGVfY21kLCBvYmopOwogCWlmIChJU19FUlIoZmIpKQotCQlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZV91bmxvY2tlZCgmb2JqLT5iYXNlKTsKKwkJaTkxNV9nZW1fb2JqZWN0X3B1dF91 bmxvY2tlZChvYmopOwogCiAJcmV0dXJuIGZiOwogfQpAQCAtMTE4MDIsNyArMTE4MDIsNyBAQCBj bGVhbnVwOgogCWNydGMtPnByaW1hcnktPmZiID0gb2xkX2ZiOwogCXVwZGF0ZV9zdGF0ZV9mYihj cnRjLT5wcmltYXJ5KTsKIAotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKCZv YmotPmJhc2UpOworCWk5MTVfZ2VtX29iamVjdF9wdXRfdW5sb2NrZWQob2JqKTsKIAlkcm1fZnJh bWVidWZmZXJfdW5yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsKIAogCXNwaW5fbG9ja19pcnEoJmRl di0+ZXZlbnRfbG9jayk7CkBAIC0xNTAxMiw3ICsxNTAxMiw3IEBAIGludGVsX3VzZXJfZnJhbWVi dWZmZXJfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlmYiA9IGludGVsX2ZyYW1l YnVmZmVyX2NyZWF0ZShkZXYsICZtb2RlX2NtZCwgb2JqKTsKIAlpZiAoSVNfRVJSKGZiKSkKLQkJ ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoJm9iai0+YmFzZSk7CisJCWk5MTVf Z2VtX29iamVjdF9wdXRfdW5sb2NrZWQob2JqKTsKIAogCXJldHVybiBmYjsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCA1N2U5MTlkYjFhZTEuLjdmOTFmMThhZDI5ZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwpAQCAtMTQ1OCw3ICsxNDU4LDcgQEAg dm9pZCBpbnRlbF9jbGVhbnVwX292ZXJsYXkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCSAqIGhhcmR3YXJlIHNob3VsZCBiZSBvZmYgYWxyZWFkeSAqLwogCVdBUk5fT04oZGV2 X3ByaXYtPm92ZXJsYXktPmFjdGl2ZSk7CiAKLQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91 bmxvY2tlZCgmZGV2X3ByaXYtPm92ZXJsYXktPnJlZ19iby0+YmFzZSk7CisJaTkxNV9nZW1fb2Jq ZWN0X3B1dF91bmxvY2tlZChkZXZfcHJpdi0+b3ZlcmxheS0+cmVnX2JvKTsKIAlrZnJlZShkZXZf cHJpdi0+b3ZlcmxheSk7CiB9CiAKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK