From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 4/7] drm/i915: Sanitize i915_gem_load() init and clean-up Date: Tue, 19 Jan 2016 15:26:29 +0200 Message-ID: <1453209992-25995-5-git-send-email-imre.deak@intel.com> References: <1453209992-25995-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D64B6E08D for ; Tue, 19 Jan 2016 05:26:44 -0800 (PST) In-Reply-To: <1453209992-25995-1-git-send-email-imre.deak@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 RmFjdG9yIG91dCBjb21tb24gY2xlYW4tdXAgY29kZSBmb3IgdGhlIEdFTSBsb2FkIHRpbWUgaW5p dCBmdW5jdGlvbi4KQWxzbyByZW5hbWUgaTkxNV9nZW1fbG9hZCgpIHRvIGk5MTVfZ2VtX2xvYWRf aW5pdCgpIHRvIGhhdmUgYSBiZXR0ZXIKbWF0Y2ggd2l0aCBpdHMgbmV3IGNsZWFuLXVwIGZ1bmN0 aW9uLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGlt cmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyB8 IDEwICsrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMyArKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAxMSArKysrKysrKysrLQogMyBmaWxl cyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RtYS5jCmluZGV4IDZmOTk4OGYuLmI5MzFkYWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEu YwpAQCAtMTAzNSw3ICsxMDM1LDcgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAlpbnRlbF9zZXR1cF9tY2hiYXIoZGV2 KTsKIAlpbnRlbF9vcHJlZ2lvbl9zZXR1cChkZXYpOwogCi0JaTkxNV9nZW1fbG9hZChkZXYpOwor CWk5MTVfZ2VtX2xvYWRfaW5pdChkZXYpOwogCWk5MTVfZ2VtX3Nocmlua2VyX2luaXQoZGV2X3By aXYpOwogCiAJLyogT24gdGhlIDk0NUcvR00sIHRoZSBjaGlwc2V0IHJlcG9ydHMgdGhlIE1TSSBj YXBhYmlsaXR5IG9uIHRoZQpAQCAtMTEyMiw5ICsxMTIyLDcgQEAgb3V0X3VuY29yZV9maW5pOgog CXBjaV9pb3VubWFwKGRldi0+cGRldiwgZGV2X3ByaXYtPnJlZ3MpOwogcHV0X2JyaWRnZToKIAlw Y2lfZGV2X3B1dChkZXZfcHJpdi0+YnJpZGdlX2Rldik7Ci0Ja21lbV9jYWNoZV9kZXN0cm95KGRl dl9wcml2LT5yZXF1ZXN0cyk7Ci0Ja21lbV9jYWNoZV9kZXN0cm95KGRldl9wcml2LT52bWFzKTsK LQlrbWVtX2NhY2hlX2Rlc3Ryb3koZGV2X3ByaXYtPm9iamVjdHMpOworCWk5MTVfZ2VtX2xvYWRf Y2xlYW51cChkZXYpOwogb3V0X3J1bnRpbWVfcG1fcHV0OgogCWludGVsX3J1bnRpbWVfcG1fcHV0 KGRldl9wcml2KTsKIApAQCAtMTIxNiw5ICsxMjE0LDcgQEAgaW50IGk5MTVfZHJpdmVyX3VubG9h ZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChkZXZfcHJpdi0+cmVncyAhPSBOVUxMKQog CQlwY2lfaW91bm1hcChkZXYtPnBkZXYsIGRldl9wcml2LT5yZWdzKTsKIAotCWttZW1fY2FjaGVf ZGVzdHJveShkZXZfcHJpdi0+cmVxdWVzdHMpOwotCWttZW1fY2FjaGVfZGVzdHJveShkZXZfcHJp di0+dm1hcyk7Ci0Ja21lbV9jYWNoZV9kZXN0cm95KGRldl9wcml2LT5vYmplY3RzKTsKKwlpOTE1 X2dlbV9sb2FkX2NsZWFudXAoZGV2KTsKIAlwY2lfZGV2X3B1dChkZXZfcHJpdi0+YnJpZGdlX2Rl dik7CiAJa2ZyZWUoZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMWVh MTMyLi5lM2RmYzA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4NTAsNyArMjg1MCw4 IEBAIGludCBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAkJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBpbnQgaTkx NV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJ c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwotdm9pZCBpOTE1X2dlbV9sb2FkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwordm9pZCBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7Cit2b2lkIGk5MTVfZ2VtX2xvYWRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIHZvaWQgKmk5MTVfZ2VtX29iamVjdF9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgaTkxNV9nZW1fb2JqZWN0X2ZyZWUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaik7CiB2b2lkIGk5MTVfZ2VtX29iamVjdF9pbml0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiZjdmNzQxLi45ODlmZjIyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ5OTcsNyArNDk5Nyw3IEBAIGluaXRfcmluZ19s aXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiB2b2lkCi1pOTE1X2dlbV9s b2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCWludCBpOwpAQCAtNTA2Niw2ICs1MDY2LDE1IEBAIGk5MTVfZ2Vt X2xvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+ZmJf dHJhY2tpbmcubG9jayk7CiB9CiAKK3ZvaWQgaTkxNV9nZW1fbG9hZF9jbGVhbnVwKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOworCisJa21lbV9jYWNoZV9kZXN0cm95KGRldl9wcml2LT5yZXF1ZXN0cyk7 CisJa21lbV9jYWNoZV9kZXN0cm95KGRldl9wcml2LT52bWFzKTsKKwlrbWVtX2NhY2hlX2Rlc3Ry b3koZGV2X3ByaXYtPm9iamVjdHMpOworfQorCiB2b2lkIGk5MTVfZ2VtX3JlbGVhc2Uoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogewogCXN0cnVjdCBkcm1f aTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OwotLSAKMi41 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==