From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/9] drm/i915: Wrap drm_gem_object_reference in i915_gem_object_get Date: Wed, 20 Jul 2016 09:59:57 +0100 Message-ID: <1469005202-9659-5-git-send-email-chris@chris-wilson.co.uk> References: <1469005202-9659-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97F656E7AC for ; Wed, 20 Jul 2016 09:00:19 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id q128so6020024wma.1 for ; Wed, 20 Jul 2016 02:00:19 -0700 (PDT) In-Reply-To: <1469005202-9659-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 LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMTEgKysrKysr KysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jICAgICB8ICAzICstLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYyAgICAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICA0ICsrLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgICB8ICAyICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICB8ICAzICstLQogOCBmaWxlcyBjaGFuZ2VkLCAyMCBp bnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRl eCA0N2YyNDRmOWM2NGUuLjE2M2QyOGU4ZTkyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0yMzA2LDYgKzIzMDYsMTcgQEAgX19kZXByZWNhdGVkCiBleHRlcm4gc3RydWN0IGRybV9nZW1f b2JqZWN0ICoKIGRybV9nZW1fb2JqZWN0X2xvb2t1cChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsIHUz MiBoYW5kbGUpOwogCitfX2F0dHJpYnV0ZV9fKChub25udWxsKSkKK3N0YXRpYyBpbmxpbmUgc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKgoraTkxNV9nZW1fb2JqZWN0X2dldChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCWRybV9nZW1fb2JqZWN0X3JlZmVyZW5jZSgmb2Jq LT5iYXNlKTsKKwlyZXR1cm4gb2JqOworfQorCitfX2RlcHJlY2F0ZWQKK2V4dGVybiB2b2lkIGRy bV9nZW1fb2JqZWN0X3JlZmVyZW5jZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKik7CisKIHN0YXRp YyBpbmxpbmUgYm9vbAogaTkxNV9nZW1fb2JqZWN0X2hhc19zdHJ1Y3RfcGFnZShjb25zdCBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggOTcwNDk2NDE5MDk4Li5mODg2YzBiYjI0Y2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMjg5LDcgKzI4OSw3IEBAIGRyb3BfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaikKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgKm5leHQ7CiAJaW50IHJldDsKIAotCWRybV9n ZW1fb2JqZWN0X3JlZmVyZW5jZSgmb2JqLT5iYXNlKTsKKwlpOTE1X2dlbV9vYmplY3RfZ2V0KG9i aik7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgbmV4dCwgJm9iai0+dm1hX2xpc3Qs IG9ial9saW5rKQogCQlpZiAoaTkxNV92bWFfdW5iaW5kKHZtYSkpCiAJCQlicmVhazsKQEAgLTIz NjEsNyArMjM2MSw3IEBAIHZvaWQgaTkxNV92bWFfbW92ZV90b19hY3RpdmUoc3RydWN0IGk5MTVf dm1hICp2bWEsCiAKIAkvKiBBZGQgYSByZWZlcmVuY2UgaWYgd2UncmUgbmV3bHkgZW50ZXJpbmcg dGhlIGFjdGl2ZSBsaXN0LiAqLwogCWlmIChvYmotPmFjdGl2ZSA9PSAwKQotCQlkcm1fZ2VtX29i amVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CisJCWk5MTVfZ2VtX29iamVjdF9nZXQob2JqKTsK IAlvYmotPmFjdGl2ZSB8PSBpbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpOwogCiAJbGlzdF9tb3Zl X3RhaWwoJm9iai0+ZW5naW5lX2xpc3RbZW5naW5lLT5pZF0sICZlbmdpbmUtPmFjdGl2ZV9saXN0 KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZG1hYnVmLmMKaW5kZXggN2QwOGFjMDhjNDAx Li4zYTAwYWIzYWQwNmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2RtYWJ1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2RtYWJ1Zi5jCkBA IC0yNzgsOCArMjc4LDcgQEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICppOTE1X2dlbV9wcmltZV9p bXBvcnQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAqIEltcG9ydGluZyBkbWFidWYgZXhw b3J0ZWQgZnJvbSBvdXQgb3duIGdlbSBpbmNyZWFzZXMKIAkJCSAqIHJlZmNvdW50IG9uIGdlbSBp dHNlbGYgaW5zdGVhZCBvZiBmX2NvdW50IG9mIGRtYWJ1Zi4KIAkJCSAqLwotCQkJZHJtX2dlbV9v YmplY3RfcmVmZXJlbmNlKCZvYmotPmJhc2UpOwotCQkJcmV0dXJuICZvYmotPmJhc2U7CisJCQly ZXR1cm4gJmk5MTVfZ2VtX29iamVjdF9nZXQob2JqKS0+YmFzZTsKIAkJfQogCX0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMKaW5kZXggYjExOTRjN2MwYTQ4Li41NjEwMzk0OGVl MTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V2aWN0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXZpY3QuYwpAQCAtMTgzLDcgKzE4Myw3 IEBAIGZvdW5kOgogCQkJCSAgICAgICBleGVjX2xpc3QpOwogCQlpZiAoZHJtX21tX3NjYW5fcmVt b3ZlX2Jsb2NrKCZ2bWEtPm5vZGUpKSB7CiAJCQlsaXN0X21vdmUoJnZtYS0+ZXhlY19saXN0LCAm ZXZpY3Rpb25fbGlzdCk7Ci0JCQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJnZtYS0+b2JqLT5i YXNlKTsKKwkJCWk5MTVfZ2VtX29iamVjdF9nZXQodm1hLT5vYmopOwogCQkJY29udGludWU7CiAJ CX0KIAkJbGlzdF9kZWxfaW5pdCgmdm1hLT5leGVjX2xpc3QpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDU1MWRkNGY1NDlmYS4uMjhiY2M5OWEwY2Mx IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMjMs NyArMTIzLDcgQEAgZWJfbG9va3VwX3ZtYXMoc3RydWN0IGViX3ZtYXMgKmViLAogCQkJZ290byBl cnI7CiAJCX0KIAotCQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CisJCWk5 MTVfZ2VtX29iamVjdF9nZXQob2JqKTsKIAkJbGlzdF9hZGRfdGFpbCgmb2JqLT5vYmpfZXhlY19s aW5rLCAmb2JqZWN0cyk7CiAJfQogCXNwaW5fdW5sb2NrKCZmaWxlLT50YWJsZV9sb2NrKTsKQEAg LTEyMzYsNyArMTIzNiw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcGFyc2Uoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lLAogCXZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KHNoYWRvd19i YXRjaF9vYmopOwogCXZtYS0+ZXhlY19lbnRyeSA9IHNoYWRvd19leGVjX2VudHJ5OwogCXZtYS0+ ZXhlY19lbnRyeS0+ZmxhZ3MgPSBfX0VYRUNfT0JKRUNUX0hBU19QSU47Ci0JZHJtX2dlbV9vYmpl Y3RfcmVmZXJlbmNlKCZzaGFkb3dfYmF0Y2hfb2JqLT5iYXNlKTsKKwlpOTE1X2dlbV9vYmplY3Rf Z2V0KHNoYWRvd19iYXRjaF9vYmopOwogCWxpc3RfYWRkX3RhaWwoJnZtYS0+ZXhlY19saXN0LCAm ZWItPnZtYXMpOwogCiAJc2hhZG93X2JhdGNoX29iai0+YmFzZS5wZW5kaW5nX3JlYWRfZG9tYWlu cyA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3Nocmlua2VyLmMKaW5kZXggNmYxMGI0MjE0ODdiLi4zYWE3NmQzNjA4ZWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYwpAQCAtMTkwLDcgKzE5MCw3IEBAIGk5MTVf Z2VtX3NocmluayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlpZiAoIWNh bl9yZWxlYXNlX3BhZ2VzKG9iaikpCiAJCQkJY29udGludWU7CiAKLQkJCWRybV9nZW1fb2JqZWN0 X3JlZmVyZW5jZSgmb2JqLT5iYXNlKTsKKwkJCWk5MTVfZ2VtX29iamVjdF9nZXQob2JqKTsKIAog CQkJLyogRm9yIHRoZSB1bmJvdW5kIHBoYXNlLCB0aGlzIHNob3VsZCBiZSBhIG5vLW9wISAqLwog CQkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3VzZXJwdHIuYwppbmRleCBiYTE2ZTA0NGZhYzYuLmM0MWJmNzRmOTI2ZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYwpAQCAtNjIyLDggKzYyMiw3IEBAIF9f aTkxNV9nZW1fdXNlcnB0cl9nZXRfcGFnZXNfc2NoZWR1bGUoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwKIAlvYmotPnVzZXJwdHIud29yayA9ICZ3b3JrLT53b3JrOwogCW9iai0+dXNl cnB0ci53b3JrZXJzKys7CiAKLQl3b3JrLT5vYmogPSBvYmo7Ci0JZHJtX2dlbV9vYmplY3RfcmVm ZXJlbmNlKCZvYmotPmJhc2UpOworCXdvcmstPm9iaiA9IGk5MTVfZ2VtX29iamVjdF9nZXQob2Jq KTsKIAogCXdvcmstPnRhc2sgPSBjdXJyZW50OwogCWdldF90YXNrX3N0cnVjdCh3b3JrLT50YXNr KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3N2QzMjA1ODQ0NzguLjg0 OTA0YTJkM2ZjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTE2NDks NyArMTE2NDksNiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAogCS8qIFJlZmVyZW5jZSB0aGUgb2JqZWN0cyBmb3IgdGhlIHNjaGVkdWxl ZCB3b3JrLiAqLwogCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsKLQlk cm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7CiAKIAljcnRjLT5wcmltYXJ5LT5m YiA9IGZiOwogCXVwZGF0ZV9zdGF0ZV9mYihjcnRjLT5wcmltYXJ5KTsKQEAgLTExNjU3LDcgKzEx NjU2LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJaW50ZWxfZmJjX3ByZV91cGRhdGUoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29u ZmlnLAogCQkJICAgICB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSkpOwogCi0J d29yay0+cGVuZGluZ19mbGlwX29iaiA9IG9iajsKKwl3b3JrLT5wZW5kaW5nX2ZsaXBfb2JqID0g aTkxNV9nZW1fb2JqZWN0X2dldChvYmopOwogCiAJcmV0ID0gaTkxNV9tdXRleF9sb2NrX2ludGVy cnVwdGlibGUoZGV2KTsKIAlpZiAocmV0KQotLSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=