From: Tvrtko Ursulin Subject: [PATCH 04/10] drm/i915: More GEM init dev_priv cleanup Date: Wed, 30 Nov 2016 11:35:34 +0000 Message-ID: <1480505740-1920-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com> 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 08F976E12F for ; Wed, 30 Nov 2016 11:35:53 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u144so28907467wmu.0 for ; Wed, 30 Nov 2016 03:35:52 -0800 (PST) In-Reply-To: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com> 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAxMCArKystLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAgNSArKy0tLQogNCBmaWxlcyBjaGFu Z2VkLCAxMyBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYwppbmRleCA1NWVmZmY2OWZjZDAuLjNjMGRlYjBlMDA4ZiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCkBAIC01NDQsOCArNTQ0LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCB2Z2Ffc3dpdGNo ZXJvb19jbGllbnRfb3BzIGk5MTVfc3dpdGNoZXJvb19vcHMgPSB7CiBzdGF0aWMgdm9pZCBpOTE1 X2dlbV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAltdXRleF9s b2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0JaTkxNV9nZW1fY2xlYW51cF9lbmdp bmVzKCZkZXZfcHJpdi0+ZHJtKTsKLQlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoJmRldl9wcml2LT5k cm0pOworCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXZfcHJpdik7CisJaTkxNV9nZW1fY29u dGV4dF9maW5pKGRldl9wcml2KTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0 X211dGV4KTsKIAogCXJjdV9iYXJyaWVyKCk7CkBAIC04NDAsNyArODQwLDcgQEAgc3RhdGljIGlu dCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAlpbnRlbF9pbml0X2Rpc3BsYXlfaG9va3MoZGV2X3ByaXYpOwogCWludGVsX2luaXRfY2xv Y2tfZ2F0aW5nX2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2F1ZGlvX2hvb2tzKGRldl9w cml2KTsKLQlyZXQgPSBpOTE1X2dlbV9sb2FkX2luaXQoJmRldl9wcml2LT5kcm0pOworCXJldCA9 IGk5MTVfZ2VtX2xvYWRfaW5pdChkZXZfcHJpdik7CiAJaWYgKHJldCA8IDApCiAJCWdvdG8gZXJy X2d2dDsKIApAQCAtODY4LDcgKzg2OCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9l YXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdm9pZCBpOTE1 X2RyaXZlcl9jbGVhbnVwX2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKIAlpOTE1X3BlcmZfZmluaShkZXZfcHJpdik7Ci0JaTkxNV9nZW1fbG9hZF9jbGVhbnVwKCZk ZXZfcHJpdi0+ZHJtKTsKKwlpOTE1X2dlbV9sb2FkX2NsZWFudXAoZGV2X3ByaXYpOwogCWk5MTVf d29ya3F1ZXVlc19jbGVhbnVwKGRldl9wcml2KTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggZjAxYzkxODQ5OTI4Li5jNmYzN2IwYmE3YWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtMjk3MCw4ICsyOTcwLDggQEAgaW50IGk5MTVfZ2VtX2dldF9hcGVydHVyZV9pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJCXN0cnVjdCBkcm1fZmlsZSAq ZmlsZV9wcml2KTsKIGludCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHZvaWQgKmRhdGEsCiAJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7Ci1pbnQgaTkx NV9nZW1fbG9hZF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotdm9pZCBpOTE1X2dlbV9s b2FkX2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaTkxNV9nZW1fbG9hZF9p bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ2VtX2xv YWRfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1 X2dlbV9sb2FkX2luaXRfZmVuY2VzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiBpbnQgaTkxNV9nZW1fZnJlZXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CiBpbnQgaTkxNV9nZW1fZnJlZXplX2xhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKQEAgLTMxODQsNyArMzE4NCw3IEBAIHZvaWQgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qo c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0 X2NoZWNrIGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK IGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dl bV93YWl0X2Zvcl9pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJ dW5zaWduZWQgaW50IGZsYWdzKTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fc3VzcGVuZChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpAQCAtMzI3Myw3ICszMjczLDcgQEAg dm9pZCBpOTE1X2dlbV9vYmplY3Rfc2F2ZV9iaXRfMTdfc3dpenpsZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqLAogLyogaTkxNV9nZW1fY29udGV4dC5jICovCiBpbnQgX19tdXN0X2No ZWNrIGk5MTVfZ2VtX2NvbnRleHRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2xvc3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKLXZvaWQgaTkxNV9nZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwordm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKIGludCBpOTE1X2dlbV9jb250ZXh0X29wZW4oc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9j bG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogaW50 IGk5MTVfc3dpdGNoX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYjU4ODhmNzUxZTAxLi4xMTc4ZDAwOTY5ZDYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDQ2OSw5ICs0NDY5LDggQEAgaW50IGk5MTVfZ2Vt X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogfQogCiB2b2lkCi1pOTE1 X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK2k5MTVfZ2VtX2Ns ZWFudXBfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIApAQCAt NDUxMSw5ICs0NTEwLDggQEAgaTkxNV9nZW1fbG9hZF9pbml0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIGludAotaTkxNV9nZW1fbG9hZF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlpbnQgZXJyID0gLUVOT01FTTsKIAogCWRldl9wcml2LT5vYmplY3Rz ID0gS01FTV9DQUNIRShkcm1faTkxNV9nZW1fb2JqZWN0LCBTTEFCX0hXQ0FDSEVfQUxJR04pOwpA QCAtNDU4MiwxMCArNDU4MCw4IEBAIGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXJldHVybiBlcnI7CiB9CiAKLXZvaWQgaTkxNV9nZW1fbG9hZF9jbGVhbnVwKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGk5MTVfZ2VtX2xvYWRfY2xlYW51cChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCiAJV0FSTl9PTighbGxpc3RfZW1wdHkoJmRldl9w cml2LT5tbS5mcmVlX2xpc3QpKTsKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5kcm0uc3RydWN0 X211dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRl eHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCBlYTg0 N2U4NjUxMzcuLmE1N2MyMjY1OWEzYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYwpAQCAtNTE5LDEyICs1MTksMTEgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2xvc3Qo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0KIH0KIAotdm9pZCBpOTE1X2dl bV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9nZW1fY29u dGV4dF9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGk5MTVf Z2VtX2NvbnRleHQgKmRjdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CiAKLQlsb2NrZGVw X2Fzc2VydF9oZWxkKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJbG9ja2RlcF9hc3NlcnRfaGVsZCgm ZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJY29udGV4dF9jbG9zZShkY3R4KTsKIAlk ZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgPSBOVUxMOwotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=