From: Dave Gordon Subject: [PATCH v3 1/2] drm/i915: name the anonymous per-engine context struct Date: Tue, 22 Mar 2016 11:48:19 +0000 Message-ID: <1458647300-30914-1-git-send-email-david.s.gordon@intel.com> References: <56F0120D.201@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 002DA6E2B7 for ; Tue, 22 Mar 2016 11:48:23 +0000 (UTC) In-Reply-To: <56F0120D.201@intel.com> In-reply-to: <56F0120D.201@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 SW50cm9kdWNlIGEgbmFtZSBmb3IgdGhlIHByZXZpb3VzbHkgYW5vbnltb3VzIHBlci1lbmdpbmUg c3RydWN0dXJlCmVtYmVkZGVkIGluc2lkZSB0aGUgaW50ZWxfY29udGV4dCwgYW5kIHVzZSBsb2Nh bCBwb2ludGVycyB0byB0aGUKcmVsZXZhbnQgZWxlbWVudCBvZiB0aGlzIGFycmF5IHRvIHNpbXBs aWZ5IHZhcmlvdXMgZXhlY2xpc3QgZnVuY3Rpb25zLgpUaGlzIG1heSBpbXByb3ZlIHRoZSBjb21w aWxlcidzIGFiaWxpdHkgdG8gYXZvaWQgcmVkdW5kYW50IGRlcmVmZXJlbmNlLQphbmQgaW5kZXgg b3BlcmF0aW9ucy4KClRoaXMgdmVyc2lvbiBpcyBkZXJpdmVkIGZyb20gYW4gb3JpZ2luYWwgYnkg Q2hyaXMgV2lsc29uLCBkZXRhY2hlZApmcm9tIHRoZSBvcmlnaW5hbCBzZXQgb2YgcGF0Y2hlcyBp biB3aGljaCBpdCB3YXMgcG9zdGVkIGFuZCByZWJhc2VkCnRvIGN1cnJlbnQgbmlnaHRseS4KClRo ZW4gaXQgd2FzIHVwZGF0ZWQgYnkgVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4sCndobyBub3RlZDoKCiAgVGhpcyBhbm9ueW1vdXMgc3RydWN0IHdhcyBjYXVzaW5nIGEg Z29vZCBhbW91bnQgb2Ygb3Zlcmx5IHZlcmJvc2UKICBjb2RlLiBBbHNvLCBpZiB3ZSBuYW1lIGl0 IGFuZCBjYWNoZSB0aGUgcG9pbnRlciBsb2NhbGx5IHdoZW4gdGhlcmUKICBhcmUgbXVsdGlwbGUg YWNjZXNzZXMgdG8gaXQsIG5vdCBvbmx5IHRoZSBjb2RlIGlzIG1vcmUgcmVhZGFibGUsCiAgYnV0 IHRoZSBjb21waWxlciBtYW5hZ2VzIHRvIGdlbmVyYXRlIHNtYWxsZXIgYmluYXJ5LgoKICBBbG9u ZyB0aGUgd2F5IEkgYWxzbyBzaG9ydGVuZWQgYWNjZXNzIHRvIGRldl9wcml2IGFuZCBlbGltaW5h dGVkIHNvbWUKICB1bnVzZWQgdmFyaWFibGVzIGFuZCBjYWNoZWQgc29tZSB3aGVyZSBJIHNwb3R0 ZWQgdGhlIG9wcG9ydHVuaXR5LgoKVGhpcyB2ZXJzaW9uIHVzZXMgdGhlIG5hbWUgInN0cnVjdCBp bnRlbF9lbmdpbmVfY3R4IiBpbiBhY2NvcmRhbmNlIHdpdGgKdGhlIEVuZ2xpc2ggKGFuZCBHZXJt YW4pIGNvbnZlbnRpb24gdGhhdCB0aGUgY29uY3JldGUgbm91biBnb2VzIGF0IHRoZQplbmQgb2Yg YSBub3VuLXNlcXVlbmNlLCB3aXRoIGVhcmxpZXIgb25lcyBhY3RpbmcgYXMgYWRqZWN0aXZlcyBp LmUuIGFuCiJlbmdpbmUtY29udGV4dCIgaXMgdGhlIGNvbnRleHQgb2YgYW4gZW5naW5lLCB3aGVy ZWFzIGEgImNvbnRleHQtZW5naW5lIgp3b3VsZCBiZSBzb21lIHNvcnQgb2YgZW5naW5lIHRoYXQg cHJvY2Vzc2VzIGNvbnRleHRzLiBTaW5jZSBvYmplY3QgYW5kCnN0cnVjdHVyZSBuYW1lcyBhcmUg bm91bi1saWtlLCBpdCdzIG1vcmUgY29uc2lzdGVudCB0byBuYW1lIHRoZW0gdGhpcyB3YXkuCgpP cmlnaW5hbGx5LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2ln bmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggIHwgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyB8IDEyMiArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgNjIgaW5zZXJ0aW9ucygrKSwgNjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggMDBjNDFhNC4uYmUzNzA5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC04NDAsNyArODQwLDcgQEAgc3RydWN0IGludGVsX2NvbnRleHQgewogCX0gbGVnYWN5 X2h3X2N0eDsKIAogCS8qIEV4ZWNsaXN0cyAqLwotCXN0cnVjdCB7CisJc3RydWN0IGludGVsX2Vu Z2luZV9jdHggewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqc3RhdGU7CiAJCXN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwogCQlpbnQgcGluX2NvdW50OwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwppbmRleCBmNzI3ODIyLi5hMDU0YTMyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYwpAQCAtMzE2LDE2ICszMTYsMTYgQEAgaW50IGludGVsX3Nhbml0aXplX2VuYWJsZV9l eGVjbGlzdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVuYWJsZV9leGVjbGlzdHMKIGlu dGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcl91cGRhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0 eCwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CisJc3RydWN0IGlu dGVsX2VuZ2luZV9jdHggKmVjdHggPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CiAJdWludDY0 X3QgbHJjYSwgZGVzYzsKIAotCWxyY2EgPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfdm1h LT5ub2RlLnN0YXJ0ICsKLQkgICAgICAgTFJDX1BQSFdTUF9QTiAqIFBBR0VfU0laRTsKKwlscmNh ID0gZWN0eC0+bHJjX3ZtYS0+bm9kZS5zdGFydCArIExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJWkU7 CiAKLQlkZXNjID0gZW5naW5lLT5jdHhfZGVzY190ZW1wbGF0ZTsJCQkgICAvKiBiaXRzICAwLTEx ICovCisJZGVzYyA9IGVuZ2luZS0+Y3R4X2Rlc2NfdGVtcGxhdGU7CQkgICAvKiBiaXRzICAwLTEx ICovCiAJZGVzYyB8PSBscmNhOwkJCQkJICAgLyogYml0cyAxMi0zMSAqLwogCWRlc2MgfD0gKGxy Y2EgPj4gUEFHRV9TSElGVCkgPDwgR0VOOF9DVFhfSURfU0hJRlQ7IC8qIGJpdHMgMzItNTEgKi8K IAotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY19kZXNjID0gZGVzYzsKKwllY3R4LT5scmNf ZGVzYyA9IGRlc2M7CiB9CiAKIHVpbnQ2NF90IGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LApAQCAtMzYxLDggKzM2MSw3IEBAIHN0YXRpYyB2b2lk IGV4ZWNsaXN0c19lbHNwX3dyaXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEwLAog ewogCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcnEwLT5lbmdpbmU7Ci0Jc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gcnEwLT5pOTE1OwogCXVpbnQ2NF90IGRlc2NbMl07CiAKIAlpZiAocnEx KSB7CkBAIC00NjgsMTEgKzQ2Nyw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3Vu cXVldWVfX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCSAqIHJlc3Vi bWl0IHRoZSByZXF1ZXN0LiBTZWUgZ2VuOF9lbWl0X3JlcXVlc3QoKSBmb3Igd2hlcmUgd2UKIAkJ ICogcHJlcGFyZSB0aGUgcGFkZGluZyBhZnRlciB0aGUgZW5kIG9mIHRoZSByZXF1ZXN0LgogCQkg Ki8KLQkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7Ci0KLQkJcmluZ2J1ZiA9IHJl cTAtPmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CiAJCXJlcTAtPnRhaWwgKz0gODsK LQkJcmVxMC0+dGFpbCAmPSByaW5nYnVmLT5zaXplIC0gMTsKKwkJcmVxMC0+dGFpbCAmPSByZXEw LT5yaW5nYnVmLT5zaXplIC0gMTsKIAl9CiAKIAlleGVjbGlzdHNfc3VibWl0X3JlcXVlc3RzKHJl cTAsIHJlcTEpOwpAQCAtNjY5LDcgKzY2NSw4IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2lu dmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHN0 YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxLAogCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQogewotCWNvbnN0IHVuc2lnbmVk IG90aGVyX3JpbmdzID0gfmludGVsX2VuZ2luZV9mbGFnKHJlcS0+ZW5naW5lKTsKKwlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKKwljb25zdCB1bnNpZ25lZCBv dGhlcl9yaW5ncyA9IH5pbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpOwogCXN0cnVjdCBpOTE1X3Zt YSAqdm1hOwogCXVpbnQzMl90IGZsdXNoX2RvbWFpbnMgPSAwOwogCWJvb2wgZmx1c2hfY2hpcHNl dCA9IGZhbHNlOwpAQCAtNjc5LDcgKzY3Niw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVf dG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqID0gdm1hLT5vYmo7CiAKIAkJaWYgKG9iai0+YWN0aXZlICYgb3Ro ZXJfcmluZ3MpIHsKLQkJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5lbmdp bmUsICZyZXEpOworCQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCBlbmdpbmUsICZy ZXEpOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0OwogCQl9CkBAIC03MDEsOSArNjk4LDEx IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxLAogCiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0 cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKKwlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXF1ZXN0LT5lbmdpbmU7CisJc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCA9IHJlcXVlc3QtPmN0eDsKIAlpbnQgcmV0ID0gMDsKIAotCXJlcXVlc3QtPnJp bmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyZXF1ZXN0LT5lbmdpbmUtPmlkXS5yaW5nYnVm OworCXJlcXVlc3QtPnJpbmdidWYgPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5yaW5nYnVmOwog CiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7CiAJCS8qCkBAIC03MTgsOCArNzE3 LDggQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIAkJCXJldHVybiByZXQ7CiAJfQogCi0JaWYg KHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29udGV4dCkKLQkJcmV0ID0g aW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdC0+Y3R4LCByZXF1ZXN0LT5lbmdpbmUpOworCWlm IChjdHggIT0gcmVxdWVzdC0+aTkxNS0+a2VybmVsX2NvbnRleHQpCisJCXJldCA9IGludGVsX2xy X2NvbnRleHRfcGluKGN0eCwgZW5naW5lKTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC03ODEsNiAr NzgwLDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYgPSByZXF1ZXN0LT5yaW5nYnVmOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHJlcXVlc3QtPmk5MTU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVx dWVzdC0+ZW5naW5lOworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXF1ZXN0LT5jdHg7 CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKIAlyZXF1ZXN0LT50YWls ID0gcmluZ2J1Zi0+dGFpbDsKQEAgLTc5OCwxMiArNzk4LDEyIEBAIHN0YXRpYyBpbnQgbG9naWNh bF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CWlmIChpbnRlbF9lbmdpbmVfc3RvcHBlZChlbmdpbmUpKQogCQlyZXR1cm4gMDsKIAotCWlmIChl bmdpbmUtPmxhc3RfY29udGV4dCAhPSByZXF1ZXN0LT5jdHgpIHsKKwlpZiAoZW5naW5lLT5sYXN0 X2NvbnRleHQgIT0gY3R4KSB7CiAJCWlmIChlbmdpbmUtPmxhc3RfY29udGV4dCkKIAkJCWludGVs X2xyX2NvbnRleHRfdW5waW4oZW5naW5lLT5sYXN0X2NvbnRleHQsIGVuZ2luZSk7Ci0JCWlmIChy ZXF1ZXN0LT5jdHggIT0gcmVxdWVzdC0+aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKLQkJCWludGVs X2xyX2NvbnRleHRfcGluKHJlcXVlc3QtPmN0eCwgZW5naW5lKTsKLQkJCWVuZ2luZS0+bGFzdF9j b250ZXh0ID0gcmVxdWVzdC0+Y3R4OworCQlpZiAoY3R4ICE9IGRldl9wcml2LT5rZXJuZWxfY29u dGV4dCkgeworCQkJaW50ZWxfbHJfY29udGV4dF9waW4oY3R4LCBlbmdpbmUpOworCQkJZW5naW5l LT5sYXN0X2NvbnRleHQgPSBjdHg7CiAJCX0gZWxzZSB7CiAJCQllbmdpbmUtPmxhc3RfY29udGV4 dCA9IE5VTEw7CiAJCX0KQEAgLTk0OCw5ICs5NDgsOCBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1 Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJCSAgICAg ICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyICphcmdzLAogCQkJICAgICAgIHN0cnVj dCBsaXN0X2hlYWQgKnZtYXMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgICAgICAgKmRldiA9IHBh cmFtcy0+ZGV2OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHBhcmFtcy0+ZW5n aW5lOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwYXJhbXMt PmRldik7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBwYXJhbXMtPmN0eC0+ ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CiAJdTY0IGV4ZWNfc3RhcnQ7CiAJaW50IGluc3Rw X21vZGU7CkBAIC0xMDI0LDYgKzEwMjMsNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Np b24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAogdm9pZCBpbnRlbF9l eGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IHsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqZGN0eCA9IHRvX2k5MTUoZW5naW5lLT5kZXYpLT5r ZXJuZWxfY29udGV4dDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgKnRtcDsK IAlzdHJ1Y3QgbGlzdF9oZWFkIHJldGlyZWRfbGlzdDsKIApAQCAtMTAzOCwxMCArMTAzOCw4IEBA IHZvaWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUocmVxLCB0bXAsICZyZXRp cmVkX2xpc3QsIGV4ZWNsaXN0X2xpbmspIHsKIAkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9 IHJlcS0+Y3R4OwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9Ci0JCQkJ Y3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGU7CiAKLQkJaWYgKGN0eF9vYmogJiYgKGN0eCAh PSByZXEtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSkKKwkJaWYgKGN0eCAhPSBkY3R4ICYmIGN0eC0+ ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlKQogCQkJaW50ZWxfbHJfY29udGV4dF91bnBpbihjdHgs IGVuZ2luZSk7CiAKIAkJbGlzdF9kZWwoJnJlcS0+ZXhlY2xpc3RfbGluayk7CkBAIC0xMDkxLDE3 ICsxMDg5LDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9kb19waW4oc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ZGV2OwotCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZTsK LQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW2VuZ2luZS0+ aWRdLnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3R4LT5p OTE1OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3R4ICplY3R4ID0gJmN0eC0+ZW5naW5lW2VuZ2lu ZS0+aWRdOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gZWN0eC0+c3Rh dGU7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBlY3R4LT5yaW5nYnVmOwog CXN0cnVjdCBwYWdlICpscmNfc3RhdGVfcGFnZTsKIAl1aW50MzJfdCAqbHJjX3JlZ19zdGF0ZTsK IAlpbnQgcmV0OwogCi0JV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZlbmdpbmUtPmRldi0+c3Ry dWN0X211dGV4KSk7CisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZkZXYtPnN0cnVjdF9tdXRl eCkpOwogCiAJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosIEdFTjhfTFJfQ09O VEVYVF9BTElHTiwKLQkJCVBJTl9PRkZTRVRfQklBUyB8IEdVQ19XT1BDTV9UT1ApOworCQkJCSAg ICBQSU5fT0ZGU0VUX0JJQVMgfCBHVUNfV09QQ01fVE9QKTsKIAlpZiAocmV0KQogCQlyZXR1cm4g cmV0OwogCkBAIC0xMTExLDE1ICsxMTEwLDE1IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4 dF9kb19waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJZ290byB1bnBpbl9jdHhfb2Jq OwogCX0KIAotCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGVuZ2luZS0+ ZGV2LCByaW5nYnVmKTsKKwlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihk ZXYsIHJpbmdidWYpOwogCWlmIChyZXQpCiAJCWdvdG8gdW5waW5fY3R4X29iajsKIAotCWN0eC0+ ZW5naW5lW2VuZ2luZS0+aWRdLmxyY192bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChjdHhfb2Jq KTsKKwllY3R4LT5scmNfdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQoY3R4X29iaik7CiAJaW50 ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yX3VwZGF0ZShjdHgsIGVuZ2luZSk7CiAJbHJjX3JlZ19z dGF0ZSA9IGttYXAobHJjX3N0YXRlX3BhZ2UpOwogCWxyY19yZWdfc3RhdGVbQ1RYX1JJTkdfQlVG RkVSX1NUQVJUKzFdID0gcmluZ2J1Zi0+dm1hLT5ub2RlLnN0YXJ0OwotCWN0eC0+ZW5naW5lW2Vu Z2luZS0+aWRdLmxyY19yZWdfc3RhdGUgPSBscmNfcmVnX3N0YXRlOworCWVjdHgtPmxyY19yZWdf c3RhdGUgPSBscmNfcmVnX3N0YXRlOwogCWN0eF9vYmotPmRpcnR5ID0gdHJ1ZTsKIAogCS8qIElu dmFsaWRhdGUgR3VDIFRMQi4gKi8KQEAgLTExMzcsOSArMTEzNiwxMCBAQCBzdGF0aWMgaW50IGlu dGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3R4ICplY3R4ID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCWludCByZXQgPSAwOwogCi0J aWYgKGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnBpbl9jb3VudCsrID09IDApIHsKKwlpZiAoZWN0 eC0+cGluX2NvdW50KysgPT0gMCkgewogCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RvX3Bpbihj dHgsIGVuZ2luZSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIHJlc2V0X3Bpbl9jb3VudDsKQEAgLTEx NDksMjMgKzExNDksMjQgQEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4LAogCXJldHVybiByZXQ7CiAKIHJlc2V0X3Bpbl9jb3VudDoKLQlj dHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5waW5fY291bnQgPSAwOworCWVjdHgtPnBpbl9jb3VudCA9 IDA7CiAJcmV0dXJuIHJldDsKIH0KIAogdm9pZCBpbnRlbF9scl9jb250ZXh0X3VucGluKHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdp bmVbZW5naW5lLT5pZF0uc3RhdGU7CisJc3RydWN0IGludGVsX2VuZ2luZV9jdHggKmVjdHggPSAm Y3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CiAKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmN0 eC0+aTkxNS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKLQlpZiAoLS1jdHgtPmVuZ2luZVtlbmdpbmUt PmlkXS5waW5fY291bnQgPT0gMCkgewotCQlrdW5tYXAoa21hcF90b19wYWdlKGN0eC0+ZW5naW5l W2VuZ2luZS0+aWRdLmxyY19yZWdfc3RhdGUpKTsKLQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9v YmooY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1Zik7Ci0JCWk5MTVfZ2VtX29iamVjdF9n Z3R0X3VucGluKGN0eF9vYmopOwotCQljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfdm1hID0g TlVMTDsKLQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX2Rlc2MgPSAwOwotCQljdHgtPmVu Z2luZVtlbmdpbmUtPmlkXS5scmNfcmVnX3N0YXRlID0gTlVMTDsKKworCWlmICgtLWVjdHgtPnBp bl9jb3VudCA9PSAwKSB7CisJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKGVjdHgtPnJpbmdi dWYpOworCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihlY3R4LT5zdGF0ZSk7CisJCWt1bm1h cChrbWFwX3RvX3BhZ2UoZWN0eC0+bHJjX3JlZ19zdGF0ZSkpOworCQllY3R4LT5scmNfcmVnX3N0 YXRlID0gTlVMTDsKKwkJZWN0eC0+bHJjX3ZtYSA9IE5VTEw7CisJCWVjdHgtPmxyY19kZXNjID0g MDsKIAogCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7CiAJfQpAQCAtMTE3Niw4 ICsxMTc3LDcgQEAgc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1p dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpbnQgcmV0LCBpOwogCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5naW5lOwogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gcmVxLT5yaW5nYnVmOwotCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBlbmdpbmUtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJl cS0+aTkxNTsKIAlzdHJ1Y3QgaTkxNV93b3JrYXJvdW5kcyAqdyA9ICZkZXZfcHJpdi0+d29ya2Fy b3VuZHM7CiAKIAlpZiAody0+Y291bnQgPT0gMCkKQEAgLTE1NjMsMTIgKzE1NjMsMTEgQEAgc3Rh dGljIGludCBpbnRlbF9pbml0X3dvcmthcm91bmRfYmIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCiBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5kZXYtPmRl dl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3R4ICplY3R4ID0gJmRldl9wcml2LT5r ZXJuZWxfY29udGV4dC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCXVuc2lnbmVkIGludCBuZXh0X2Nv bnRleHRfc3RhdHVzX2J1ZmZlcl9odzsKIAotCWxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFn ZShlbmdpbmUsCi0JCQkJICAgICAgIGRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW2Vu Z2luZS0+aWRdLnN0YXRlKTsKKwlscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UoZW5naW5l LCBlY3R4LT5zdGF0ZSk7CiAKIAlJOTE1X1dSSVRFX0lNUihlbmdpbmUsCiAJCSAgICAgICB+KGVu Z2luZS0+aXJxX2VuYWJsZV9tYXNrIHwgZW5naW5lLT5pcnFfa2VlcF9tYXNrKSk7CkBAIC0yNTEy LDggKzI1MTEsOSBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY3R4KQogCWludCBpOwogCiAJZm9yIChpID0gSTkxNV9OVU1fRU5HSU5FUzsgLS1pID49 IDA7ICkgewotCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5l W2ldLnJpbmdidWY7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4 LT5lbmdpbmVbaV0uc3RhdGU7CisJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3R4ICplY3R4ID0gJmN0 eC0+ZW5naW5lW2ldOworCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGVjdHgt PnJpbmdidWY7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gZWN0eC0+ c3RhdGU7CiAKIAkJaWYgKCFjdHhfb2JqKQogCQkJY29udGludWU7CkBAIC0yNTIzLDcgKzI1MjMs NyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 KQogCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7CiAJCX0KIAotCQlXQVJO X09OKGN0eC0+ZW5naW5lW2ldLnBpbl9jb3VudCk7CisJCVdBUk5fT04oZWN0eC0+cGluX2NvdW50 KTsKIAkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwogCQlkcm1fZ2VtX29iamVjdF91 bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJfQpAQCAtMjYwMywxMyArMjYwMywxNCBAQCBp bnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4LAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ZGV2OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3R4 ICplY3R4ID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpjdHhfb2JqOwogCXVpbnQzMl90IGNvbnRleHRfc2l6ZTsKIAlzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZjsKIAlpbnQgcmV0OwogCiAJV0FSTl9PTihjdHgtPmxlZ2FjeV9o d19jdHgucmNzX3N0YXRlICE9IE5VTEwpOwotCVdBUk5fT04oY3R4LT5lbmdpbmVbZW5naW5lLT5p ZF0uc3RhdGUpOworCVdBUk5fT04oZWN0eC0+c3RhdGUpOwogCiAJY29udGV4dF9zaXplID0gcm91 bmRfdXAoaW50ZWxfbHJfY29udGV4dF9zaXplKGVuZ2luZSksIDQwOTYpOwogCkBAIC0yNjM0LDgg KzI2MzUsOCBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50 ZWxfY29udGV4dCAqY3R4LAogCQlnb3RvIGVycm9yX3JpbmdidWY7CiAJfQogCi0JY3R4LT5lbmdp bmVbZW5naW5lLT5pZF0ucmluZ2J1ZiA9IHJpbmdidWY7Ci0JY3R4LT5lbmdpbmVbZW5naW5lLT5p ZF0uc3RhdGUgPSBjdHhfb2JqOworCWVjdHgtPnJpbmdidWYgPSByaW5nYnVmOworCWVjdHgtPnN0 YXRlID0gY3R4X29iajsKIAogCWlmIChjdHggIT0gY3R4LT5pOTE1LT5rZXJuZWxfY29udGV4dCAm JiBlbmdpbmUtPmluaXRfY29udGV4dCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcTsKQEAgLTI2NjIsMjMgKzI2NjMsMjIgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAlpbnRlbF9yaW5nYnVmZmVyX2Zy ZWUocmluZ2J1Zik7CiBlcnJvcl9kZXJlZl9vYmo6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVu Y2UoJmN0eF9vYmotPmJhc2UpOwotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWYgPSBO VUxMOwotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlID0gTlVMTDsKKwllY3R4LT5yaW5n YnVmID0gTlVMTDsKKwllY3R4LT5zdGF0ZSA9IE5VTEw7CiAJcmV0dXJuIHJldDsKIH0KIAogdm9p ZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQlzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY3R4KQorCQkJICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJaW50IGk7CiAKIAlmb3JfZWFj aF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaSkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqY3R4X29iaiA9Ci0JCQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGU7Ci0JCXN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0KLQkJCQljdHgtPmVuZ2luZVtlbmdpbmUt PmlkXS5yaW5nYnVmOworCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2N0eCAqZWN0eCA9ICZjdHgtPmVu Z2luZVtlbmdpbmUtPmlkXTsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmog PSBlY3R4LT5zdGF0ZTsKKwkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBlY3R4 LT5yaW5nYnVmOwogCQl1aW50MzJfdCAqcmVnX3N0YXRlOwogCQlzdHJ1Y3QgcGFnZSAqcGFnZTsK IAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=