From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Name the anonymous per-engine context struct Date: Fri, 18 Mar 2016 15:00:56 +0000 Message-ID: <1458313256-18601-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id EF0836E3F4 for ; Fri, 18 Mar 2016 15:00:59 +0000 (UTC) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgYW5v bnltb3VzIHN0cnVjdCB3YXMgY2F1c2luZyBhIGdvb2QgYW1vdW50IG9mIG92ZXJseQp2ZXJib3Nl IGNvZGUuIEFsc28sIGlmIHdlIG5hbWUgaXQgYW5kIGNhY2hlIHRoZSBwb2ludGVyIGxvY2FsbHkK d2hlbiB0aGVyZSBhcmUgbXVsdGlwbGUgYWNjZXNzZXMgdG8gaXQsIG5vdCBvbmx5IHRoZSBjb2Rl IGlzCm1vcmUgcmVhZGFibGUsIGJ1dCB0aGUgY29tcGlsZXIgbWFuYWdlcyB0byBnZW5lcmF0ZSBz bWFsbGVyCmJpbmFyeS4KCkFsb25nIHRoZSB3YXkgSSBhbHNvIHNob3J0ZW5lZCBhY2Nlc3MgdG8g ZGV2X3ByaXYgYW5kIGVsaW1pbmF0ZWQKc29tZSB1bnVzZWQgdmFyaWFibGVzIGFuZCBjYWNoZWQg c29tZSB3aGVyZSBJIHNwb3R0ZWQgdGhlCm9wcG9ydHVuaXR5LgoKTmFtZSBmb3IgdGhlIHN0cnVj dHVyZSwgaW50ZWxfY29udGV4dF9lbmdpbmUsIGFuZCB0aGUgbG9jYWwKdmFyaWFibGUgbmFtZSB3 ZXJlIGJvcnJvd2VkIGZyb20gYSBzaW1pbGFyIHBhdGNoIGJ5IENocmlzIFdpbHNvbi4KClNpZ25l ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBD aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyB8IDk2ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggMDBjNDFhNGJkZTJhLi40ODA2MzljMzk1NDMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaApAQCAtODQwLDcgKzg0MCw3IEBAIHN0cnVjdCBpbnRlbF9jb250ZXh0IHsK IAl9IGxlZ2FjeV9od19jdHg7CiAKIAkvKiBFeGVjbGlzdHMgKi8KLQlzdHJ1Y3QgeworCXN0cnVj dCBpbnRlbF9jb250ZXh0X2VuZ2luZSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpz dGF0ZTsKIAkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJCWludCBwaW5fY291 bnQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDNhMjNiOTU0OWY3Yi4uYzYxZjY3OWE0 MGVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMzE2LDE2ICszMTYsMTYgQEAgc3Rh dGljIHZvaWQKIGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcl91cGRhdGUoc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7 CisJc3RydWN0IGludGVsX2NvbnRleHRfZW5naW5lICpjZSA9ICZjdHgtPmVuZ2luZVtlbmdpbmUt PmlkXTsKIAl1aW50NjRfdCBscmNhLCBkZXNjOwogCi0JbHJjYSA9IGN0eC0+ZW5naW5lW2VuZ2lu ZS0+aWRdLmxyY192bWEtPm5vZGUuc3RhcnQgKwotCSAgICAgICBMUkNfUFBIV1NQX1BOICogUEFH RV9TSVpFOworCWxyY2EgPSBjZS0+bHJjX3ZtYS0+bm9kZS5zdGFydCArIExSQ19QUEhXU1BfUE4g KiBQQUdFX1NJWkU7CiAKLQlkZXNjID0gZW5naW5lLT5jdHhfZGVzY190ZW1wbGF0ZTsJCQkgICAv KiBiaXRzICAwLTExICovCisJZGVzYyA9IGVuZ2luZS0+Y3R4X2Rlc2NfdGVtcGxhdGU7CQkgICAv KiBiaXRzICAwLTExICovCiAJZGVzYyB8PSBscmNhOwkJCQkJICAgLyogYml0cyAxMi0zMSAqLwog CWRlc2MgfD0gKGxyY2EgPj4gUEFHRV9TSElGVCkgPDwgR0VOOF9DVFhfSURfU0hJRlQ7IC8qIGJp dHMgMzItNTEgKi8KIAotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY19kZXNjID0gZGVzYzsK KwljZS0+bHJjX2Rlc2MgPSBkZXNjOwogfQogCiB1aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rl c2NyaXB0b3Ioc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKQEAgLTM2MSw4ICszNjEsNyBAQCBz dGF0aWMgdm9pZCBleGVjbGlzdHNfZWxzcF93cml0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJxMCwKIHsKIAogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJxMC0+ZW5n aW5lOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmdpbmUtPmRldjsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJxMC0+aTkxNTsKIAl1aW50NjRfdCBkZXNjWzJdOwog CiAJaWYgKHJxMSkgewpAQCAtNjcwLDcgKzY2OSw4IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5n X2ludmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK IHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxLAogCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQogewotCWNvbnN0IHVuc2ln bmVkIG90aGVyX3JpbmdzID0gfmludGVsX2VuZ2luZV9mbGFnKHJlcS0+ZW5naW5lKTsKKwlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKKwljb25zdCB1bnNpZ25l ZCBvdGhlcl9yaW5ncyA9IH5pbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpOwogCXN0cnVjdCBpOTE1 X3ZtYSAqdm1hOwogCXVpbnQzMl90IGZsdXNoX2RvbWFpbnMgPSAwOwogCWJvb2wgZmx1c2hfY2hp cHNldCA9IGZhbHNlOwpAQCAtNjgwLDcgKzY4MCw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21v dmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gdm1hLT5vYmo7CiAKIAkJaWYgKG9iai0+YWN0aXZlICYg b3RoZXJfcmluZ3MpIHsKLQkJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5l bmdpbmUsICZyZXEpOworCQkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCBlbmdpbmUs ICZyZXEpOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0OwogCQl9CkBAIC03ODIsNiArNzgy LDcgQEAgaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYgPSByZXF1ZXN0LT5yaW5nYnVmOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHJlcXVlc3QtPmk5MTU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVx dWVzdC0+ZW5naW5lOworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXF1ZXN0LT5jdHg7 CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKIAlyZXF1ZXN0LT50YWls ID0gcmluZ2J1Zi0+dGFpbDsKQEAgLTc5OSwxMiArODAwLDEyIEBAIGludGVsX2xvZ2ljYWxfcmlu Z19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 KQogCWlmIChpbnRlbF9lbmdpbmVfc3RvcHBlZChlbmdpbmUpKQogCQlyZXR1cm4gMDsKIAotCWlm IChlbmdpbmUtPmxhc3RfY29udGV4dCAhPSByZXF1ZXN0LT5jdHgpIHsKKwlpZiAoZW5naW5lLT5s YXN0X2NvbnRleHQgIT0gY3R4KSB7CiAJCWlmIChlbmdpbmUtPmxhc3RfY29udGV4dCkKIAkJCWlu dGVsX2xyX2NvbnRleHRfdW5waW4oZW5naW5lLT5sYXN0X2NvbnRleHQsIGVuZ2luZSk7Ci0JCWlm IChyZXF1ZXN0LT5jdHggIT0gcmVxdWVzdC0+aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKLQkJCWlu dGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QtPmN0eCwgZW5naW5lKTsKLQkJCWVuZ2luZS0+bGFz dF9jb250ZXh0ID0gcmVxdWVzdC0+Y3R4OworCQlpZiAoY3R4ICE9IGRldl9wcml2LT5rZXJuZWxf Y29udGV4dCkgeworCQkJaW50ZWxfbHJfY29udGV4dF9waW4oY3R4LCBlbmdpbmUpOworCQkJZW5n aW5lLT5sYXN0X2NvbnRleHQgPSBjdHg7CiAJCX0gZWxzZSB7CiAJCQllbmdpbmUtPmxhc3RfY29u dGV4dCA9IE5VTEw7CiAJCX0KQEAgLTk0OSw5ICs5NTAsOCBAQCBpbnQgaW50ZWxfZXhlY2xpc3Rz X3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJCSAg ICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyICphcmdzLAogCQkJICAgICAgIHN0 cnVjdCBsaXN0X2hlYWQgKnZtYXMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgICAgICAgKmRldiA9 IHBhcmFtcy0+ZGV2OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHBhcmFtcy0+ ZW5naW5lOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwYXJh bXMtPmRldik7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBwYXJhbXMtPmN0 eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CiAJdTY0IGV4ZWNfc3RhcnQ7CiAJaW50IGlu c3RwX21vZGU7CkBAIC0xMDkyLDE3ICsxMDkyLDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29u dGV4dF9kb19waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2lu ZS0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2lu ZVtlbmdpbmUtPmlkXS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9 IGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gY3R4LT5pOTE1OworCXN0cnVjdCBpbnRlbF9jb250ZXh0X2VuZ2luZSAq Y2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKmN0eF9vYmogPSBjZS0+c3RhdGU7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYgPSBjZS0+cmluZ2J1ZjsKIAlzdHJ1Y3QgcGFnZSAqbHJjX3N0YXRlX3BhZ2U7CiAJdWludDMy X3QgKmxyY19yZWdfc3RhdGU7CiAJaW50IHJldDsKIAotCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmZW5naW5lLT5kZXYtPnN0cnVjdF9tdXRleCkpOworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAogCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3Bpbihj dHhfb2JqLCBHRU44X0xSX0NPTlRFWFRfQUxJR04sCi0JCQlQSU5fT0ZGU0VUX0JJQVMgfCBHVUNf V09QQ01fVE9QKTsKKwkJCQkgICAgUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1RPUCk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTExMiwxNSArMTExMywxNSBAQCBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJ CWdvdG8gdW5waW5fY3R4X29iajsKIAl9CiAKLQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5n YnVmZmVyX29iaihlbmdpbmUtPmRldiwgcmluZ2J1Zik7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9t YXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKIAlpZiAocmV0KQogCQlnb3RvIHVucGlu X2N0eF9vYmo7CiAKLQljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfdm1hID0gaTkxNV9nZW1f b2JqX3RvX2dndHQoY3R4X29iaik7CisJY2UtPmxyY192bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0 dChjdHhfb2JqKTsKIAlpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKGN0eCwgZW5n aW5lKTsKIAlscmNfcmVnX3N0YXRlID0ga21hcChscmNfc3RhdGVfcGFnZSk7CiAJbHJjX3JlZ19z dGF0ZVtDVFhfUklOR19CVUZGRVJfU1RBUlQrMV0gPSByaW5nYnVmLT52bWEtPm5vZGUuc3RhcnQ7 Ci0JY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX3JlZ19zdGF0ZSA9IGxyY19yZWdfc3RhdGU7 CisJY2UtPmxyY19yZWdfc3RhdGUgPSBscmNfcmVnX3N0YXRlOwogCWN0eF9vYmotPmRpcnR5ID0g dHJ1ZTsKIAogCS8qIEludmFsaWRhdGUgR3VDIFRMQi4gKi8KQEAgLTExMzgsOSArMTEzOSwxMCBA QCB1bnBpbl9jdHhfb2JqOgogc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4LAogCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IHsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dF9lbmdpbmUgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2lu ZS0+aWRdOwogCWludCByZXQgPSAwOwogCi0JaWYgKGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnBp bl9jb3VudCsrID09IDApIHsKKwlpZiAoY2UtPnBpbl9jb3VudCsrID09IDApIHsKIAkJcmV0ID0g aW50ZWxfbHJfY29udGV4dF9kb19waW4oY3R4LCBlbmdpbmUpOwogCQlpZiAocmV0KQogCQkJZ290 byByZXNldF9waW5fY291bnQ7CkBAIC0xMTUwLDIzICsxMTUyLDI1IEBAIHN0YXRpYyBpbnQgaW50 ZWxfbHJfY29udGV4dF9waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAlyZXR1cm4gcmV0 OwogCiByZXNldF9waW5fY291bnQ6Ci0JY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucGluX2NvdW50 ID0gMDsKKwljZS0+cGluX2NvdW50ID0gMDsKIAlyZXR1cm4gcmV0OwogfQogCiB2b2lkIGludGVs X2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCSAgICBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZTsKKwlzdHJ1Y3QgaW50 ZWxfY29udGV4dF9lbmdpbmUgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOworCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY2UtPnN0YXRlOwogCi0JV0FSTl9PTigh bXV0ZXhfaXNfbG9ja2VkKCZjdHgtPmk5MTUtPmRldi0+c3RydWN0X211dGV4KSk7Ci0JaWYgKC0t Y3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucGluX2NvdW50ID09IDApIHsKLQkJa3VubWFwKGttYXBf dG9fcGFnZShjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfcmVnX3N0YXRlKSk7Ci0JCWludGVs X3VucGluX3JpbmdidWZmZXJfb2JqKGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWYpOwor CVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZW5naW5lLT5kZXYtPnN0cnVjdF9tdXRleCkpOwor CisJaWYgKC0tY2UtPnBpbl9jb3VudCA9PSAwKSB7CisJCWt1bm1hcChrbWFwX3RvX3BhZ2UoY2Ut PmxyY19yZWdfc3RhdGUpKTsKKwkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmooY2UtPnJpbmdi dWYpOwogCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKLQkJY3R4LT5lbmdp bmVbZW5naW5lLT5pZF0ubHJjX3ZtYSA9IE5VTEw7Ci0JCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRd LmxyY19kZXNjID0gMDsKLQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX3JlZ19zdGF0ZSA9 IE5VTEw7CisJCWNlLT5scmNfdm1hID0gTlVMTDsKKwkJY2UtPmxyY19kZXNjID0gMDsKKwkJY2Ut PmxyY19yZWdfc3RhdGUgPSBOVUxMOwogCiAJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uo Y3R4KTsKIAl9CkBAIC0xMTc3LDggKzExODEsNyBAQCBzdGF0aWMgaW50IGludGVsX2xvZ2ljYWxf cmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQog CWludCByZXQsIGk7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxLT5lbmdp bmU7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByZXEtPnJpbmdidWY7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gcmVxLT5pOTE1OwogCXN0cnVjdCBpOTE1X3dvcmthcm91bmRzICp3 ID0gJmRldl9wcml2LT53b3JrYXJvdW5kczsKIAogCWlmICh3LT5jb3VudCA9PSAwKQpAQCAtMjUx Myw4ICsyNTE2LDkgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X2ZyZWUoc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCkKIAlpbnQgaTsKIAogCWZvciAoaSA9IEk5MTVfTlVNX0VOR0lORVM7IC0taSA+ PSAwOyApIHsKLQkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2lu ZVtpXS5yaW5nYnVmOwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IGN0 eC0+ZW5naW5lW2ldLnN0YXRlOworCQlzdHJ1Y3QgaW50ZWxfY29udGV4dF9lbmdpbmUgKmNlID0g JmN0eC0+ZW5naW5lW2ldOworCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGNl LT5yaW5nYnVmOworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IGNlLT5z dGF0ZTsKIAogCQlpZiAoIWN0eF9vYmopCiAJCQljb250aW51ZTsKQEAgLTI1MjQsNyArMjUyOCw3 IEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgp CiAJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKIAkJfQogCi0JCVdBUk5f T04oY3R4LT5lbmdpbmVbaV0ucGluX2NvdW50KTsKKwkJV0FSTl9PTihjZS0+cGluX2NvdW50KTsK IAkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwogCQlkcm1fZ2VtX29iamVjdF91bnJl ZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJfQpAQCAtMjYwNCwxMyArMjYwOCwxNCBAQCBpbnQg aW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 LAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ZGV2OworCXN0cnVjdCBpbnRlbF9jb250ZXh0X2VuZ2lu ZSAqY2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CiAJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKmN0eF9vYmo7CiAJdWludDMyX3QgY29udGV4dF9zaXplOwogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmOwogCWludCByZXQ7CiAKIAlXQVJOX09OKGN0eC0+bGVnYWN5X2h3 X2N0eC5yY3Nfc3RhdGUgIT0gTlVMTCk7Ci0JV0FSTl9PTihjdHgtPmVuZ2luZVtlbmdpbmUtPmlk XS5zdGF0ZSk7CisJV0FSTl9PTihjZS0+c3RhdGUpOwogCiAJY29udGV4dF9zaXplID0gcm91bmRf dXAoaW50ZWxfbHJfY29udGV4dF9zaXplKGVuZ2luZSksIDQwOTYpOwogCkBAIC0yNjM1LDggKzI2 NDAsOCBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4LAogCQlnb3RvIGVycm9yX3JpbmdidWY7CiAJfQogCi0JY3R4LT5lbmdpbmVb ZW5naW5lLT5pZF0ucmluZ2J1ZiA9IHJpbmdidWY7Ci0JY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u c3RhdGUgPSBjdHhfb2JqOworCWNlLT5yaW5nYnVmID0gcmluZ2J1ZjsKKwljZS0+c3RhdGUgPSBj dHhfb2JqOwogCiAJaWYgKGN0eCAhPSBjdHgtPmk5MTUtPmtlcm5lbF9jb250ZXh0ICYmIGVuZ2lu ZS0+aW5pdF9jb250ZXh0KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwpA QCAtMjY2Myw4ICsyNjY4LDggQEAgZXJyb3JfcmluZ2J1ZjoKIAlpbnRlbF9yaW5nYnVmZmVyX2Zy ZWUocmluZ2J1Zik7CiBlcnJvcl9kZXJlZl9vYmo6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVu Y2UoJmN0eF9vYmotPmJhc2UpOwotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWYgPSBO VUxMOwotCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlID0gTlVMTDsKKwljZS0+cmluZ2J1 ZiA9IE5VTEw7CisJY2UtPnN0YXRlID0gTlVMTDsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0yNjc2 LDEwICsyNjgxLDkgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJaW50IGk7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwg aSkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9Ci0JCQkJY3R4LT5l bmdpbmVbZW5naW5lLT5pZF0uc3RhdGU7Ci0JCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmID0KLQkJCQljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5yaW5nYnVmOworCQlzdHJ1Y3QgaW50 ZWxfY29udGV4dF9lbmdpbmUgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOworCQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IGNlLT5zdGF0ZTsKKwkJc3RydWN0IGlu dGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjZS0+cmluZ2J1ZjsKIAkJdWludDMyX3QgKnJlZ19z dGF0ZTsKIAkJc3RydWN0IHBhZ2UgKnBhZ2U7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK