From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 17/62] drm/i915: Wrap drm_gem_object_reference in i915_gem_object_get Date: Fri, 3 Jun 2016 17:36:42 +0100 Message-ID: <1464971847-15809-18-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 B36B76E534 for ; Fri, 3 Jun 2016 16:37:52 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a136so629448wme.0 for ; Fri, 03 Jun 2016 09:37:52 -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 LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMTAgKysrKysr KysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgIDQgKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZG1hYnVmLmMgICAgIHwgIDMgKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jICAgICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgIDQgKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYyAgICB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jICAgICAgIHwgIDMgKy0tCiA4IGZpbGVzIGNoYW5nZWQsIDE4IGlu c2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDI3MDk2MDA0ZGI3Yy4uMWZmN2E5ZGY0MjA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTIyODQsNyArMjI4NCwxNSBAQCBpOTE1X2dlbV9vYmplY3RfbG9va3VwKHN0cnVjdCBkcm1fZmls ZSAqZmlsZSwgdTMyIGhhbmRsZSkKIAlyZXR1cm4gdG9faW50ZWxfYm8oZHJtX2dlbV9vYmplY3Rf bG9va3VwKGZpbGUsIGhhbmRsZSkpOwogfQogX19kZXByZWNhdGVkIGV4dGVybiBzdHJ1Y3QgZHJt X2dlbV9vYmplY3QgKgotZHJtX2dlbV9vYmplY3RfbG9va3VwKHN0cnVjdCBkcm1fZmlsZSAqZmls ZSwgdTMyIGhhbmRsZSk7Citkcm1fZ2VtX29iamVjdF9sb29rdXAoc3RydWN0IGRybV9maWxlICos IHUzMik7CisKK19fYXR0cmlidXRlX18oKG5vbm51bGwpKSBzdGF0aWMgaW5saW5lIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICoKK2k5MTVfZ2VtX29iamVjdF9nZXQoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaikKK3sKKwlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFz ZSk7CisJcmV0dXJuIG9iajsKK30KK19fZGVwcmVjYXRlZCBleHRlcm4gdm9pZCBkcm1fZ2VtX29i amVjdF9yZWZlcmVuY2Uoc3RydWN0IGRybV9nZW1fb2JqZWN0ICopOwogCiAvKgogICogT3B0aW1p c2VkIFNHTCBpdGVyYXRvciBmb3IgR0VNIG9iamVjdHMKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IDgzN2IxNDAyYzc5OC4uNGFlY2RkNDQzNGQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK QEAgLTI2Niw3ICsyNjYsNyBAQCBkcm9wX3BhZ2VzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopCiAJc3RydWN0IGk5MTVfdm1hICp2bWEsICpuZXh0OwogCWludCByZXQ7CiAKLQlkcm1f Z2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CisJaTkxNV9nZW1fb2JqZWN0X2dldChv YmopOwogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEsIG5leHQsICZvYmotPnZtYV9saXN0 LCBvYmpfbGluaykKIAkJaWYgKGk5MTVfdm1hX3VuYmluZCh2bWEpKQogCQkJYnJlYWs7CkBAIC0y MTA3LDcgKzIxMDcsNyBAQCB2b2lkIGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBpOTE1 X3ZtYSAqdm1hLAogCiAJLyogQWRkIGEgcmVmZXJlbmNlIGlmIHdlJ3JlIG5ld2x5IGVudGVyaW5n IHRoZSBhY3RpdmUgbGlzdC4gKi8KIAlpZiAob2JqLT5hY3RpdmUgPT0gMCkKLQkJZHJtX2dlbV9v YmplY3RfcmVmZXJlbmNlKCZvYmotPmJhc2UpOworCQlpOTE1X2dlbV9vYmplY3RfZ2V0KG9iaik7 CiAJb2JqLT5hY3RpdmUgfD0gaW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKTsKIAogCWxpc3RfbW92 ZV90YWlsKCZvYmotPmVuZ2luZV9saXN0W2VuZ2luZS0+aWRdLCAmZW5naW5lLT5hY3RpdmVfbGlz dCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jCmluZGV4IDgwYmJlNDNhMmU5 Mi4uN2FjY2I5OWYzZGEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9kbWFidWYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9kbWFidWYuYwpA QCAtMjc4LDggKzI3OCw3IEBAIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqaTkxNV9nZW1fcHJpbWVf aW1wb3J0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgKiBJbXBvcnRpbmcgZG1hYnVmIGV4 cG9ydGVkIGZyb20gb3V0IG93biBnZW0gaW5jcmVhc2VzCiAJCQkgKiByZWZjb3VudCBvbiBnZW0g aXRzZWxmIGluc3RlYWQgb2YgZl9jb3VudCBvZiBkbWFidWYuCiAJCQkgKi8KLQkJCWRybV9nZW1f b2JqZWN0X3JlZmVyZW5jZSgmb2JqLT5iYXNlKTsKLQkJCXJldHVybiAmb2JqLT5iYXNlOworCQkJ cmV0dXJuICZpOTE1X2dlbV9vYmplY3RfZ2V0KG9iaiktPmJhc2U7CiAJCX0KIAl9CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jCmluZGV4IDNjMTI4MGVjN2ZmNi4uZDU3NzdhMDc1 MGYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ldmljdC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMKQEAgLTIxNCw3ICsyMTQs NyBAQCBmb3VuZDoKIAkJCQkgICAgICAgZXhlY19saXN0KTsKIAkJaWYgKGRybV9tbV9zY2FuX3Jl bW92ZV9ibG9jaygmdm1hLT5ub2RlKSkgewogCQkJbGlzdF9tb3ZlKCZ2bWEtPmV4ZWNfbGlzdCwg JmV2aWN0aW9uX2xpc3QpOwotCQkJZHJtX2dlbV9vYmplY3RfcmVmZXJlbmNlKCZ2bWEtPm9iai0+ YmFzZSk7CisJCQlpOTE1X2dlbV9vYmplY3RfZ2V0KHZtYS0+b2JqKTsKIAkJCWNvbnRpbnVlOwog CQl9CiAJCWxpc3RfZGVsX2luaXQoJnZtYS0+ZXhlY19saXN0KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCA3ZjQ0MWU3NGM5MDMuLjU5MGM0ZDNhYzJl NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTIy LDcgKzEyMiw3IEBAIGViX2xvb2t1cF92bWFzKHN0cnVjdCBlYl92bWFzICplYiwKIAkJCWdvdG8g ZXJyOwogCQl9CiAKLQkJZHJtX2dlbV9vYmplY3RfcmVmZXJlbmNlKCZvYmotPmJhc2UpOworCQlp OTE1X2dlbV9vYmplY3RfZ2V0KG9iaik7CiAJCWxpc3RfYWRkX3RhaWwoJm9iai0+b2JqX2V4ZWNf bGluaywgJm9iamVjdHMpOwogCX0KIAlzcGluX3VubG9jaygmZmlsZS0+dGFibGVfbG9jayk7CkBA IC0xMjAzLDcgKzEyMDMsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3BhcnNlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSwKIAl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChzaGFkb3df YmF0Y2hfb2JqKTsKIAl2bWEtPmV4ZWNfZW50cnkgPSBzaGFkb3dfZXhlY19lbnRyeTsKIAl2bWEt PmV4ZWNfZW50cnktPmZsYWdzID0gX19FWEVDX09CSkVDVF9IQVNfUElOOwotCWRybV9nZW1fb2Jq ZWN0X3JlZmVyZW5jZSgmc2hhZG93X2JhdGNoX29iai0+YmFzZSk7CisJaTkxNV9nZW1fb2JqZWN0 X2dldChzaGFkb3dfYmF0Y2hfb2JqKTsKIAlsaXN0X2FkZF90YWlsKCZ2bWEtPmV4ZWNfbGlzdCwg JmViLT52bWFzKTsKIAogCXNoYWRvd19iYXRjaF9vYmotPmJhc2UucGVuZGluZ19yZWFkX2RvbWFp bnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9zaHJpbmtlci5jCmluZGV4IDFiZjE0NTQ0ZDhhZC4uNDE2ZWFhZWNlNzc2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKQEAgLTE5MCw3ICsxOTAsNyBAQCBpOTE1 X2dlbV9zaHJpbmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJaWYgKCFj YW5fcmVsZWFzZV9wYWdlcyhvYmopKQogCQkJCWNvbnRpbnVlOwogCi0JCQlkcm1fZ2VtX29iamVj dF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CisJCQlpOTE1X2dlbV9vYmplY3RfZ2V0KG9iaik7CiAK IAkJCS8qIEZvciB0aGUgdW5ib3VuZCBwaGFzZSwgdGhpcyBzaG91bGQgYmUgYSBuby1vcCEgKi8K IAkJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEsIHYsCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV91c2VycHRyLmMKaW5kZXggYmExNmUwNDRmYWM2Li5jNDFiZjc0ZjkyNmUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKQEAgLTYyMiw4ICs2MjIsNyBAQCBf X2k5MTVfZ2VtX3VzZXJwdHJfZ2V0X3BhZ2VzX3NjaGVkdWxlKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCiAJb2JqLT51c2VycHRyLndvcmsgPSAmd29yay0+d29yazsKIAlvYmotPnVz ZXJwdHIud29ya2VycysrOwogCi0Jd29yay0+b2JqID0gb2JqOwotCWRybV9nZW1fb2JqZWN0X3Jl ZmVyZW5jZSgmb2JqLT5iYXNlKTsKKwl3b3JrLT5vYmogPSBpOTE1X2dlbV9vYmplY3RfZ2V0KG9i aik7CiAKIAl3b3JrLT50YXNrID0gY3VycmVudDsKIAlnZXRfdGFza19zdHJ1Y3Qod29yay0+dGFz ayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYWUzNWQ1YmZlMWE5Li5h YjE2OGY1NGMwNDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExNjk3 LDEzICsxMTY5NywxMiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAogCS8qIFJlZmVyZW5jZSB0aGUgb2JqZWN0cyBmb3IgdGhlIHNjaGVk dWxlZCB3b3JrLiAqLwogCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsK LQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CiAKIAljcnRjLT5wcmltYXJ5 LT5mYiA9IGZiOwogCXVwZGF0ZV9zdGF0ZV9mYihjcnRjLT5wcmltYXJ5KTsKIAlpbnRlbF9mYmNf cHJlX3VwZGF0ZShpbnRlbF9jcnRjKTsKIAotCXdvcmstPnBlbmRpbmdfZmxpcF9vYmogPSBvYmo7 CisJd29yay0+cGVuZGluZ19mbGlwX29iaiA9IGk5MTVfZ2VtX29iamVjdF9nZXQob2JqKTsKIAog CXJldCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKGRldik7CiAJaWYgKHJldCkKLS0g CjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK