From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 04/10] drm/i915: More GEM init dev_priv cleanup Date: Thu, 1 Dec 2016 14:16:39 +0000 Message-ID: <1480601805-14391-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480601805-14391-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E6556E7F0 for ; Thu, 1 Dec 2016 14:16:58 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so34371637wma.3 for ; Thu, 01 Dec 2016 06:16:58 -0800 (PST) In-Reply-To: <1480601805-14391-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbXBsaWZp ZXMgdGhlIGNvZGUgdG8gcGFzcyB0aGUgcmlnaHQgcGFyYW1ldGVyIGluLgoKdjI6IENvbW1pdCBt ZXNzYWdlLiAoSm9vbmFzIExhaHRpbmVuKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29u YXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMgICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyAgICAgICAgIHwgMTAgKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jIHwgIDUgKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr KSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYTdmODViZGY4 ZDY2Li4zODNiZjFhYzFiZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNTQ0LDggKzU0 NCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdmdhX3N3aXRjaGVyb29fY2xpZW50X29wcyBpOTE1 X3N3aXRjaGVyb29fb3BzID0gewogc3RhdGljIHZvaWQgaTkxNV9nZW1fZmluaShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5z dHJ1Y3RfbXV0ZXgpOwotCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcygmZGV2X3ByaXYtPmRybSk7 Ci0JaTkxNV9nZW1fY29udGV4dF9maW5pKCZkZXZfcHJpdi0+ZHJtKTsKKwlpOTE1X2dlbV9jbGVh bnVwX2VuZ2luZXMoZGV2X3ByaXYpOworCWk5MTVfZ2VtX2NvbnRleHRfZmluaShkZXZfcHJpdik7 CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAlyY3VfYmFy cmllcigpOwpAQCAtODMzLDcgKzgzMyw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9l YXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaW50ZWxfaW5pdF9kaXNw bGF5X2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZ19ob29rcyhkZXZf cHJpdik7CiAJaW50ZWxfaW5pdF9hdWRpb19ob29rcyhkZXZfcHJpdik7Ci0JcmV0ID0gaTkxNV9n ZW1fbG9hZF9pbml0KCZkZXZfcHJpdi0+ZHJtKTsKKwlyZXQgPSBpOTE1X2dlbV9sb2FkX2luaXQo ZGV2X3ByaXYpOwogCWlmIChyZXQgPCAwKQogCQlnb3RvIGVycl9ndnQ7CiAKQEAgLTg2MSw3ICs4 NjEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfY2xlYW51cF9lYXJs eShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaTkxNV9wZXJmX2Zpbmko ZGV2X3ByaXYpOwotCWk5MTVfZ2VtX2xvYWRfY2xlYW51cCgmZGV2X3ByaXYtPmRybSk7CisJaTkx NV9nZW1fbG9hZF9jbGVhbnVwKGRldl9wcml2KTsKIAlpOTE1X3dvcmtxdWV1ZXNfY2xlYW51cChk ZXZfcHJpdik7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGJiYzZkMGYyZDhiZi4u MjBiYzBhZWY2NTZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5NzUsOCArMjk3NSw4 IEBAIGludCBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAkJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBpbnQgaTkx NV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJ c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwotaW50IGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQgaTkxNV9nZW1fbG9hZF9jbGVhbnVwKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBpOTE1X2dlbV9sb2FkX2NsZWFudXAoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9nZW1fbG9hZF9pbml0X2ZlbmNl cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGk5MTVfZ2VtX2ZyZWV6 ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGk5MTVfZ2VtX2ZyZWV6 ZV9sYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CkBAIC0zMTgwLDcgKzMx ODAsNyBAQCB2b2lkIGk5MTVfZ2VtX2NsZmx1c2hfb2JqZWN0KHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosIGJvb2wgZm9yY2UpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9pbml0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgX19tdXN0X2NoZWNrIGk5 MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQg aTkxNV9nZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKLXZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owordm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fd2FpdF9mb3JfaWRsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJCXVuc2lnbmVkIGludCBmbGFncyk7 CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKQEAgLTMyNjksNyArMzI2OSw3IEBAIHZvaWQgaTkxNV9nZW1fb2JqZWN0 X3NhdmVfYml0XzE3X3N3aXp6bGUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIC8q IGk5MTVfZ2VtX2NvbnRleHQuYyAqLwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jb250ZXh0 X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9nZW1f Y29udGV4dF9sb3N0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lkIGk5 MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9n ZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQg aTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1f ZmlsZSAqZmlsZSk7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfY2xvc2Uoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKIGludCBpOTE1X3N3aXRjaF9jb250ZXh0 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CmluZGV4IGIyYTJlNTg0M2RjOC4uNTkwNjVhZTBiMTUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKQEAgLTQ0ODAsOSArNDQ4MCw4IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIH0KIAogdm9pZAotaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKQEAgLTQ1MjIsOSArNDUyMSw4IEBAIGk5 MTVfZ2VtX2xvYWRfaW5pdF9mZW5jZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogfQogCiBpbnQKLWk5MTVfZ2VtX2xvYWRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQor aTkxNV9nZW1fbG9hZF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50 IGVyciA9IC1FTk9NRU07CiAKIAlkZXZfcHJpdi0+b2JqZWN0cyA9IEtNRU1fQ0FDSEUoZHJtX2k5 MTVfZ2VtX29iamVjdCwgU0xBQl9IV0NBQ0hFX0FMSUdOKTsKQEAgLTQ1OTMsMTAgKzQ1OTEsOCBA QCBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gZXJy OwogfQogCi12b2lkIGk5MTVfZ2VtX2xvYWRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQordm9pZCBpOTE1X2dlbV9sb2FkX2NsZWFudXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKLQogCVdBUk5fT04oIWxsaXN0X2VtcHR5KCZkZXZfcHJpdi0+bW0uZnJlZV9saXN0KSk7 CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZWE4NDdlODY1MTM3Li5hNTdjMjI2NTlh M2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTUxOSwxMiAr NTE5LDExIEBAIHZvaWQgaTkxNV9nZW1fY29udGV4dF9sb3N0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAl9CiB9CiAKLXZvaWQgaTkxNV9nZW1fY29udGV4dF9maW5pKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpkY3R4ID0g ZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OwogCi0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2LT5z dHJ1Y3RfbXV0ZXgpOworCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5kcm0uc3RydWN0 X211dGV4KTsKIAogCWNvbnRleHRfY2xvc2UoZGN0eCk7CiAJZGV2X3ByaXYtPmtlcm5lbF9jb250 ZXh0ID0gTlVMTDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK