From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 04/51] drm/i915: Merged the many do_execbuf() parameters into a structure Date: Fri, 13 Feb 2015 11:48:13 +0000 Message-ID: <1423828140-10653-5-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6386E894E3 for ; Fri, 13 Feb 2015 03:49:10 -0800 (PST) In-Reply-To: <1423828140-10653-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBkb19l eGVjYnVmKCkgZnVuY3Rpb24gdGFrZXMgcXVpdGUgYSBmZXcgcGFyYW1ldGVycy4gVGhlIGFjdHVh bCBzZXQgb2YKcGFyYW1ldGVycyBpcyBnb2luZyB0byBjaGFuZ2Ugd2l0aCB0aGUgY29udmVyc2lv biB0byBwYXNzaW5nIHJlcXVlc3RzIGFyb3VuZC4KRnVydGhlciwgaXQgaXMgZHVlIHRvIGdyb3cg bWFzc2l2ZWx5IHdpdGggdGhlIGFycml2YWwgb2YgdGhlIEdQVSBzY2hlZHVsZXIuCgpUaGlzIHBh dGNoIHNpbXBsaWVzIHRoZSBwcm90b3R5cGUgYnkgcGFzc2luZyBhIHBhcmFtZXRlciBzdHJ1Y3R1 cmUgaW5zdGVhZC4KQ2hhbmdpbmcgdGhlIHBhcmFtZXRlciBzZXQgaW4gdGhlIGZ1dHVyZSBpcyB0 aGVuIHNpbXBseSBhIG1hdHRlciBvZgphZGRpbmcvcmVtb3ZpbmcgaXRlbXMgdG8gdGhlIHN0cnVj dHVyZS4KCk5vdGUgdGhhdCB0aGUgc3RydWN0dXJlIGRvZXMgbm90IGNvbnRhaW4gYWJzb2x1dGVs eSBldmVyeXRoaW5nIHRoYXQgaXMgcGFzc2VkCmluLiBUaGlzIGlzIGJlY2F1c2UgdGhlIGludGVu dGlvbiBpcyB0byB1c2UgdGhpcyBzdHJ1Y3R1cmUgbW9yZSBleHRlbnNpdmVseQpsYXRlciBpbiB0 aGlzIHBhdGNoIHNlcmllcyBhbmQgbW9yZSBlc3BlY2lhbGx5IGluIHRoZSBHUFUgc2NoZWR1bGVy IHRoYXQgaXMKY29taW5nIHNvb24uIFRoZSBsYXR0ZXIgcmVxdWlyZXMgaGFuZ2luZyBvbiB0byB0 aGUgc3RydWN0dXJlIGFzIHRoZSBmaW5hbApoYXJkd2FyZSBzdWJtaXNzaW9uIGNhbiBiZSBkZWxh eWVkIHVudGlsIGxvbmcgYWZ0ZXIgdGhlIGV4ZWNidWYgSU9DVEwgaGFzCnJldHVybmVkIHRvIHVz ZXIgbGFuZC4gVGh1cyBpdCBpcyB1bnNhZmUgdG8gcHV0IGFueXRoaW5nIGluIHRoZSBzdHJ1Y3R1 cmUgdGhhdAppcyBsb2NhbCB0byB0aGUgSU9DVEwgY2FsbCBpdHNlbGYgLSBzdWNoIGFzIHRoZSAn YXJncycgcGFyYW1ldGVyLiBBbGwgZW50cmllcwptdXN0IGJlIGNvcGllcyBvZiBkYXRhIG9yIHBv aW50ZXJzIHRvIHN0cnVjdHVyZXMgdGhhdCBhcmUgcmVmZXJlbmNlIGNvdW50ZWQgaW4Kc29tZXdh eSBhbmQgZ3VhcmFudGVlZCB0byBleGlzdCBmb3IgdGhlIGR1cmF0aW9uIG9mIHRoZSBiYXRjaCBi dWZmZXIncyBsaWZlLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29u IDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICAgICAgICB8ICAgMjcgKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgNTYgKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgICAy NiArKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAgICAg ICAgfCAgICA5ICsrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDY3IGluc2VydGlvbnMoKyksIDUxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGU5MGI3ODYuLmU2ZDYxNmIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTY0MCw2ICsxNjQwLDE2IEBAIHN0cnVjdCBp OTE1X3dvcmthcm91bmRzIHsKIAl1MzIgY291bnQ7CiB9OwogCitzdHJ1Y3QgaTkxNV9leGVjYnVm ZmVyX3BhcmFtcyB7CisJc3RydWN0IGRybV9kZXZpY2UgICAgICAgICAgICAgICAqZGV2OworCXN0 cnVjdCBkcm1fZmlsZSAgICAgICAgICAgICAgICAgKmZpbGU7CisJdWludDMyX3QgICAgICAgICAg ICAgICAgICAgICAgICBkaXNwYXRjaF9mbGFnczsKKwl1aW50MzJfdCAgICAgICAgICAgICAgICAg ICAgICAgIGJhdGNoX29ial92bV9vZmZzZXQ7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAgICAg ICAgICAqcmluZzsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAgICAgICpiYXRjaF9vYmo7 CisJc3RydWN0IGludGVsX2NvbnRleHQgICAgICAgICAgICAqY3R4OworfTsKKwogc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CiAJc3RydWN0IGttZW1f Y2FjaGUgKnNsYWI7CkBAIC0xODkxLDEzICsxOTAxLDkgQEAgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgewogCiAJLyogQWJzdHJhY3QgdGhlIHN1Ym1pc3Npb24gbWVjaGFuaXNtIChsZWdhY3kgcmlu Z2J1ZmZlciBvciBleGVjbGlzdHMpIGF3YXkgKi8KIAlzdHJ1Y3QgewotCQlpbnQgKCpkb19leGVj YnVmKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JCQkJ ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCSAgc3RydWN0IGludGVsX2NvbnRl eHQgKmN0eCwKKwkJaW50ICgqZG9fZXhlY2J1Zikoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJh bXMgKnBhcmFtcywKIAkJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3Ms Ci0JCQkJICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAotCQkJCSAgc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmJhdGNoX29iaiwKLQkJCQkgIHU2NCBleGVjX3N0YXJ0LCB1MzIgZmxhZ3MpOwor CQkJCSAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcyk7CiAJCWludCAoKmluaXRfcmluZ3MpKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogCQl2b2lkICgqY2xlYW51cF9yaW5nKShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKTsKIAkJdm9pZCAoKnN0b3BfcmluZykoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZyk7CkBAIC0yNjIyLDE0ICsyNjI4LDkgQEAgdm9pZCBpOTE1X2dlbV9leGVjYnVm ZmVyX3JldGlyZV9jb21tYW5kcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQkgc3RydWN0 IGRybV9maWxlICpmaWxlLAogCQkJCQkgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJ CQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwotaW50IGk5MTVfZ2VtX3Jpbmdi dWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCSAgIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSwKLQkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJ CSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCitpbnQgaTkxNV9nZW1fcmluZ2J1ZmZlcl9z dWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQkJICAg c3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKLQkJCQkgICBzdHJ1Y3QgbGlz dF9oZWFkICp2bWFzLAotCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaF9v YmosCi0JCQkJICAgdTY0IGV4ZWNfc3RhcnQsIHUzMiBmbGFncyk7CisJCQkJICAgc3RydWN0IGxp c3RfaGVhZCAqdm1hcyk7CiBpbnQgaTkxNV9nZW1fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwogaW50 IGk5MTVfZ2VtX2V4ZWNidWZmZXIyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZWM5ZWE0 NS4uOTNiMGVmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YwpAQCAtMTEzMiwxNyArMTEzMiwxNSBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3BhcnNlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiB9CiAKIGludAotaTkxNV9nZW1fcmluZ2J1ZmZlcl9z dWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwK LQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJICAgICAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCitpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3Ry dWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJCSAgICAgICBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX2V4ZWNidWZmZXIyICphcmdzLAotCQkJICAgICAgIHN0cnVjdCBsaXN0X2hlYWQg KnZtYXMsCi0JCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmJhdGNoX29iaiwK LQkJCSAgICAgICB1NjQgZXhlY19zdGFydCwgdTMyIGRpc3BhdGNoX2ZsYWdzKQorCQkJICAgICAg IHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMpCiB7CiAJc3RydWN0IGRybV9jbGlwX3JlY3QgKmNsaXBy ZWN0cyA9IE5VTEw7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBhcmFtcy0+ZGV2OworCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSBwYXJhbXMtPnJpbmc7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQl1NjQgZXhlY19sZW47 CisJdTY0IGV4ZWNfc3RhcnQsIGV4ZWNfbGVuOwogCWludCBpbnN0cF9tb2RlOwogCXUzMiBpbnN0 cF9tYXNrOwogCWludCBpLCByZXQgPSAwOwpAQCAtMTE5NCw3ICsxMTkyLDcgQEAgaTkxNV9nZW1f cmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1f ZmlsZSAqZmlsZSwKIAlpZiAocmV0KQogCQlnb3RvIGVycm9yOwogCi0JcmV0ID0gaTkxNV9zd2l0 Y2hfY29udGV4dChyaW5nLCBjdHgpOworCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmluZywg cGFyYW1zLT5jdHgpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAKQEAgLTEyNTEsMTIgKzEy NDksMTUgQEAgaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAl9CiAKIAlpZiAoYXJncy0+ZmxhZ3MgJiBJ OTE1X0VYRUNfR0VON19TT0xfUkVTRVQpIHsKLQkJcmV0ID0gaTkxNV9yZXNldF9nZW43X3NvbF9v ZmZzZXRzKGRldiwgcmluZyk7CisJCXJldCA9IGk5MTVfcmVzZXRfZ2VuN19zb2xfb2Zmc2V0cyhw YXJhbXMtPmRldiwgcmluZyk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGVycm9yOwogCX0KIAotCWV4 ZWNfbGVuID0gYXJncy0+YmF0Y2hfbGVuOworCWV4ZWNfbGVuICAgPSBhcmdzLT5iYXRjaF9sZW47 CisJZXhlY19zdGFydCA9IHBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCArCisJCSAgICAgYXJn cy0+YmF0Y2hfc3RhcnRfb2Zmc2V0OworCiAJaWYgKGNsaXByZWN0cykgewogCQlmb3IgKGkgPSAw OyBpIDwgYXJncy0+bnVtX2NsaXByZWN0czsgaSsrKSB7CiAJCQlyZXQgPSBpOTE1X2VtaXRfYm94 KHJpbmcsICZjbGlwcmVjdHNbaV0sCkBAIC0xMjY2LDIyICsxMjY3LDIzIEBAIGk5MTVfZ2VtX3Jp bmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUsCiAKIAkJCXJldCA9IHJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIocmluZywKIAkJ CQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKLQkJCQkJCQlkaXNwYXRjaF9mbGFncyk7CisJCQkJ CQkJcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJCQlpZiAocmV0KQogCQkJCWdvdG8gZXJyb3I7 CiAJCX0KIAl9IGVsc2UgewogCQlyZXQgPSByaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyKHJpbmcs CiAJCQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKLQkJCQkJCWRpc3BhdGNoX2ZsYWdzKTsKKwkJ CQkJCXBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IAl9CiAKLQl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKGludGVsX3JpbmdfZ2V0X3JlcXVl c3QocmluZyksIGRpc3BhdGNoX2ZsYWdzKTsKKwl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNo KGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyksIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwog CiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCByaW5nKTsKLQlpOTE1 X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhkZXYsIGZpbGUsIHJpbmcsIGJhdGNoX29i aik7CisJaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMocGFyYW1zLT5kZXYsIHBh cmFtcy0+ZmlsZSwgcmluZywKKwkJCQkJICAgIHBhcmFtcy0+YmF0Y2hfb2JqKTsKIAogZXJyb3I6 CiAJa2ZyZWUoY2xpcHJlY3RzKTsKQEAgLTEzNTEsOCArMTM1Myw5IEBAIGk5MTVfZ2VtX2RvX2V4 ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nOwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7CiAJc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm07CisJc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMg cGFyYW1zX21hc3RlcjsgLyogWFhYOiB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIgKi8KKwlzdHJ1Y3Qg aTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zID0gJnBhcmFtc19tYXN0ZXI7CiAJY29uc3Qg dTMyIGN0eF9pZCA9IGk5MTVfZXhlY2J1ZmZlcjJfZ2V0X2NvbnRleHRfaWQoKmFyZ3MpOwotCXU2 NCBleGVjX3N0YXJ0ID0gYXJncy0+YmF0Y2hfc3RhcnRfb2Zmc2V0OwogCXUzMiBkaXNwYXRjaF9m bGFnczsKIAlpbnQgcmV0OwogCWJvb2wgbmVlZF9yZWxvY3M7CkBAIC0xNDQ1LDYgKzE0NDgsOCBA QCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiAJZWxzZQogCQl2bSA9ICZkZXZfcHJpdi0+Z3R0LmJhc2U7CiAKKwltZW1zZXQoJnBhcmFt c19tYXN0ZXIsIDB4MDAsIHNpemVvZihwYXJhbXNfbWFzdGVyKSk7CisKIAllYiA9IGViX2NyZWF0 ZShhcmdzKTsKIAlpZiAoZWIgPT0gTlVMTCkgewogCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJl bmNlKGN0eCk7CkBAIC0xNTIyLDEzICsxNTI3LDI0IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJaWYgKHJldCkKIAkJCWdvdG8g ZXJyOwogCi0JCWV4ZWNfc3RhcnQgKz0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGJhdGNoX29i aik7CisJCXBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCA9IGk5MTVfZ2VtX29ial9nZ3R0X29m ZnNldChiYXRjaF9vYmopOwogCX0gZWxzZQotCQlleGVjX3N0YXJ0ICs9IGk5MTVfZ2VtX29ial9v ZmZzZXQoYmF0Y2hfb2JqLCB2bSk7CisJCXBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCA9IGk5 MTVfZ2VtX29ial9vZmZzZXQoYmF0Y2hfb2JqLCB2bSk7CiAKLQlyZXQgPSBkZXZfcHJpdi0+Z3Qu ZG9fZXhlY2J1ZihkZXYsIGZpbGUsIHJpbmcsIGN0eCwgYXJncywKLQkJCQkgICAgICAmZWItPnZt YXMsIGJhdGNoX29iaiwgZXhlY19zdGFydCwKLQkJCQkgICAgICBkaXNwYXRjaF9mbGFncyk7CisJ LyoKKwkgKiBTYXZlIGFzc29ydGVkIHN0dWZmIGF3YXkgdG8gcGFzcyB0aHJvdWdoIHRvICpfc3Vi bWlzc2lvbigpLgorCSAqIE5COiBUaGlzIGRhdGEgc2hvdWxkIGJlICdwZXJzaXN0ZW50JyBhbmQg bm90IGxvY2FsIGFzIGl0IHdpbGwKKwkgKiBrZXB0IGFyb3VuZCBiZXlvbmQgdGhlIGR1cmF0aW9u IG9mIHRoZSBJT0NUTCBvbmNlIHRoZSBHUFUKKwkgKiBzY2hlZHVsZXIgYXJyaXZlcy4KKwkgKi8K KwlwYXJhbXMtPmRldiAgICAgICAgICAgICAgICAgICAgID0gZGV2OworCXBhcmFtcy0+ZmlsZSAg ICAgICAgICAgICAgICAgICAgPSBmaWxlOworCXBhcmFtcy0+cmluZyAgICAgICAgICAgICAgICAg ICAgPSByaW5nOworCXBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MgICAgICAgICAgPSBkaXNwYXRjaF9m bGFnczsKKwlwYXJhbXMtPmJhdGNoX29iaiAgICAgICAgICAgICAgID0gYmF0Y2hfb2JqOworCXBh cmFtcy0+Y3R4ICAgICAgICAgICAgICAgICAgICAgPSBjdHg7CisKKwlyZXQgPSBkZXZfcHJpdi0+ Z3QuZG9fZXhlY2J1ZihwYXJhbXMsIGFyZ3MsICZlYi0+dm1hcyk7CiAKIAkvKgogCSAqIEZJWE1F OiBXZSBjcnVjaWFsbHkgcmVseSB1cG9uIHRoZSBhY3RpdmUgdHJhY2tpbmcgZm9yIHRoZSAocHBn dHQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDc2MjEzNmIuLmNhMjkyOTAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC02MTgsMTYgKzYxOCwxNSBAQCBzdGF0aWMgaW50IGV4 ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKICAq CiAgKiBSZXR1cm46IG5vbi16ZXJvIGlmIHRoZSBzdWJtaXNzaW9uIGZhaWxzLgogICovCi1pbnQg aW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGRybV9maWxlICpmaWxlLAotCQkJICAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs Ci0JCQkgICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKK2ludCBpbnRlbF9leGVjbGlz dHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJ ICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3MsCi0JCQkgICAgICAg c3RydWN0IGxpc3RfaGVhZCAqdm1hcywKLQkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqYmF0Y2hfb2JqLAotCQkJICAgICAgIHU2NCBleGVjX3N0YXJ0LCB1MzIgZGlzcGF0Y2hf ZmxhZ3MpCisJCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKKwlzdHJ1Y3QgZHJt X2RldmljZSAgICAgICAqZGV2ID0gcGFyYW1zLT5kZXY7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAgKnJpbmcgPSBwYXJhbXMtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZiA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmOworCXN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmID0gcGFyYW1zLT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKKwl1 NjQgZXhlY19zdGFydDsKIAlpbnQgaW5zdHBfbW9kZTsKIAl1MzIgaW5zdHBfbWFzazsKIAlpbnQg cmV0OwpAQCAtNjc4LDEzICs2NzcsMTMgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9u KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJcmV0dXJu IC1FSU5WQUw7CiAJfQogCi0JcmV0ID0gZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHJpbmdidWYsIGN0 eCwgdm1hcyk7CisJcmV0ID0gZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHJpbmdidWYsIHBhcmFtcy0+ Y3R4LCB2bWFzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJaWYgKHJpbmcgPT0gJmRl dl9wcml2LT5yaW5nW1JDU10gJiYKIAkgICAgaW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRp dmVfY29uc3RhbnRzX21vZGUpIHsKLQkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJp bmdidWYsIGN0eCwgNCk7CisJCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVm LCBwYXJhbXMtPmN0eCwgNCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCkBAIC02OTcs MTQgKzY5NiwxNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCQlkZXZfcHJpdi0+cmVsYXRpdmVf Y29uc3RhbnRzX21vZGUgPSBpbnN0cF9tb2RlOwogCX0KIAotCXJldCA9IHJpbmctPmVtaXRfYmJf c3RhcnQocmluZ2J1ZiwgY3R4LCBleGVjX3N0YXJ0LCBkaXNwYXRjaF9mbGFncyk7CisJZXhlY19z dGFydCA9IHBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCArCisJCSAgICAgYXJncy0+YmF0Y2hf c3RhcnRfb2Zmc2V0OworCisJcmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChyaW5nYnVmLCBwYXJh bXMtPmN0eCwgZXhlY19zdGFydCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIAotCXRyYWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2goaW50ZWxfcmlu Z19nZXRfcmVxdWVzdChyaW5nKSwgZGlzcGF0Y2hfZmxhZ3MpOworCXRyYWNlX2k5MTVfZ2VtX3Jp bmdfZGlzcGF0Y2goaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSwgcGFyYW1zLT5kaXNwYXRj aF9mbGFncyk7CiAKIAlpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHZtYXMsIHJp bmcpOwotCWk5MTVfZ2VtX2V4ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKGRldiwgZmlsZSwgcmlu ZywgYmF0Y2hfb2JqKTsKKwlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhwYXJh bXMtPmRldiwgcGFyYW1zLT5maWxlLCByaW5nLCBwYXJhbXMtPmJhdGNoX29iaik7CiAKIAlyZXR1 cm4gMDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggMzA5MzgzNi4uYWUyZjNlZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTgwLDEzICs4MCwxMCBAQCB2b2lkIGludGVs X2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogLyogRXhl Y2xpc3RzICovCiBpbnQgaW50ZWxfc2FuaXRpemVfZW5hYmxlX2V4ZWNsaXN0cyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX2V4ZWNsaXN0cyk7Ci1pbnQgaW50ZWxfZXhlY2xpc3Rz X3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxl LAotCQkJICAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkgICAgICAgc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCwKK3N0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zOwor aW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFy YW1zICpwYXJhbXMsCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAq YXJncywKLQkJCSAgICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAotCQkJICAgICAgIHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaF9vYmosCi0JCQkgICAgICAgdTY0IGV4ZWNfc3Rh cnQsIHUzMiBkaXNwYXRjaF9mbGFncyk7CisJCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1h cyk7CiB1MzIgaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqY3R4X29iaik7CiAKIHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK