From: Harry Wentland Subject: [PATCH 039/120] drm/amd/display: Move stream validations into seperate function. Date: Wed, 9 Aug 2017 11:01:25 -0400 Message-ID: <20170809150246.8835-40-harry.wentland@amd.com> References: <20170809150246.8835-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170809150246.8835-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpTdGF0 ZWxlc3Mgc3RyZWFtcyB2YWxpZGF0aW9ucyAobm90IHJlcXVpcmUgcmVzb3VyY2UgcG9wdWxhdGlv bikKbW92ZWQgaW50byBob29rIHRvIGJlIGNhbGxlZCBkaXJlY3RseSBmcm9tIERNLgoKQ2FsbCBk Y192YWxpZGF0ZV9zdHJlYW0gYmUgYmVmb3JlIHZhbGlkYXRlX3dpdGhfY29udGV4dCBmb3IKbm9u IExpbnV4IEFQSXMKCkNoYW5nZS1JZDogSTNmZGVmYmZkOWQyMjdhYmQwNjAxM2ViNjM0NjdjNzVm MjZmZDQ1OTAKU2lnbmVkLW9mZi1ieTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92 c2t5QGFtZC5jb20+ClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRA YW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jICAgICAgICAgICB8IDI0 ICsrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3Vy Y2UuYyAgfCA2MSArKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGMuaCAgICAgICAgICAgICAgICB8ICAyICsKIC4uLi9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2RjZS9kY2VfbGlua19lbmNvZGVyLmMgIHwgIDcgKystCiAuLi4vZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9kY2UvZGNlX2xpbmtfZW5jb2Rlci5oICB8ICAyICstCiAuLi4vZHJtL2FtZC9k aXNwbGF5L2RjL2RjZTEwMC9kY2UxMDBfcmVzb3VyY2UuYyAgICB8IDI0ICsrLS0tLS0tLQogLi4u L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMgICAgfCAyMyArKy0t LS0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTIvZGNlMTEyX3Jlc291cmNlLmMgICAg fCAyNSArKy0tLS0tLS0KIC4uLi9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jl c291cmNlLmMgIHwgMjUgKystLS0tLS0tCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24x MC9kY24xMF9yZXNvdXJjZS5jICB8IDI1ICsrLS0tLS0tLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvaW5jL2h3L2xpbmtfZW5jb2Rlci5oICAgfCAgMiArLQogLi4uL2FtZC9kaXNwbGF5L2Rj L3ZpcnR1YWwvdmlydHVhbF9saW5rX2VuY29kZXIuYyAgfCAgMiArLQogMTIgZmlsZXMgY2hhbmdl ZCwgOTAgaW5zZXJ0aW9ucygrKSwgMTMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvY29yZS9kYy5jCmluZGV4IDc5MjE4ODA1NzU0ZS4uOWMyZmFmOGU0YjE0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKQEAgLTY2NCw2ICs2NjQs MjAgQEAgc3RhdGljIGJvb2wgaXNfdmFsaWRhdGlvbl9yZXF1aXJlZCgKIAlyZXR1cm4gZmFsc2U7 CiB9CiAKK3N0YXRpYyBib29sIHZhbGlkYXRlX3N0cmVhbXMgKAorCQljb25zdCBzdHJ1Y3QgZGMg KmRjLAorCQljb25zdCBzdHJ1Y3QgZGNfdmFsaWRhdGlvbl9zZXQgc2V0W10sCisJCWludCBzZXRf Y291bnQpCit7CisJaW50IGk7CisKKwlmb3IgKGkgPSAwOyBpIDwgc2V0X2NvdW50OyBpKyspCisJ CWlmICghZGNfdmFsaWRhdGVfc3RyZWFtKGRjLCBzZXRbaV0uc3RyZWFtKSkKKwkJCXJldHVybiBm YWxzZTsKKworCXJldHVybiB0cnVlOworfQorCiBzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqZGNf Z2V0X3ZhbGlkYXRlX2NvbnRleHQoCiAJCWNvbnN0IHN0cnVjdCBkYyAqZGMsCiAJCWNvbnN0IHN0 cnVjdCBkY192YWxpZGF0aW9uX3NldCBzZXRbXSwKQEAgLTY3Myw2ICs2ODcsNyBAQCBzdHJ1Y3Qg dmFsaWRhdGVfY29udGV4dCAqZGNfZ2V0X3ZhbGlkYXRlX2NvbnRleHQoCiAJZW51bSBkY19zdGF0 dXMgcmVzdWx0ID0gRENfRVJST1JfVU5FWFBFQ1RFRDsKIAlzdHJ1Y3QgdmFsaWRhdGVfY29udGV4 dCAqY29udGV4dDsKIAorCiAJY29udGV4dCA9IGRtX2FsbG9jKHNpemVvZihzdHJ1Y3QgdmFsaWRh dGVfY29udGV4dCkpOwogCWlmIChjb250ZXh0ID09IE5VTEwpCiAJCWdvdG8gY29udGV4dF9hbGxv Y19mYWlsOwpAQCAtNzExLDYgKzcyNiw5IEBAIGJvb2wgZGNfdmFsaWRhdGVfcmVzb3VyY2VzKAog CWVudW0gZGNfc3RhdHVzIHJlc3VsdCA9IERDX0VSUk9SX1VORVhQRUNURUQ7CiAJc3RydWN0IHZh bGlkYXRlX2NvbnRleHQgKmNvbnRleHQ7CiAKKwlpZiAoIXZhbGlkYXRlX3N0cmVhbXMoZGMsIHNl dCwgc2V0X2NvdW50KSkKKwkJcmV0dXJuIGZhbHNlOworCiAJY29udGV4dCA9IGRtX2FsbG9jKHNp emVvZihzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCkpOwogCWlmIChjb250ZXh0ID09IE5VTEwpCiAJ CWdvdG8gY29udGV4dF9hbGxvY19mYWlsOwpAQCAtNzQyLDYgKzc2MCw5IEBAIGJvb2wgZGNfdmFs aWRhdGVfZ3VhcmFudGVlZCgKIAllbnVtIGRjX3N0YXR1cyByZXN1bHQgPSBEQ19FUlJPUl9VTkVY UEVDVEVEOwogCXN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0ICpjb250ZXh0OwogCisJaWYgKCFkY192 YWxpZGF0ZV9zdHJlYW0oZGMsIHN0cmVhbSkpCisJCXJldHVybiBmYWxzZTsKKwogCWNvbnRleHQg PSBkbV9hbGxvYyhzaXplb2Yoc3RydWN0IHZhbGlkYXRlX2NvbnRleHQpKTsKIAlpZiAoY29udGV4 dCA9PSBOVUxMKQogCQlnb3RvIGNvbnRleHRfYWxsb2NfZmFpbDsKQEAgLTEwNDQsNiArMTA2NSw5 IEBAIGJvb2wgZGNfY29tbWl0X3N0cmVhbXMoCiAKIAl9CiAKKwlpZiAoIXZhbGlkYXRlX3N0cmVh bXMoZGMsIHNldCwgc3RyZWFtX2NvdW50KSkKKwkJcmV0dXJuIGZhbHNlOworCiAJY29udGV4dCA9 IGRtX2FsbG9jKHNpemVvZihzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCkpOwogCWlmIChjb250ZXh0 ID09IE5VTEwpCiAJCWdvdG8gY29udGV4dF9hbGxvY19mYWlsOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKaW5kZXggNzE3MjNmYmRhN2Y4 Li4zMmEyNGU4ZDJkNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGNfcmVzb3VyY2UuYwpAQCAtMTQxNiwyMyArMTQxNiwxNyBAQCBzdGF0aWMgaW50IGdl dF9ub3JtX3BpeF9jbGsoY29uc3Qgc3RydWN0IGRjX2NydGNfdGltaW5nICp0aW1pbmcpCiAJcmV0 dXJuIG5vcm1hbGl6ZWRfcGl4X2NsazsKIH0KIAotc3RhdGljIHZvaWQgY2FsY3VsYXRlX3BoeV9w aXhfY2xrcyhzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqY29udGV4dCkKK3N0YXRpYyB2b2lkIGNh bGN1bGF0ZV9waHlfcGl4X2Nsa3Moc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0pCiB7Ci0JaW50 IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgY29udGV4dC0+c3RyZWFtX2NvdW50OyBpKyspIHsKLQkJ c3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBjb250ZXh0LT5zdHJlYW1zW2ldOwotCi0JCXVw ZGF0ZV9zdHJlYW1fc2lnbmFsKHN0cmVhbSk7Ci0KLQkJLyogdXBkYXRlIGFjdHVhbCBwaXhlbCBj bG9jayBvbiBhbGwgc3RyZWFtcyAqLwotCQlpZiAoZGNfaXNfaGRtaV9zaWduYWwoc3RyZWFtLT5z aWduYWwpKQotCQkJc3RyZWFtLT5waHlfcGl4X2NsayA9IGdldF9ub3JtX3BpeF9jbGsoCi0JCQkJ JnN0cmVhbS0+cHVibGljLnRpbWluZyk7Ci0JCWVsc2UKLQkJCXN0cmVhbS0+cGh5X3BpeF9jbGsg PQotCQkJCXN0cmVhbS0+cHVibGljLnRpbWluZy5waXhfY2xrX2toejsKLQl9CisJdXBkYXRlX3N0 cmVhbV9zaWduYWwoc3RyZWFtKTsKKworCS8qIHVwZGF0ZSBhY3R1YWwgcGl4ZWwgY2xvY2sgb24g YWxsIHN0cmVhbXMgKi8KKwlpZiAoZGNfaXNfaGRtaV9zaWduYWwoc3RyZWFtLT5zaWduYWwpKQor CQlzdHJlYW0tPnBoeV9waXhfY2xrID0gZ2V0X25vcm1fcGl4X2NsaygKKwkJCSZzdHJlYW0tPnB1 YmxpYy50aW1pbmcpOworCWVsc2UKKwkJc3RyZWFtLT5waHlfcGl4X2NsayA9CisJCQlzdHJlYW0t PnB1YmxpYy50aW1pbmcucGl4X2Nsa19raHo7CiB9CiAKIGVudW0gZGNfc3RhdHVzIHJlc291cmNl X21hcF9wb29sX3Jlc291cmNlcygKQEAgLTE0NDMsOCArMTQzNyw2IEBAIGVudW0gZGNfc3RhdHVz IHJlc291cmNlX21hcF9wb29sX3Jlc291cmNlcygKIAljb25zdCBzdHJ1Y3QgcmVzb3VyY2VfcG9v bCAqcG9vbCA9IGRjLT5yZXNfcG9vbDsKIAlpbnQgaSwgajsKIAotCWNhbGN1bGF0ZV9waHlfcGl4 X2Nsa3MoY29udGV4dCk7Ci0KIAlmb3IgKGkgPSAwOyBvbGRfY29udGV4dCAmJiBpIDwgY29udGV4 dC0+c3RyZWFtX2NvdW50OyBpKyspIHsKIAkJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBj b250ZXh0LT5zdHJlYW1zW2ldOwogCkBAIC0yNTE2LDMgKzI1MDgsMzYgQEAgdm9pZCByZXNvdXJj ZV9idWlsZF9iaXRfZGVwdGhfcmVkdWN0aW9uX3BhcmFtcyhjb25zdCBzdHJ1Y3QgY29yZV9zdHJl YW0gKnN0cmVhbSwKIAogCWZtdF9iaXRfZGVwdGgtPnBpeGVsX2VuY29kaW5nID0gcGl4ZWxfZW5j b2Rpbmc7CiB9CisKK2Jvb2wgZGNfdmFsaWRhdGVfc3RyZWFtKGNvbnN0IHN0cnVjdCBkYyAqZGMs IGNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKnN0cmVhbSkKK3sKKwlzdHJ1Y3QgY29yZV9kYyAqY29y ZV9kYyA9IERDX1RPX0NPUkUoZGMpOworCXN0cnVjdCBkY19jb250ZXh0ICpkY19jdHggPSBjb3Jl X2RjLT5jdHg7CisJc3RydWN0IGNvcmVfc3RyZWFtICpjb3JlX3N0cmVhbSA9IERDX1NUUkVBTV9U T19DT1JFKHN0cmVhbSk7CisJc3RydWN0IGNvcmVfbGluayAqbGluayA9IGNvcmVfc3RyZWFtLT5z aW5rLT5saW5rOworCXN0cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICp0ZyA9IGNvcmVfZGMtPnJlc19w b29sLT50aW1pbmdfZ2VuZXJhdG9yc1swXTsKKwllbnVtIGRjX3N0YXR1cyByZXMgPSBEQ19PSzsK KworCWNhbGN1bGF0ZV9waHlfcGl4X2Nsa3MoY29yZV9zdHJlYW0pOworCisJaWYgKCF0Zy0+ZnVu Y3MtPnZhbGlkYXRlX3RpbWluZyh0ZywgJmNvcmVfc3RyZWFtLT5wdWJsaWMudGltaW5nKSkKKwkJ cmVzID0gRENfRkFJTF9DT05UUk9MTEVSX1ZBTElEQVRFOworCisJaWYgKHJlcyA9PSBEQ19PSykK KwkJaWYgKCFsaW5rLT5saW5rX2VuYy0+ZnVuY3MtPnZhbGlkYXRlX291dHB1dF93aXRoX3N0cmVh bSgKKwkJCQkJCWxpbmstPmxpbmtfZW5jLCBjb3JlX3N0cmVhbSkpCisJCQlyZXMgPSBEQ19GQUlM X0VOQ19WQUxJREFURTsKKworCS8qIFRPRE86IHZhbGlkYXRlIGF1ZGlvIEFTSUMgY2FwcywgZW5j b2RlciAqLworCisJaWYgKHJlcyA9PSBEQ19PSykKKwkJcmVzID0gZGNfbGlua192YWxpZGF0ZV9t b2RlX3RpbWluZyhjb3JlX3N0cmVhbSwKKwkJICAgICAgbGluaywKKwkJICAgICAgJmNvcmVfc3Ry ZWFtLT5wdWJsaWMudGltaW5nKTsKKworCWlmIChyZXMgIT0gRENfT0spCisJCURDX0VSUk9SKCJG YWlsZWQgdmFsaWRhdGlvbiBmb3Igc3RyZWFtICVwLCBlcnI6JWQsICFcbiIsCisJCQkJc3RyZWFt LCByZXMpOworCisJcmV0dXJuIHJlcyA9PSBEQ19PSzsKK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjLmgKaW5kZXggNTUyM2JiNjhmNGU4Li5mMjUwZTg3ZDM5ZGQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kYy5oCkBAIC01NTksNiArNTU5LDggQEAgc3RydWN0IGRjX3ZhbGlkYXRp b25fc2V0IHsKIAl1aW50OF90IHN1cmZhY2VfY291bnQ7CiB9OwogCitib29sIGRjX3ZhbGlkYXRl X3N0cmVhbShjb25zdCBzdHJ1Y3QgZGMgKmRjLCBjb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpzdHJl YW0pOworCiAvKgogICogVGhpcyBmdW5jdGlvbiB0YWtlcyBhIHNldCBvZiByZXNvdXJjZXMgYW5k IGNoZWNrcyB0aGF0IHRoZXkgYXJlIGNvZnVuY3Rpb25hbC4KICAqCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9saW5rX2VuY29kZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2xpbmtfZW5jb2Rlci5jCmluZGV4IDMx ODY3M2RhMTg5Yi4uYWZmMGE0NDBkNGQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNlL2RjZV9saW5rX2VuY29kZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9saW5rX2VuY29kZXIuYwpAQCAtMTAwOSwxOSArMTAwOSwx OCBAQCBib29sIGRjZTExMF9saW5rX2VuY29kZXJfY29uc3RydWN0KAogCiBib29sIGRjZTExMF9s aW5rX2VuY29kZXJfdmFsaWRhdGVfb3V0cHV0X3dpdGhfc3RyZWFtKAogCXN0cnVjdCBsaW5rX2Vu Y29kZXIgKmVuYywKLQlzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4KQorCWNvbnN0IHN0cnVjdCBj b3JlX3N0cmVhbSAqc3RyZWFtKQogewotCXN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtID0gcGlw ZV9jdHgtPnN0cmVhbTsKIAlzdHJ1Y3QgZGNlMTEwX2xpbmtfZW5jb2RlciAqZW5jMTEwID0gVE9f RENFMTEwX0xJTktfRU5DKGVuYyk7CiAJYm9vbCBpc192YWxpZDsKIAotCXN3aXRjaCAocGlwZV9j dHgtPnN0cmVhbS0+c2lnbmFsKSB7CisJc3dpdGNoIChzdHJlYW0tPnNpZ25hbCkgewogCWNhc2Ug U0lHTkFMX1RZUEVfRFZJX1NJTkdMRV9MSU5LOgogCWNhc2UgU0lHTkFMX1RZUEVfRFZJX0RVQUxf TElOSzoKIAkJaXNfdmFsaWQgPSBkY2UxMTBfbGlua19lbmNvZGVyX3ZhbGlkYXRlX2R2aV9vdXRw dXQoCiAJCQllbmMxMTAsCiAJCQlzdHJlYW0tPnNpbmstPmxpbmstPmNvbm5lY3Rvcl9zaWduYWws Ci0JCQlwaXBlX2N0eC0+c3RyZWFtLT5zaWduYWwsCisJCQlzdHJlYW0tPnNpZ25hbCwKIAkJCSZz dHJlYW0tPnB1YmxpYy50aW1pbmcpOwogCWJyZWFrOwogCWNhc2UgU0lHTkFMX1RZUEVfSERNSV9U WVBFX0E6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2Rj ZV9saW5rX2VuY29kZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNl X2xpbmtfZW5jb2Rlci5oCmluZGV4IGZkNmJhN2VmYzBmOS4uZGVkNmM2MTMwNGU2IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9saW5rX2VuY29kZXIu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9saW5rX2VuY29k ZXIuaApAQCAtMTk5LDcgKzE5OSw3IEBAIGJvb2wgZGNlMTEwX2xpbmtfZW5jb2Rlcl92YWxpZGF0 ZV93aXJlbGVzc19vdXRwdXQoCiAKIGJvb2wgZGNlMTEwX2xpbmtfZW5jb2Rlcl92YWxpZGF0ZV9v dXRwdXRfd2l0aF9zdHJlYW0oCiAJc3RydWN0IGxpbmtfZW5jb2RlciAqZW5jLAotCXN0cnVjdCBw aXBlX2N0eCAqcGlwZV9jdHgpOworCWNvbnN0IHN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtKTsK IAogLyoqKioqKioqKioqKioqKioqKiBIVyBwcm9ncmFtbWluZyAqKioqKioqKioqKioqKioqKioq KioqKiovCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2Ux MDAvZGNlMTAwX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNl MTAwL2RjZTEwMF9yZXNvdXJjZS5jCmluZGV4IDY5MzgxNThiZWQ3Zi4uM2QyNWE5MGU0OWI0IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTAwL2RjZTEwMF9y ZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMDAvZGNl MTAwX3Jlc291cmNlLmMKQEAgLTY1MSw3ICs2NTEsNyBAQCBzdGF0aWMgdm9pZCBkZXN0cnVjdChz dHJ1Y3QgZGNlMTEwX3Jlc291cmNlX3Bvb2wgKnBvb2wpCiAJCWRhbF9pcnFfc2VydmljZV9kZXN0 cm95KCZwb29sLT5iYXNlLmlycXMpOwogfQogCi1zdGF0aWMgZW51bSBkY19zdGF0dXMgdmFsaWRh dGVfbWFwcGVkX3Jlc291cmNlKAorc3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxkX21hcHBlZF9y ZXNvdXJjZSgKIAkJY29uc3Qgc3RydWN0IGNvcmVfZGMgKmRjLAogCQlzdHJ1Y3QgdmFsaWRhdGVf Y29udGV4dCAqY29udGV4dCwKIAkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKm9sZF9jb250ZXh0 KQpAQCAtNjYxLDcgKzY2MSw2IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyB2YWxpZGF0ZV9tYXBw ZWRfcmVzb3VyY2UoCiAKIAlmb3IgKGkgPSAwOyBpIDwgY29udGV4dC0+c3RyZWFtX2NvdW50OyBp KyspIHsKIAkJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBjb250ZXh0LT5zdHJlYW1zW2ld OwotCQlzdHJ1Y3QgZGNfbGluayAqbGluayA9IHN0cmVhbS0+c2luay0+bGluazsKIAogCQlpZiAo b2xkX2NvbnRleHQgJiYgcmVzb3VyY2VfaXNfc3RyZWFtX3VuY2hhbmdlZChvbGRfY29udGV4dCwg c3RyZWFtKSkKIAkJCWNvbnRpbnVlOwpAQCAtNjczLDI4ICs2NzIsMTEgQEAgc3RhdGljIGVudW0g ZGNfc3RhdHVzIHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZSgKIAkJCWlmIChjb250ZXh0LT5yZXNf Y3R4LnBpcGVfY3R4W2pdLnN0cmVhbSAhPSBzdHJlYW0pCiAJCQkJY29udGludWU7CiAKLQkJCWlm ICghcGlwZV9jdHgtPnRnLT5mdW5jcy0+dmFsaWRhdGVfdGltaW5nKAotCQkJCXBpcGVfY3R4LT50 ZywgJnN0cmVhbS0+cHVibGljLnRpbWluZykpCi0JCQkJcmV0dXJuIERDX0ZBSUxfQ09OVFJPTExF Ul9WQUxJREFURTsKLQogCQkJc3RhdHVzID0gZGNlMTEwX3Jlc291cmNlX2J1aWxkX3BpcGVfaHdf cGFyYW0ocGlwZV9jdHgpOwogCiAJCQlpZiAoc3RhdHVzICE9IERDX09LKQogCQkJCXJldHVybiBz dGF0dXM7CiAKLQkJCWlmICghbGluay0+bGlua19lbmMtPmZ1bmNzLT52YWxpZGF0ZV9vdXRwdXRf d2l0aF9zdHJlYW0oCi0JCQkJbGluay0+bGlua19lbmMsCi0JCQkJcGlwZV9jdHgpKQotCQkJCXJl dHVybiBEQ19GQUlMX0VOQ19WQUxJREFURTsKLQotCQkJLyogVE9ETzogdmFsaWRhdGUgYXVkaW8g QVNJQyBjYXBzLCBlbmNvZGVyICovCi0JCQlzdGF0dXMgPSBkY19saW5rX3ZhbGlkYXRlX21vZGVf dGltaW5nKHN0cmVhbSwKLQkJCQkJCQkgICAgICBsaW5rLAotCQkJCQkJCSAgICAgICZzdHJlYW0t PnB1YmxpYy50aW1pbmcpOwotCi0JCQlpZiAoc3RhdHVzICE9IERDX09LKQotCQkJCXJldHVybiBz dGF0dXM7Ci0KIAkJCXJlc291cmNlX2J1aWxkX2luZm9fZnJhbWUocGlwZV9jdHgpOwogCiAJCQkv KiBkbyBub3QgbmVlZCB0byB2YWxpZGF0ZSBub24gcm9vdCBwaXBlcyAqLwpAQCAtNzY5LDcgKzc1 MSw3IEBAIGVudW0gZGNfc3RhdHVzIGRjZTEwMF92YWxpZGF0ZV93aXRoX2NvbnRleHQoCiAJfQog CiAJaWYgKHJlc3VsdCA9PSBEQ19PSykKLQkJcmVzdWx0ID0gdmFsaWRhdGVfbWFwcGVkX3Jlc291 cmNlKGRjLCBjb250ZXh0LCBvbGRfY29udGV4dCk7CisJCXJlc3VsdCA9IGJ1aWxkX21hcHBlZF9y ZXNvdXJjZShkYywgY29udGV4dCwgb2xkX2NvbnRleHQpOwogCiAJaWYgKHJlc3VsdCA9PSBEQ19P SykKIAkJcmVzdWx0ID0gcmVzb3VyY2VfYnVpbGRfc2NhbGluZ19wYXJhbXNfZm9yX2NvbnRleHQo ZGMsIGNvbnRleHQpOwpAQCAtNzk4LDcgKzc4MCw3IEBAIGVudW0gZGNfc3RhdHVzIGRjZTEwMF92 YWxpZGF0ZV9ndWFyYW50ZWVkKAogCQlyZXN1bHQgPSByZXNvdXJjZV9tYXBfY2xvY2tfcmVzb3Vy Y2VzKGRjLCBjb250ZXh0LCBOVUxMKTsKIAogCWlmIChyZXN1bHQgPT0gRENfT0spCi0JCXJlc3Vs dCA9IHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVMTCk7CisJCXJlc3Vs dCA9IGJ1aWxkX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVMTCk7CiAKIAlpZiAocmVz dWx0ID09IERDX09LKSB7CiAJCXZhbGlkYXRlX2d1YXJhbnRlZWRfY29weV9zdHJlYW1zKApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVz b3VyY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jl c291cmNlLmMKaW5kZXggMDE1MzA2YTZlZjg4Li5jNzczMzUxZTkzYWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX3Jlc291cmNlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2Uu YwpAQCAtNzcxLDcgKzc3MSw3IEBAIHN0YXRpYyBib29sIGlzX3N1cmZhY2VfcGl4ZWxfZm9ybWF0 X3N1cHBvcnRlZChzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4LCB1bnNpZ25lCiAJcmV0dXJuIHRy dWU7CiB9CiAKLXN0YXRpYyBlbnVtIGRjX3N0YXR1cyB2YWxpZGF0ZV9tYXBwZWRfcmVzb3VyY2Uo CitzdGF0aWMgZW51bSBkY19zdGF0dXMgYnVpbGRfbWFwcGVkX3Jlc291cmNlKAogCQljb25zdCBz dHJ1Y3QgY29yZV9kYyAqZGMsCiAJCXN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0ICpjb250ZXh0LAog CQlzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqb2xkX2NvbnRleHQpCkBAIC03ODEsNyArNzgxLDYg QEAgc3RhdGljIGVudW0gZGNfc3RhdHVzIHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZSgKIAogCWZv ciAoaSA9IDA7IGkgPCBjb250ZXh0LT5zdHJlYW1fY291bnQ7IGkrKykgewogCQlzdHJ1Y3QgY29y ZV9zdHJlYW0gKnN0cmVhbSA9IGNvbnRleHQtPnN0cmVhbXNbaV07Ci0JCXN0cnVjdCBkY19saW5r ICpsaW5rID0gc3RyZWFtLT5zaW5rLT5saW5rOwogCiAJCWlmIChvbGRfY29udGV4dCAmJiByZXNv dXJjZV9pc19zdHJlYW1fdW5jaGFuZ2VkKG9sZF9jb250ZXh0LCBzdHJlYW0pKQogCQkJY29udGlu dWU7CkBAIC03OTcsMjkgKzc5NiwxMyBAQCBzdGF0aWMgZW51bSBkY19zdGF0dXMgdmFsaWRhdGVf bWFwcGVkX3Jlc291cmNlKAogCQkJCQlkYy0+cmVzX3Bvb2wtPnVuZGVybGF5X3BpcGVfaW5kZXgp KQogCQkJCXJldHVybiBEQ19TVVJGQUNFX1BJWEVMX0ZPUk1BVF9VTlNVUFBPUlRFRDsKIAotCQkJ aWYgKCFwaXBlX2N0eC0+dGctPmZ1bmNzLT52YWxpZGF0ZV90aW1pbmcoCi0JCQkJcGlwZV9jdHgt PnRnLCAmc3RyZWFtLT5wdWJsaWMudGltaW5nKSkKLQkJCQlyZXR1cm4gRENfRkFJTF9DT05UUk9M TEVSX1ZBTElEQVRFOwotCiAJCQlzdGF0dXMgPSBkY2UxMTBfcmVzb3VyY2VfYnVpbGRfcGlwZV9o d19wYXJhbShwaXBlX2N0eCk7CiAKIAkJCWlmIChzdGF0dXMgIT0gRENfT0spCiAJCQkJcmV0dXJu IHN0YXR1czsKIAotCQkJaWYgKCFsaW5rLT5saW5rX2VuYy0+ZnVuY3MtPnZhbGlkYXRlX291dHB1 dF93aXRoX3N0cmVhbSgKLQkJCQlsaW5rLT5saW5rX2VuYywKLQkJCQlwaXBlX2N0eCkpCi0JCQkJ cmV0dXJuIERDX0ZBSUxfRU5DX1ZBTElEQVRFOwotCiAJCQkvKiBUT0RPOiB2YWxpZGF0ZSBhdWRp byBBU0lDIGNhcHMsIGVuY29kZXIgKi8KIAotCQkJc3RhdHVzID0gZGNfbGlua192YWxpZGF0ZV9t b2RlX3RpbWluZyhzdHJlYW0sCi0JCQkJCQkJICAgICAgbGluaywKLQkJCQkJCQkgICAgICAmc3Ry ZWFtLT5wdWJsaWMudGltaW5nKTsKLQotCQkJaWYgKHN0YXR1cyAhPSBEQ19PSykKLQkJCQlyZXR1 cm4gc3RhdHVzOwotCiAJCQlyZXNvdXJjZV9idWlsZF9pbmZvX2ZyYW1lKHBpcGVfY3R4KTsKIAog CQkJLyogZG8gbm90IG5lZWQgdG8gdmFsaWRhdGUgbm9uIHJvb3QgcGlwZXMgKi8KQEAgLTk3Niw3 ICs5NTksNyBAQCBlbnVtIGRjX3N0YXR1cyBkY2UxMTBfdmFsaWRhdGVfd2l0aF9jb250ZXh0KAog CX0KIAogCWlmIChyZXN1bHQgPT0gRENfT0spCi0JCXJlc3VsdCA9IHZhbGlkYXRlX21hcHBlZF9y ZXNvdXJjZShkYywgY29udGV4dCwgb2xkX2NvbnRleHQpOworCQlyZXN1bHQgPSBidWlsZF9tYXBw ZWRfcmVzb3VyY2UoZGMsIGNvbnRleHQsIG9sZF9jb250ZXh0KTsKIAogCWlmIChyZXN1bHQgPT0g RENfT0spCiAJCXJlc3VsdCA9IHJlc291cmNlX2J1aWxkX3NjYWxpbmdfcGFyYW1zX2Zvcl9jb250 ZXh0KGRjLCBjb250ZXh0KTsKQEAgLTEwMDUsNyArOTg4LDcgQEAgZW51bSBkY19zdGF0dXMgZGNl MTEwX3ZhbGlkYXRlX2d1YXJhbnRlZWQoCiAJCXJlc3VsdCA9IHJlc291cmNlX21hcF9jbG9ja19y ZXNvdXJjZXMoZGMsIGNvbnRleHQsIE5VTEwpOwogCiAJaWYgKHJlc3VsdCA9PSBEQ19PSykKLQkJ cmVzdWx0ID0gdmFsaWRhdGVfbWFwcGVkX3Jlc291cmNlKGRjLCBjb250ZXh0LCBOVUxMKTsKKwkJ cmVzdWx0ID0gYnVpbGRfbWFwcGVkX3Jlc291cmNlKGRjLCBjb250ZXh0LCBOVUxMKTsKIAogCWlm IChyZXN1bHQgPT0gRENfT0spIHsKIAkJdmFsaWRhdGVfZ3VhcmFudGVlZF9jb3B5X3N0cmVhbXMo CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEyL2RjZTEx Ml9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMi9kY2Ux MTJfcmVzb3VyY2UuYwppbmRleCBjYTFlMTNlMmEzZGIuLjE5Y2Q5OTkyM2IyNCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMi9kY2UxMTJfcmVzb3VyY2Uu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEyL2RjZTExMl9yZXNv dXJjZS5jCkBAIC03MjAsNyArNzIwLDcgQEAgc3RhdGljIHN0cnVjdCBjbG9ja19zb3VyY2UgKmZp bmRfbWF0Y2hpbmdfcGxsKAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgZW51bSBkY19zdGF0dXMg dmFsaWRhdGVfbWFwcGVkX3Jlc291cmNlKAorc3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxkX21h cHBlZF9yZXNvdXJjZSgKIAkJY29uc3Qgc3RydWN0IGNvcmVfZGMgKmRjLAogCQlzdHJ1Y3QgdmFs aWRhdGVfY29udGV4dCAqY29udGV4dCwKIAkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKm9sZF9j b250ZXh0KQpAQCAtNzMwLDcgKzczMCw2IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyB2YWxpZGF0 ZV9tYXBwZWRfcmVzb3VyY2UoCiAKIAlmb3IgKGkgPSAwOyBpIDwgY29udGV4dC0+c3RyZWFtX2Nv dW50OyBpKyspIHsKIAkJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBjb250ZXh0LT5zdHJl YW1zW2ldOwotCQlzdHJ1Y3QgZGNfbGluayAqbGluayA9IHN0cmVhbS0+c2luay0+bGluazsKIAog CQlpZiAob2xkX2NvbnRleHQgJiYgcmVzb3VyY2VfaXNfc3RyZWFtX3VuY2hhbmdlZChvbGRfY29u dGV4dCwgc3RyZWFtKSkKIAkJCWNvbnRpbnVlOwpAQCAtNzQyLDI5ICs3NDEsMTEgQEAgc3RhdGlj IGVudW0gZGNfc3RhdHVzIHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZSgKIAkJCWlmIChjb250ZXh0 LT5yZXNfY3R4LnBpcGVfY3R4W2pdLnN0cmVhbSAhPSBzdHJlYW0pCiAJCQkJY29udGludWU7CiAK LQkJCWlmICghcGlwZV9jdHgtPnRnLT5mdW5jcy0+dmFsaWRhdGVfdGltaW5nKAotCQkJCXBpcGVf Y3R4LT50ZywgJnN0cmVhbS0+cHVibGljLnRpbWluZykpCi0JCQkJcmV0dXJuIERDX0ZBSUxfQ09O VFJPTExFUl9WQUxJREFURTsKLQogCQkJc3RhdHVzID0gZGNlMTEwX3Jlc291cmNlX2J1aWxkX3Bp cGVfaHdfcGFyYW0ocGlwZV9jdHgpOwogCiAJCQlpZiAoc3RhdHVzICE9IERDX09LKQogCQkJCXJl dHVybiBzdGF0dXM7CiAKLQkJCWlmICghbGluay0+bGlua19lbmMtPmZ1bmNzLT52YWxpZGF0ZV9v dXRwdXRfd2l0aF9zdHJlYW0oCi0JCQkJbGluay0+bGlua19lbmMsCi0JCQkJcGlwZV9jdHgpKQot CQkJCXJldHVybiBEQ19GQUlMX0VOQ19WQUxJREFURTsKLQotCQkJLyogVE9ETzogdmFsaWRhdGUg YXVkaW8gQVNJQyBjYXBzLCBlbmNvZGVyICovCi0KLQkJCXN0YXR1cyA9IGRjX2xpbmtfdmFsaWRh dGVfbW9kZV90aW1pbmcoc3RyZWFtLAotCQkJCQkJCSAgICAgIGxpbmssCi0JCQkJCQkJICAgICAg JnN0cmVhbS0+cHVibGljLnRpbWluZyk7Ci0KLQkJCWlmIChzdGF0dXMgIT0gRENfT0spCi0JCQkJ cmV0dXJuIHN0YXR1czsKLQogCQkJcmVzb3VyY2VfYnVpbGRfaW5mb19mcmFtZShwaXBlX2N0eCk7 CiAKIAkJCS8qIGRvIG5vdCBuZWVkIHRvIHZhbGlkYXRlIG5vbiByb290IHBpcGVzICovCkBAIC05 NTIsNyArOTMzLDcgQEAgZW51bSBkY19zdGF0dXMgZGNlMTEyX3ZhbGlkYXRlX3dpdGhfY29udGV4 dCgKIAl9CiAKIAlpZiAocmVzdWx0ID09IERDX09LKQotCQlyZXN1bHQgPSB2YWxpZGF0ZV9tYXBw ZWRfcmVzb3VyY2UoZGMsIGNvbnRleHQsIG9sZF9jb250ZXh0KTsKKwkJcmVzdWx0ID0gYnVpbGRf bWFwcGVkX3Jlc291cmNlKGRjLCBjb250ZXh0LCBvbGRfY29udGV4dCk7CiAKIAlpZiAocmVzdWx0 ID09IERDX09LKQogCQlyZXN1bHQgPSByZXNvdXJjZV9idWlsZF9zY2FsaW5nX3BhcmFtc19mb3Jf Y29udGV4dChkYywgY29udGV4dCk7CkBAIC05ODEsNyArOTYyLDcgQEAgZW51bSBkY19zdGF0dXMg ZGNlMTEyX3ZhbGlkYXRlX2d1YXJhbnRlZWQoCiAJCXJlc3VsdCA9IHJlc291cmNlX21hcF9waHlf Y2xvY2tfcmVzb3VyY2VzKGRjLCBjb250ZXh0LCBOVUxMKTsKIAogCWlmIChyZXN1bHQgPT0gRENf T0spCi0JCXJlc3VsdCA9IHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVM TCk7CisJCXJlc3VsdCA9IGJ1aWxkX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVMTCk7 CiAKIAlpZiAocmVzdWx0ID09IERDX09LKSB7CiAJCXZhbGlkYXRlX2d1YXJhbnRlZWRfY29weV9z dHJlYW1zKApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgw L2RjZTgwX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlODAv ZGNlODBfcmVzb3VyY2UuYwppbmRleCBiMjMxOWRiZjNiZTMuLjAxMjMwMDZlNTM2MCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291 cmNlLmMKQEAgLTY2Nyw3ICs2NjcsNyBAQCBzdGF0aWMgdm9pZCBkZXN0cnVjdChzdHJ1Y3QgZGNl MTEwX3Jlc291cmNlX3Bvb2wgKnBvb2wpCiAJfQogfQogCi1zdGF0aWMgZW51bSBkY19zdGF0dXMg dmFsaWRhdGVfbWFwcGVkX3Jlc291cmNlKAorc3RhdGljIGVudW0gZGNfc3RhdHVzIGJ1aWxkX21h cHBlZF9yZXNvdXJjZSgKIAkJY29uc3Qgc3RydWN0IGNvcmVfZGMgKmRjLAogCQlzdHJ1Y3QgdmFs aWRhdGVfY29udGV4dCAqY29udGV4dCwKIAkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKm9sZF9j b250ZXh0KQpAQCAtNjc3LDcgKzY3Nyw2IEBAIHN0YXRpYyBlbnVtIGRjX3N0YXR1cyB2YWxpZGF0 ZV9tYXBwZWRfcmVzb3VyY2UoCiAKIAlmb3IgKGkgPSAwOyBpIDwgY29udGV4dC0+c3RyZWFtX2Nv dW50OyBpKyspIHsKIAkJc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBjb250ZXh0LT5zdHJl YW1zW2ldOwotCQlzdHJ1Y3QgZGNfbGluayAqbGluayA9IHN0cmVhbS0+c2luay0+bGluazsKIAog CQlpZiAob2xkX2NvbnRleHQgJiYgcmVzb3VyY2VfaXNfc3RyZWFtX3VuY2hhbmdlZChvbGRfY29u dGV4dCwgc3RyZWFtKSkKIAkJCWNvbnRpbnVlOwpAQCAtNjg5LDI5ICs2ODgsMTEgQEAgc3RhdGlj IGVudW0gZGNfc3RhdHVzIHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZSgKIAkJCWlmIChjb250ZXh0 LT5yZXNfY3R4LnBpcGVfY3R4W2pdLnN0cmVhbSAhPSBzdHJlYW0pCiAJCQkJY29udGludWU7CiAK LQkJCWlmICghcGlwZV9jdHgtPnRnLT5mdW5jcy0+dmFsaWRhdGVfdGltaW5nKAotCQkJCXBpcGVf Y3R4LT50ZywgJnN0cmVhbS0+cHVibGljLnRpbWluZykpCi0JCQkJcmV0dXJuIERDX0ZBSUxfQ09O VFJPTExFUl9WQUxJREFURTsKLQogCQkJc3RhdHVzID0gZGNlMTEwX3Jlc291cmNlX2J1aWxkX3Bp cGVfaHdfcGFyYW0ocGlwZV9jdHgpOwogCiAJCQlpZiAoc3RhdHVzICE9IERDX09LKQogCQkJCXJl dHVybiBzdGF0dXM7CiAKLQkJCWlmICghbGluay0+bGlua19lbmMtPmZ1bmNzLT52YWxpZGF0ZV9v dXRwdXRfd2l0aF9zdHJlYW0oCi0JCQkJbGluay0+bGlua19lbmMsCi0JCQkJcGlwZV9jdHgpKQot CQkJCXJldHVybiBEQ19GQUlMX0VOQ19WQUxJREFURTsKLQotCQkJLyogVE9ETzogdmFsaWRhdGUg YXVkaW8gQVNJQyBjYXBzLCBlbmNvZGVyICovCi0KLQkJCXN0YXR1cyA9IGRjX2xpbmtfdmFsaWRh dGVfbW9kZV90aW1pbmcoc3RyZWFtLAotCQkJCQkJCSAgICAgIGxpbmssCi0JCQkJCQkJICAgICAg JnN0cmVhbS0+cHVibGljLnRpbWluZyk7Ci0KLQkJCWlmIChzdGF0dXMgIT0gRENfT0spCi0JCQkJ cmV0dXJuIHN0YXR1czsKLQogCQkJcmVzb3VyY2VfYnVpbGRfaW5mb19mcmFtZShwaXBlX2N0eCk7 CiAKIAkJCS8qIGRvIG5vdCBuZWVkIHRvIHZhbGlkYXRlIG5vbiByb290IHBpcGVzICovCkBAIC03 ODYsNyArNzY3LDcgQEAgZW51bSBkY19zdGF0dXMgZGNlODBfdmFsaWRhdGVfd2l0aF9jb250ZXh0 KAogCX0KIAogCWlmIChyZXN1bHQgPT0gRENfT0spCi0JCXJlc3VsdCA9IHZhbGlkYXRlX21hcHBl ZF9yZXNvdXJjZShkYywgY29udGV4dCwgb2xkX2NvbnRleHQpOworCQlyZXN1bHQgPSBidWlsZF9t YXBwZWRfcmVzb3VyY2UoZGMsIGNvbnRleHQsIG9sZF9jb250ZXh0KTsKIAogCWlmIChyZXN1bHQg PT0gRENfT0spCiAJCXJlc3VsdCA9IHJlc291cmNlX2J1aWxkX3NjYWxpbmdfcGFyYW1zX2Zvcl9j b250ZXh0KGRjLCBjb250ZXh0KTsKQEAgLTgxNCw3ICs3OTUsNyBAQCBlbnVtIGRjX3N0YXR1cyBk Y2U4MF92YWxpZGF0ZV9ndWFyYW50ZWVkKAogCQlyZXN1bHQgPSByZXNvdXJjZV9tYXBfY2xvY2tf cmVzb3VyY2VzKGRjLCBjb250ZXh0LCBOVUxMKTsKIAogCWlmIChyZXN1bHQgPT0gRENfT0spCi0J CXJlc3VsdCA9IHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVMTCk7CisJ CXJlc3VsdCA9IGJ1aWxkX21hcHBlZF9yZXNvdXJjZShkYywgY29udGV4dCwgTlVMTCk7CiAKIAlp ZiAocmVzdWx0ID09IERDX09LKSB7CiAJCXZhbGlkYXRlX2d1YXJhbnRlZWRfY29weV9zdHJlYW1z KApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEw X3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBf cmVzb3VyY2UuYwppbmRleCAwMTEwYTQzMWUyODkuLmI5MDFlZjk2ODlhNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX3Jlc291cmNlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX3Jlc291cmNlLmMK QEAgLTgzNSw3ICs4MzUsNyBAQCBzdGF0aWMgZW51bSBkY19zdGF0dXMgYnVpbGRfcGlwZV9od19w YXJhbShzdHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4KQogCXJldHVybiBEQ19PSzsKIH0KIAotc3Rh dGljIGVudW0gZGNfc3RhdHVzIHZhbGlkYXRlX21hcHBlZF9yZXNvdXJjZSgKK3N0YXRpYyBlbnVt IGRjX3N0YXR1cyBidWlsZF9tYXBwZWRfcmVzb3VyY2UoCiAJCWNvbnN0IHN0cnVjdCBjb3JlX2Rj ICpkYywKIAkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQsCiAJCXN0cnVjdCB2YWxp ZGF0ZV9jb250ZXh0ICpvbGRfY29udGV4dCkKQEAgLTg0NSw3ICs4NDUsNiBAQCBzdGF0aWMgZW51 bSBkY19zdGF0dXMgdmFsaWRhdGVfbWFwcGVkX3Jlc291cmNlKAogCiAJZm9yIChpID0gMDsgaSA8 IGNvbnRleHQtPnN0cmVhbV9jb3VudDsgaSsrKSB7CiAJCXN0cnVjdCBjb3JlX3N0cmVhbSAqc3Ry ZWFtID0gY29udGV4dC0+c3RyZWFtc1tpXTsKLQkJc3RydWN0IGRjX2xpbmsgKmxpbmsgPSBzdHJl YW0tPnNpbmstPmxpbms7CiAKIAkJaWYgKG9sZF9jb250ZXh0ICYmIHJlc291cmNlX2lzX3N0cmVh bV91bmNoYW5nZWQob2xkX2NvbnRleHQsIHN0cmVhbSkpIHsKIAkJCWlmIChzdHJlYW0gIT0gTlVM TCAmJiBvbGRfY29udGV4dC0+c3RyZWFtc1tpXSAhPSBOVUxMKSB7CkBAIC04NzAsMjkgKzg2OSwx MSBAQCBzdGF0aWMgZW51bSBkY19zdGF0dXMgdmFsaWRhdGVfbWFwcGVkX3Jlc291cmNlKAogCQkJ aWYgKGNvbnRleHQtPnJlc19jdHgucGlwZV9jdHhbal0uc3RyZWFtICE9IHN0cmVhbSkKIAkJCQlj b250aW51ZTsKIAotCi0JCQlpZiAoIXBpcGVfY3R4LT50Zy0+ZnVuY3MtPnZhbGlkYXRlX3RpbWlu ZygKLQkJCQkJcGlwZV9jdHgtPnRnLCAmc3RyZWFtLT5wdWJsaWMudGltaW5nKSkKLQkJCQlyZXR1 cm4gRENfRkFJTF9DT05UUk9MTEVSX1ZBTElEQVRFOwotCiAJCQlzdGF0dXMgPSBidWlsZF9waXBl X2h3X3BhcmFtKHBpcGVfY3R4KTsKIAogCQkJaWYgKHN0YXR1cyAhPSBEQ19PSykKIAkJCQlyZXR1 cm4gc3RhdHVzOwogCi0JCQlpZiAoIWxpbmstPmxpbmtfZW5jLT5mdW5jcy0+dmFsaWRhdGVfb3V0 cHV0X3dpdGhfc3RyZWFtKAotCQkJCWxpbmstPmxpbmtfZW5jLCBwaXBlX2N0eCkpCi0JCQkJcmV0 dXJuIERDX0ZBSUxfRU5DX1ZBTElEQVRFOwotCi0JCQkvKiBUT0RPOiB2YWxpZGF0ZSBhdWRpbyBB U0lDIGNhcHMsIGVuY29kZXIgKi8KLQotCQkJc3RhdHVzID0gZGNfbGlua192YWxpZGF0ZV9tb2Rl X3RpbWluZygKLQkJCQlzdHJlYW0sIGxpbmssICZzdHJlYW0tPnB1YmxpYy50aW1pbmcpOwotCi0J CQlpZiAoc3RhdHVzICE9IERDX09LKQotCQkJCXJldHVybiBzdGF0dXM7Ci0KLQogCQkJLyogZG8g bm90IG5lZWQgdG8gdmFsaWRhdGUgbm9uIHJvb3QgcGlwZXMgKi8KIAkJCWJyZWFrOwogCQl9CkBA IC05MjgsNyArOTA5LDcgQEAgZW51bSBkY19zdGF0dXMgZGNuMTBfdmFsaWRhdGVfd2l0aF9jb250 ZXh0KAogCWlmIChyZXN1bHQgIT0gRENfT0spCiAJCXJldHVybiByZXN1bHQ7CiAKLQlyZXN1bHQg PSB2YWxpZGF0ZV9tYXBwZWRfcmVzb3VyY2UoZGMsIGNvbnRleHQsIG9sZF9jb250ZXh0KTsKKwly ZXN1bHQgPSBidWlsZF9tYXBwZWRfcmVzb3VyY2UoZGMsIGNvbnRleHQsIG9sZF9jb250ZXh0KTsK IAlpZiAocmVzdWx0ICE9IERDX09LKQogCQlyZXR1cm4gcmVzdWx0OwogCkBAIC05NjMsNyArOTQ0 LDcgQEAgZW51bSBkY19zdGF0dXMgZGNuMTBfdmFsaWRhdGVfZ3VhcmFudGVlZCgKIAkJcmVzdWx0 ID0gcmVzb3VyY2VfbWFwX3BoeV9jbG9ja19yZXNvdXJjZXMoZGMsIGNvbnRleHQsIE5VTEwpOwog CiAJaWYgKHJlc3VsdCA9PSBEQ19PSykKLQkJcmVzdWx0ID0gdmFsaWRhdGVfbWFwcGVkX3Jlc291 cmNlKGRjLCBjb250ZXh0LCBOVUxMKTsKKwkJcmVzdWx0ID0gYnVpbGRfbWFwcGVkX3Jlc291cmNl KGRjLCBjb250ZXh0LCBOVUxMKTsKIAogCWlmIChyZXN1bHQgPT0gRENfT0spIHsKIAkJdmFsaWRh dGVfZ3VhcmFudGVlZF9jb3B5X3N0cmVhbXMoCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvaW5jL2h3L2xpbmtfZW5jb2Rlci5oIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9ody9saW5rX2VuY29kZXIuaAppbmRleCBkMzMwZDM4YWZmMTYuLjBl ZTczODc3NGY5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2lu Yy9ody9saW5rX2VuY29kZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv aW5jL2h3L2xpbmtfZW5jb2Rlci5oCkBAIC05NCw3ICs5NCw3IEBAIHN0cnVjdCBsaW5rX2VuY29k ZXIgewogCiBzdHJ1Y3QgbGlua19lbmNvZGVyX2Z1bmNzIHsKIAlib29sICgqdmFsaWRhdGVfb3V0 cHV0X3dpdGhfc3RyZWFtKSgKLQkJc3RydWN0IGxpbmtfZW5jb2RlciAqZW5jLCBzdHJ1Y3QgcGlw ZV9jdHggKnBpcGVfY3R4KTsKKwkJc3RydWN0IGxpbmtfZW5jb2RlciAqZW5jLCBjb25zdCBzdHJ1 Y3QgY29yZV9zdHJlYW0gKnN0cmVhbSk7CiAJdm9pZCAoKmh3X2luaXQpKHN0cnVjdCBsaW5rX2Vu Y29kZXIgKmVuYyk7CiAJdm9pZCAoKnNldHVwKShzdHJ1Y3QgbGlua19lbmNvZGVyICplbmMsCiAJ CWVudW0gc2lnbmFsX3R5cGUgc2lnbmFsKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy92aXJ0dWFsL3ZpcnR1YWxfbGlua19lbmNvZGVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvdmlydHVhbC92aXJ0dWFsX2xpbmtfZW5jb2Rlci5jCmluZGV4 IDEyZGY0OTkyN2YwOS4uZDMxMjg3NGQ5NWI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvdmlydHVhbC92aXJ0dWFsX2xpbmtfZW5jb2Rlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy92aXJ0dWFsL3ZpcnR1YWxfbGlua19lbmNvZGVyLmMK QEAgLTMwLDcgKzMwLDcgQEAKIAogc3RhdGljIGJvb2wgdmlydHVhbF9saW5rX2VuY29kZXJfdmFs aWRhdGVfb3V0cHV0X3dpdGhfc3RyZWFtKAogCXN0cnVjdCBsaW5rX2VuY29kZXIgKmVuYywKLQlz dHJ1Y3QgcGlwZV9jdHggKnBpcGVfY3R4KSB7IHJldHVybiB0cnVlOyB9CisJY29uc3Qgc3RydWN0 IGNvcmVfc3RyZWFtICpzdHJlYW0pIHsgcmV0dXJuIHRydWU7IH0KIAogc3RhdGljIHZvaWQgdmly dHVhbF9saW5rX2VuY29kZXJfaHdfaW5pdChzdHJ1Y3QgbGlua19lbmNvZGVyICplbmMpIHt9CiAK LS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==