From: Harry Wentland Subject: [PATCH 014/103] drm/amd/display: Refactor dc_update_planes_and_stream. Date: Tue, 10 Oct 2017 18:39:43 -0400 Message-ID: <20171010224112.3023-15-harry.wentland@amd.com> References: <20171010224112.3023-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: <20171010224112.3023-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 , Bhawanpreet Lakha RnJvbTogQmhhd2FucHJlZXQgTGFraGEgPEJoYXdhbnByZWV0Lkxha2hhQGFtZC5jb20+CgpTcGxp dCB1cGRhdGVfcGxhbmVzX2FuZF9zdHJlYW1fc3RhdGUgKHNwbGl0IFNvZnR3YXJlIGFuZCBIYXJk d2FyZQpwcm9ncmFtbWluZykgYXMgdGhlIHN0YXRlIGlzIGFscmVhZHkgYnVpbGQsIHNvIHdlIG9u bHkgbmVlZCB0bwpwcm9ncmFtIHRoZSBoYXJkd2FyZQoKU2lnbmVkLW9mZi1ieTogQW5kcmV5IEdy b2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEJoYXdh bnByZWV0IExha2hhIDxCaGF3YW5wcmVldC5MYWtoYUBhbWQuY29tPgpSZXZpZXdlZC1ieTogSGFy cnkgV2VudGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyB8ICAyMSArLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyAgICAgICAgICB8IDI1NiArKysrKy0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaCAgICAgICAgICAg ICAgIHwgIDM2ICstLQogMyBmaWxlcyBjaGFuZ2VkLCA4NyBpbnNlcnRpb25zKCspLCAyMjYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdw dV9kbS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtLmMKaW5kZXggZmI4MGUyMmFlMDZmLi5hZjJjOWQxMjg5YzAgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwpAQCAtMzkz NSw3ICszOTM1LDggQEAgc3RhdGljIHZvaWQgcHJlcGFyZV9mbGlwX2lzcihzdHJ1Y3QgYW1kZ3B1 X2NydGMgKmFjcnRjKQogc3RhdGljIHZvaWQgYW1kZ3B1X2RtX2RvX2ZsaXAoCiAJCQkJc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQkJCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAotCQkJCXVp bnQzMl90IHRhcmdldCkKKwkJCQl1aW50MzJfdCB0YXJnZXQsCisJCQkJc3RydWN0IGRjX3N0YXRl ICpzdGF0ZSkKIHsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCXVpbnQzMl90IHRhcmdldF92Ymxh bms7CkBAIC00MDA2LDcgKzQwMDcsMTMgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2RtX2RvX2ZsaXAo CiAJc3VyZmFjZV91cGRhdGVzLT5mbGlwX2FkZHIgPSAmYWRkcjsKIAogCi0JZGNfdXBkYXRlX3Bs YW5lc19hbmRfc3RyZWFtKGFkZXYtPmRtLmRjLCBzdXJmYWNlX3VwZGF0ZXMsIDEsIGFjcnRjX3N0 YXRlLT5zdHJlYW0sIE5VTEwpOworCWRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oYWRldi0+ ZG0uZGMsCisJCQkJCSAgICAgc3VyZmFjZV91cGRhdGVzLAorCQkJCQkgICAgIDEsCisJCQkJCSAg ICAgYWNydGNfc3RhdGUtPnN0cmVhbSwKKwkJCQkJICAgICBOVUxMLAorCQkJCQkgICAgICZzdXJm YWNlX3VwZGF0ZXMtPnN1cmZhY2UsCisJCQkJCSAgICAgc3RhdGUpOwogCiAJRFJNX0RFQlVHX0RS SVZFUigiJXMgRmxpcHBpbmcgdG8gaGk6IDB4JXgsIGxvdzogMHgleCBcbiIsCiAJCQkgX19mdW5j X18sCkBAIC00MDMwLDYgKzQwMzcsNyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3Bs YW5lcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRjX3BsYW5lX3N0 YXRlICpwbGFuZV9zdGF0ZXNfY29uc3RydWN0ZWRbTUFYX1NVUkZBQ0VTXTsKIAlzdHJ1Y3QgYW1k Z3B1X2NydGMgKmFjcnRjX2F0dGFjaCA9IHRvX2FtZGdwdV9jcnRjKHBjcnRjKTsKIAlzdHJ1Y3Qg ZG1fY3J0Y19zdGF0ZSAqYWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKHBjcnRjLT5zdGF0 ZSk7CisJc3RydWN0IGRtX2F0b21pY19zdGF0ZSAqZG1fc3RhdGUgPSB0b19kbV9hdG9taWNfc3Rh dGUoc3RhdGUpOwogCWludCBwbGFuZXNfY291bnQgPSAwOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7 CiAKQEAgLTQwODYsNyArNDA5NCw4IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21taXRfcGxh bmVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCWFtZGdwdV9kbV9kb19mbGlw KAogCQkJCWNydGMsCiAJCQkJZmIsCi0JCQkJZHJtX2NydGNfdmJsYW5rX2NvdW50KGNydGMpICsg KndhaXRfZm9yX3ZibGFuayk7CisJCQkJZHJtX2NydGNfdmJsYW5rX2NvdW50KGNydGMpICsgKndh aXRfZm9yX3ZibGFuaywKKwkJCQlkbV9zdGF0ZS0+Y29udGV4dCk7CiAJCX0KIAogCX0KQEAgLTQx MDYsNyArNDExNSw4IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21taXRfcGxhbmVzKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJaWYgKGZhbHNlID09IGRjX2NvbW1pdF9wbGFu ZXNfdG9fc3RyZWFtKGRtLT5kYywKIAkJCQkJCQlwbGFuZV9zdGF0ZXNfY29uc3RydWN0ZWQsCiAJ CQkJCQkJcGxhbmVzX2NvdW50LAotCQkJCQkJCWRjX3N0cmVhbV9hdHRhY2gpKQorCQkJCQkJCWRj X3N0cmVhbV9hdHRhY2gsCisJCQkJCQkJZG1fc3RhdGUtPmNvbnRleHQpKQogCQkJZG1fZXJyb3Io IiVzOiBGYWlsZWQgdG8gYXR0YWNoIHBsYW5lIVxuIiwgX19mdW5jX18pOwogCX0gZWxzZSB7CiAJ CS8qVE9ETyBCVUcgSGVyZSBzaG91bGQgZ28gZGlzYWJsZSBwbGFuZXMgb24gQ1JUQy4gKi8KQEAg LTQzMjksNyArNDMzOSw4IEBAIHZvaWQgYW1kZ3B1X2RtX2F0b21pY19jb21taXRfdGFpbCgKIAkJ CQlkbS0+ZGMsCiAJCQkJc3RhdHVzLT5wbGFuZV9zdGF0ZXMsCiAJCQkJc3RhdHVzLT5wbGFuZV9j b3VudCwKLQkJCQluZXdfYWNydGNfc3RhdGUtPnN0cmVhbSkpCisJCQkJbmV3X2FjcnRjX3N0YXRl LT5zdHJlYW0sCisJCQkJZG1fc3RhdGUtPmNvbnRleHQpKQogCQkJZG1fZXJyb3IoIiVzOiBGYWls ZWQgdG8gdXBkYXRlIHN0cmVhbSBzY2FsaW5nIVxuIiwgX19mdW5jX18pOwogCX0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggNDdmMTZhNGI5ZjI3Li4xZWM2 ZGY5ODcwZGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYwpAQCAt ODY5LDcgKzg2OSw4IEBAIGJvb2wgZGNfY29tbWl0X3BsYW5lc190b19zdHJlYW0oCiAJCXN0cnVj dCBkYyAqZGMsCiAJCXN0cnVjdCBkY19wbGFuZV9zdGF0ZSAqKnBsYW5lX3N0YXRlcywKIAkJdWlu dDhfdCBuZXdfcGxhbmVfY291bnQsCi0JCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKmRjX3N0cmVh bSkKKwkJc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqZGNfc3RyZWFtLAorCQlzdHJ1Y3QgZGNfc3Rh dGUgKnN0YXRlKQogewogCXN0cnVjdCBkY19zdXJmYWNlX3VwZGF0ZSB1cGRhdGVzW01BWF9TVVJG QUNFU107CiAJc3RydWN0IGRjX2ZsaXBfYWRkcnMgZmxpcF9hZGRyW01BWF9TVVJGQUNFU107CkBA IC05MjAsMTEgKzkyMSwxMSBAQCBib29sIGRjX2NvbW1pdF9wbGFuZXNfdG9fc3RyZWFtKAogCQl1 cGRhdGVzW2ldLnNjYWxpbmdfaW5mbyA9ICZzY2FsaW5nX2luZm9baV07CiAJfQogCi0JZGNfdXBk YXRlX3BsYW5lc19hbmRfc3RyZWFtKAorCWRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oCiAJ CQlkYywKIAkJCXVwZGF0ZXMsCiAJCQluZXdfcGxhbmVfY291bnQsCi0JCQlkY19zdHJlYW0sIHN0 cmVhbV91cGRhdGUpOworCQkJZGNfc3RyZWFtLCBzdHJlYW1fdXBkYXRlLCBwbGFuZV9zdGF0ZXMs IHN0YXRlKTsKIAogCWRjX3Bvc3RfdXBkYXRlX3N1cmZhY2VzX3RvX3N0cmVhbShkYyk7CiAKQEAg LTExNTAsMTkyICsxMTUxLDIwIEBAIHN0YXRpYyBzdHJ1Y3QgZGNfc3RyZWFtX3N0YXR1cyAqc3Ry ZWFtX2dldF9zdGF0dXMoCiAKIHN0YXRpYyBjb25zdCBlbnVtIHN1cmZhY2VfdXBkYXRlX3R5cGUg dXBkYXRlX3N1cmZhY2VfdHJhY2VfbGV2ZWwgPSBVUERBVEVfVFlQRV9GVUxMOwogCi12b2lkIGRj X3VwZGF0ZV9wbGFuZXNfYW5kX3N0cmVhbShzdHJ1Y3QgZGMgKmRjLAotCQlzdHJ1Y3QgZGNfc3Vy ZmFjZV91cGRhdGUgKnNyZl91cGRhdGVzLCBpbnQgc3VyZmFjZV9jb3VudCwKKworc3RhdGljIHZv aWQgY29tbWl0X3BsYW5lc19mb3Jfc3RyZWFtKHN0cnVjdCBkYyAqZGMsCisJCXN0cnVjdCBkY19z dXJmYWNlX3VwZGF0ZSAqc3JmX3VwZGF0ZXMsCisJCWludCBzdXJmYWNlX2NvdW50LAogCQlzdHJ1 Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0sCi0JCXN0cnVjdCBkY19zdHJlYW1fdXBkYXRlICpz dHJlYW1fdXBkYXRlKQorCQlzdHJ1Y3QgZGNfc3RyZWFtX3VwZGF0ZSAqc3RyZWFtX3VwZGF0ZSwK KwkJZW51bSBzdXJmYWNlX3VwZGF0ZV90eXBlIHVwZGF0ZV90eXBlLAorCQlzdHJ1Y3QgZGNfc3Rh dGUgKmNvbnRleHQpCiB7Ci0Jc3RydWN0IGRjX3N0YXRlICpjb250ZXh0OwogCWludCBpLCBqOwot CWVudW0gc3VyZmFjZV91cGRhdGVfdHlwZSB1cGRhdGVfdHlwZTsKLQljb25zdCBzdHJ1Y3QgZGNf c3RyZWFtX3N0YXR1cyAqc3RyZWFtX3N0YXR1czsKLQlzdHJ1Y3QgZGNfY29udGV4dCAqZGNfY3R4 ID0gZGMtPmN0eDsKLQotCXN0cmVhbV9zdGF0dXMgPSBkY19zdHJlYW1fZ2V0X3N0YXR1cyhzdHJl YW0pOwotCi0JQVNTRVJUKHN0cmVhbV9zdGF0dXMpOwotCWlmICghc3RyZWFtX3N0YXR1cykKLQkJ cmV0dXJuOyAvKiBDYW5ub3QgY29tbWl0IHN1cmZhY2UgdG8gc3RyZWFtIHRoYXQgaXMgbm90IGNv bW1pdHRlZCAqLwotCi0jaWZkZWYgRU5BQkxFX0ZCQwotCWlmIChzcmZfdXBkYXRlcy0+ZmxpcF9h ZGRyKSB7Ci0JCWlmIChzcmZfdXBkYXRlcy0+ZmxpcF9hZGRyLT5hZGRyZXNzLmdycGguYWRkci5s b3dfcGFydCA9PSAwKQotCQkJQVNTRVJUKDApOwotCX0KLSNlbmRpZgotCWNvbnRleHQgPSBkYy0+ Y3VycmVudF9zdGF0ZTsKLQotCS8qIHVwZGF0ZSBjdXJyZW50IHN0cmVhbSB3aXRoIHRoZSBuZXcg dXBkYXRlcyAqLwotCWlmIChzdHJlYW1fdXBkYXRlKSB7Ci0JCWlmICgoc3RyZWFtX3VwZGF0ZS0+ c3JjLmhlaWdodCAhPSAwKSAmJgotCQkJCShzdHJlYW1fdXBkYXRlLT5zcmMud2lkdGggIT0gMCkp Ci0JCQlzdHJlYW0tPnNyYyA9IHN0cmVhbV91cGRhdGUtPnNyYzsKLQotCQlpZiAoKHN0cmVhbV91 cGRhdGUtPmRzdC5oZWlnaHQgIT0gMCkgJiYKLQkJCQkoc3RyZWFtX3VwZGF0ZS0+ZHN0LndpZHRo ICE9IDApKQotCQkJc3RyZWFtLT5kc3QgPSBzdHJlYW1fdXBkYXRlLT5kc3Q7Ci0KLQkJaWYgKHN0 cmVhbV91cGRhdGUtPm91dF90cmFuc2Zlcl9mdW5jICYmCi0JCQkJc3RyZWFtX3VwZGF0ZS0+b3V0 X3RyYW5zZmVyX2Z1bmMgIT0KLQkJCQkJCXN0cmVhbS0+b3V0X3RyYW5zZmVyX2Z1bmMpIHsKLQkJ CWlmIChzdHJlYW0tPm91dF90cmFuc2Zlcl9mdW5jICE9IE5VTEwpCi0JCQkJZGNfdHJhbnNmZXJf ZnVuY19yZWxlYXNlKHN0cmVhbS0+b3V0X3RyYW5zZmVyX2Z1bmMpOwotCQkJZGNfdHJhbnNmZXJf ZnVuY19yZXRhaW4oc3RyZWFtX3VwZGF0ZS0+b3V0X3RyYW5zZmVyX2Z1bmMpOwotCQkJc3RyZWFt LT5vdXRfdHJhbnNmZXJfZnVuYyA9Ci0JCQkJc3RyZWFtX3VwZGF0ZS0+b3V0X3RyYW5zZmVyX2Z1 bmM7Ci0JCX0KLQl9Ci0KLQkvKiBkbyBub3QgcGVyZm9ybSBzdXJmYWNlIHVwZGF0ZSBpZiBzdXJm YWNlIGhhcyBpbnZhbGlkIGRpbWVuc2lvbnMKLQkgKiAoYWxsIHplcm8pIGFuZCBubyBzY2FsaW5n X2luZm8gaXMgcHJvdmlkZWQKLQkgKi8KLQlpZiAoc3VyZmFjZV9jb3VudCA+IDAgJiYKLQkJCXNy Zl91cGRhdGVzLT5zdXJmYWNlLT5zcmNfcmVjdC53aWR0aCA9PSAwICYmCi0JCQlzcmZfdXBkYXRl cy0+c3VyZmFjZS0+c3JjX3JlY3QuaGVpZ2h0ID09IDAgJiYKLQkJCXNyZl91cGRhdGVzLT5zdXJm YWNlLT5kc3RfcmVjdC53aWR0aCA9PSAwICYmCi0JCQlzcmZfdXBkYXRlcy0+c3VyZmFjZS0+ZHN0 X3JlY3QuaGVpZ2h0ID09IDAgJiYKLQkJCSFzcmZfdXBkYXRlcy0+c2NhbGluZ19pbmZvKSB7Ci0J CUFTU0VSVChmYWxzZSk7Ci0JCXJldHVybjsKLQl9Ci0KLQl1cGRhdGVfdHlwZSA9IGRjX2NoZWNr X3VwZGF0ZV9zdXJmYWNlc19mb3Jfc3RyZWFtKAotCQkJZGMsIHNyZl91cGRhdGVzLCBzdXJmYWNl X2NvdW50LCBzdHJlYW1fdXBkYXRlLCBzdHJlYW1fc3RhdHVzKTsKLQotCWlmICh1cGRhdGVfdHlw ZSA+PSB1cGRhdGVfc3VyZmFjZV90cmFjZV9sZXZlbCkKLQkJdXBkYXRlX3N1cmZhY2VfdHJhY2Uo ZGMsIHNyZl91cGRhdGVzLCBzdXJmYWNlX2NvdW50KTsKLQotCWlmICh1cGRhdGVfdHlwZSA+PSBV UERBVEVfVFlQRV9GVUxMKSB7Ci0JCXN0cnVjdCBkY19wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lc1tN QVhfU1VSRkFDRVNdID0gezB9OwotCi0JCWZvciAoaSA9IDA7IGkgPCBzdXJmYWNlX2NvdW50OyBp KyspCi0JCQluZXdfcGxhbmVzW2ldID0gc3JmX3VwZGF0ZXNbaV0uc3VyZmFjZTsKLQotCQkvKiBp bml0aWFsaXplIHNjcmF0Y2ggbWVtb3J5IGZvciBidWlsZGluZyBjb250ZXh0ICovCi0JCWNvbnRl eHQgPSBkY19jcmVhdGVfc3RhdGUoKTsKLQkJaWYgKGNvbnRleHQgPT0gTlVMTCkgewotCQkJRENf RVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBuZXcgdmFsaWRhdGUgY29udGV4dCFcbiIpOwotCQkJ cmV0dXJuOwotCQl9Ci0KLQkJZGNfcmVzb3VyY2Vfc3RhdGVfY29weV9jb25zdHJ1Y3QoCi0JCQkJ ZGMtPmN1cnJlbnRfc3RhdGUsIGNvbnRleHQpOwotCi0JCS8qcmVtb3ZlIG9sZCBzdXJmYWNlcyBm cm9tIGNvbnRleHQgKi8KLQkJaWYgKCFkY19yZW1fYWxsX3BsYW5lc19mb3Jfc3RyZWFtKGRjLCBz dHJlYW0sIGNvbnRleHQpKSB7Ci0KLQkJCUJSRUFLX1RPX0RFQlVHR0VSKCk7Ci0JCQlnb3RvIGZh aWw7Ci0JCX0KLQotCQkvKiBhZGQgc3VyZmFjZSB0byBjb250ZXh0ICovCi0JCWlmICghZGNfYWRk X2FsbF9wbGFuZXNfZm9yX3N0cmVhbShkYywgc3RyZWFtLCBuZXdfcGxhbmVzLCBzdXJmYWNlX2Nv dW50LCBjb250ZXh0KSkgewotCi0JCQlCUkVBS19UT19ERUJVR0dFUigpOwotCQkJZ290byBmYWls OwotCQl9Ci0JfQotCi0JLyogc2F2ZSB1cGRhdGUgcGFyYW1ldGVycyBpbnRvIHN1cmZhY2UgKi8K LQlmb3IgKGkgPSAwOyBpIDwgc3VyZmFjZV9jb3VudDsgaSsrKSB7Ci0JCXN0cnVjdCBkY19wbGFu ZV9zdGF0ZSAqc3VyZmFjZSA9IHNyZl91cGRhdGVzW2ldLnN1cmZhY2U7Ci0KLQkJaWYgKHNyZl91 cGRhdGVzW2ldLmZsaXBfYWRkcikgewotCQkJc3VyZmFjZS0+YWRkcmVzcyA9IHNyZl91cGRhdGVz W2ldLmZsaXBfYWRkci0+YWRkcmVzczsKLQkJCXN1cmZhY2UtPmZsaXBfaW1tZWRpYXRlID0KLQkJ CQkJc3JmX3VwZGF0ZXNbaV0uZmxpcF9hZGRyLT5mbGlwX2ltbWVkaWF0ZTsKLQkJfQotCi0JCWlm IChzcmZfdXBkYXRlc1tpXS5zY2FsaW5nX2luZm8pIHsKLQkJCXN1cmZhY2UtPnNjYWxpbmdfcXVh bGl0eSA9Ci0JCQkJCXNyZl91cGRhdGVzW2ldLnNjYWxpbmdfaW5mby0+c2NhbGluZ19xdWFsaXR5 OwotCQkJc3VyZmFjZS0+ZHN0X3JlY3QgPQotCQkJCQlzcmZfdXBkYXRlc1tpXS5zY2FsaW5nX2lu Zm8tPmRzdF9yZWN0OwotCQkJc3VyZmFjZS0+c3JjX3JlY3QgPQotCQkJCQlzcmZfdXBkYXRlc1tp XS5zY2FsaW5nX2luZm8tPnNyY19yZWN0OwotCQkJc3VyZmFjZS0+Y2xpcF9yZWN0ID0KLQkJCQkJ c3JmX3VwZGF0ZXNbaV0uc2NhbGluZ19pbmZvLT5jbGlwX3JlY3Q7Ci0JCX0KLQotCQlpZiAoc3Jm X3VwZGF0ZXNbaV0ucGxhbmVfaW5mbykgewotCQkJc3VyZmFjZS0+Y29sb3Jfc3BhY2UgPQotCQkJ CQlzcmZfdXBkYXRlc1tpXS5wbGFuZV9pbmZvLT5jb2xvcl9zcGFjZTsKLQkJCXN1cmZhY2UtPmZv cm1hdCA9Ci0JCQkJCXNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8tPmZvcm1hdDsKLQkJCXN1cmZh Y2UtPnBsYW5lX3NpemUgPQotCQkJCQlzcmZfdXBkYXRlc1tpXS5wbGFuZV9pbmZvLT5wbGFuZV9z aXplOwotCQkJc3VyZmFjZS0+cm90YXRpb24gPQotCQkJCQlzcmZfdXBkYXRlc1tpXS5wbGFuZV9p bmZvLT5yb3RhdGlvbjsKLQkJCXN1cmZhY2UtPmhvcml6b250YWxfbWlycm9yID0KLQkJCQkJc3Jm X3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+aG9yaXpvbnRhbF9taXJyb3I7Ci0JCQlzdXJmYWNlLT5z dGVyZW9fZm9ybWF0ID0KLQkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxhbmVfaW5mby0+c3RlcmVvX2Zv cm1hdDsKLQkJCXN1cmZhY2UtPnRpbGluZ19pbmZvID0KLQkJCQkJc3JmX3VwZGF0ZXNbaV0ucGxh bmVfaW5mby0+dGlsaW5nX2luZm87Ci0JCQlzdXJmYWNlLT52aXNpYmxlID0KLQkJCQkJc3JmX3Vw ZGF0ZXNbaV0ucGxhbmVfaW5mby0+dmlzaWJsZTsKLQkJCXN1cmZhY2UtPnBlcl9waXhlbF9hbHBo YSA9Ci0JCQkJCXNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8tPnBlcl9waXhlbF9hbHBoYTsKLQkJ CXN1cmZhY2UtPmRjYyA9Ci0JCQkJCXNyZl91cGRhdGVzW2ldLnBsYW5lX2luZm8tPmRjYzsKLQkJ fQotCi0JCWlmICh1cGRhdGVfdHlwZSA+PSBVUERBVEVfVFlQRV9NRUQpIHsKLQkJCWZvciAoaiA9 IDA7IGogPCBkYy0+cmVzX3Bvb2wtPnBpcGVfY291bnQ7IGorKykgewotCQkJCXN0cnVjdCBwaXBl X2N0eCAqcGlwZV9jdHggPSAmY29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtqXTsKLQotCQkJCWlm IChwaXBlX2N0eC0+cGxhbmVfc3RhdGUgIT0gc3VyZmFjZSkKLQkJCQkJY29udGludWU7Ci0KLQkJ CQlyZXNvdXJjZV9idWlsZF9zY2FsaW5nX3BhcmFtcyhwaXBlX2N0eCk7Ci0JCQl9Ci0JCX0KLQot CQlpZiAoc3JmX3VwZGF0ZXNbaV0uZ2FtbWEgJiYKLQkJCXNyZl91cGRhdGVzW2ldLmdhbW1hICE9 IHN1cmZhY2UtPmdhbW1hX2NvcnJlY3Rpb24pIHsKLQkJCWlmIChzdXJmYWNlLT5nYW1tYV9jb3Jy ZWN0aW9uICE9IE5VTEwpCi0JCQkJZGNfZ2FtbWFfcmVsZWFzZSgmc3VyZmFjZS0+Z2FtbWFfY29y cmVjdGlvbik7Ci0KLQkJCWRjX2dhbW1hX3JldGFpbihzcmZfdXBkYXRlc1tpXS5nYW1tYSk7Ci0J CQlzdXJmYWNlLT5nYW1tYV9jb3JyZWN0aW9uID0gc3JmX3VwZGF0ZXNbaV0uZ2FtbWE7Ci0JCX0K LQotCQlpZiAoc3JmX3VwZGF0ZXNbaV0uaW5fdHJhbnNmZXJfZnVuYyAmJgotCQkJc3JmX3VwZGF0 ZXNbaV0uaW5fdHJhbnNmZXJfZnVuYyAhPSBzdXJmYWNlLT5pbl90cmFuc2Zlcl9mdW5jKSB7Ci0J CQlpZiAoc3VyZmFjZS0+aW5fdHJhbnNmZXJfZnVuYyAhPSBOVUxMKQotCQkJCWRjX3RyYW5zZmVy X2Z1bmNfcmVsZWFzZSgKLQkJCQkJCXN1cmZhY2UtPgotCQkJCQkJaW5fdHJhbnNmZXJfZnVuYyk7 Ci0KLQkJCWRjX3RyYW5zZmVyX2Z1bmNfcmV0YWluKAotCQkJCQlzcmZfdXBkYXRlc1tpXS5pbl90 cmFuc2Zlcl9mdW5jKTsKLQkJCXN1cmZhY2UtPmluX3RyYW5zZmVyX2Z1bmMgPQotCQkJCQlzcmZf dXBkYXRlc1tpXS5pbl90cmFuc2Zlcl9mdW5jOwotCQl9Ci0KLQkJaWYgKHNyZl91cGRhdGVzW2ld Lmhkcl9zdGF0aWNfbWV0YWRhdGEpCi0JCQlzdXJmYWNlLT5oZHJfc3RhdGljX2N0eCA9Ci0JCQkJ KihzcmZfdXBkYXRlc1tpXS5oZHJfc3RhdGljX21ldGFkYXRhKTsKLQl9CiAKIAlpZiAodXBkYXRl X3R5cGUgPT0gVVBEQVRFX1RZUEVfRlVMTCkgewotCQlpZiAoIWRjLT5yZXNfcG9vbC0+ZnVuY3Mt PnZhbGlkYXRlX2JhbmR3aWR0aChkYywgY29udGV4dCkpIHsKLQkJCUJSRUFLX1RPX0RFQlVHR0VS KCk7Ci0JCQlnb3RvIGZhaWw7Ci0JCX0gZWxzZSB7Ci0JCQlkYy0+aHdzcy5zZXRfYmFuZHdpZHRo KGRjLCBjb250ZXh0LCBmYWxzZSk7Ci0JCQljb250ZXh0X2Nsb2NrX3RyYWNlKGRjLCBjb250ZXh0 KTsKLQkJfQorCQlkYy0+aHdzcy5zZXRfYmFuZHdpZHRoKGRjLCBjb250ZXh0LCBmYWxzZSk7CisJ CWNvbnRleHRfY2xvY2tfdHJhY2UoZGMsIGNvbnRleHQpOwogCX0KIAogCWlmICh1cGRhdGVfdHlw ZSA+IFVQREFURV9UWVBFX0ZBU1QpIHsKQEAgLTE0NTksMjcgKzEyODgsNjAgQEAgdm9pZCBkY191 cGRhdGVfcGxhbmVzX2FuZF9zdHJlYW0oc3RydWN0IGRjICpkYywKIAkJCWJyZWFrOwogCQl9CiAJ fQorfQorCit2b2lkIGRjX2NvbW1pdF91cGRhdGVzX2Zvcl9zdHJlYW0oc3RydWN0IGRjICpkYywK KwkJc3RydWN0IGRjX3N1cmZhY2VfdXBkYXRlICpzcmZfdXBkYXRlcywKKwkJaW50IHN1cmZhY2Vf Y291bnQsCisJCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKnN0cmVhbSwKKwkJc3RydWN0IGRjX3N0 cmVhbV91cGRhdGUgKnN0cmVhbV91cGRhdGUsCisJCXN0cnVjdCBkY19wbGFuZV9zdGF0ZSAqKnBs YW5lX3N0YXRlcywKKwkJc3RydWN0IGRjX3N0YXRlICpzdGF0ZSkKK3sKKwljb25zdCBzdHJ1Y3Qg ZGNfc3RyZWFtX3N0YXR1cyAqc3RyZWFtX3N0YXR1czsKKwllbnVtIHN1cmZhY2VfdXBkYXRlX3R5 cGUgdXBkYXRlX3R5cGU7CisJc3RydWN0IGRjX3N0YXRlICpjb250ZXh0OworCWludCBpOwogCi0J aWYgKGRjLT5jdXJyZW50X3N0YXRlICE9IGNvbnRleHQpIHsKKwlzdHJlYW1fc3RhdHVzID0gZGNf c3RyZWFtX2dldF9zdGF0dXMoc3RyZWFtKTsKKwljb250ZXh0ID0gZGMtPmN1cnJlbnRfc3RhdGU7 CisKKwl1cGRhdGVfdHlwZSA9IGRjX2NoZWNrX3VwZGF0ZV9zdXJmYWNlc19mb3Jfc3RyZWFtKAor CQkJCWRjLCBzcmZfdXBkYXRlcywgc3VyZmFjZV9jb3VudCwgc3RyZWFtX3VwZGF0ZSwgc3RyZWFt X3N0YXR1cyk7CisKKwlpZiAodXBkYXRlX3R5cGUgPj0gdXBkYXRlX3N1cmZhY2VfdHJhY2VfbGV2 ZWwpCisJCXVwZGF0ZV9zdXJmYWNlX3RyYWNlKGRjLCBzcmZfdXBkYXRlcywgc3VyZmFjZV9jb3Vu dCk7CiAKLQkJLyogU2luY2UgbWVtb3J5IGZyZWUgcmVxdWlyZXMgZWxldmF0ZWQgSVJRTCwgYW4g aW50ZXJydXB0Ci0JCSAqIHJlcXVlc3QgaXMgZ2VuZXJhdGVkIGJ5IG1lbSBmcmVlLiBJZiB0aGlz IGhhcHBlbnMKLQkJICogYmV0d2VlbiBmcmVlaW5nIGFuZCByZWFzc2lnbmluZyB0aGUgY29udGV4 dCwgb3VyIHZzeW5jCi0JCSAqIGludGVycnVwdCB3aWxsIGNhbGwgaW50byBkYyBhbmQgY2F1c2Ug YSBtZW1vcnkKLQkJICogY29ycnVwdGlvbiBCU09ELiBIZW5jZSwgd2UgZmlyc3QgcmVhc3NpZ24g dGhlIGNvbnRleHQsCi0JCSAqIHRoZW4gZnJlZSB0aGUgb2xkIGNvbnRleHQuCi0JCSAqLwogCi0J CXN0cnVjdCBkY19zdGF0ZSAqb2xkID0gZGMtPmN1cnJlbnRfc3RhdGU7CisJaWYgKHVwZGF0ZV90 eXBlID49IFVQREFURV9UWVBFX0ZVTEwpCisJCWRjX3Jlc291cmNlX3N0YXRlX2NvcHlfY29uc3Ry dWN0KHN0YXRlLCBjb250ZXh0KTsKIAotCQlkYy0+Y3VycmVudF9zdGF0ZSA9IGNvbnRleHQ7Ci0J CWRjX3JlbGVhc2Vfc3RhdGUob2xkKTsKKworCWZvciAoaSA9IDA7IGkgPCBzdXJmYWNlX2NvdW50 OyBpKyspIHsKKwkJc3RydWN0IGRjX3BsYW5lX3N0YXRlICpzdXJmYWNlID0gc3JmX3VwZGF0ZXNb aV0uc3VyZmFjZTsKKworCQkvKiBUT0RPOiBPbiBmbGlwIHdlIGRvbid0IGJ1aWxkIHRoZSBzdGF0 ZSwgc28gaXQgc3RpbGwgaGFzIHRoZQorCQkgKiBvbGQgYWRkcmVzcy4gV2hpY2ggaXMgd2h5IHdl IGFyZSB1cGRhdGluZyB0aGUgYWRkcmVzcyBoZXJlCisJCSAqLworCQlpZiAoc3JmX3VwZGF0ZXNb aV0uZmxpcF9hZGRyKQorCQkJc3VyZmFjZS0+YWRkcmVzcyA9IHNyZl91cGRhdGVzW2ldLmZsaXBf YWRkci0+YWRkcmVzczsKIAogCX0KKworCisJY29tbWl0X3BsYW5lc19mb3Jfc3RyZWFtKAorCQkJ CWRjLAorCQkJCXNyZl91cGRhdGVzLAorCQkJCXN1cmZhY2VfY291bnQsCisJCQkJc3RyZWFtLAor CQkJCXN0cmVhbV91cGRhdGUsCisJCQkJdXBkYXRlX3R5cGUsCisJCQkJY29udGV4dCk7CisKKwlk Y19wb3N0X3VwZGF0ZV9zdXJmYWNlc190b19zdHJlYW0oZGMpOworCiAJcmV0dXJuOwogCi1mYWls OgotCWRjX3JlbGVhc2Vfc3RhdGUoY29udGV4dCk7CiB9CiAKIHVpbnQ4X3QgZGNfZ2V0X2N1cnJl bnRfc3RyZWFtX2NvdW50KHN0cnVjdCBkYyAqZGMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvZGMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Yy5oCmluZGV4IDRmZjU0MzgyNjQ3Ni4uNTA0NDA3MzFmODNjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGMuaApAQCAtNDQ5LDIzICs0NDksNiBAQCBzdHJ1Y3QgZGNfZmxpcF9hZGRycyB7 CiAJLyogVE9ETzogYWRkIGZsaXAgZHVyYXRpb24gZm9yIEZyZWVTeW5jICovCiB9OwogCi0vKgot ICogU2V0IHVwIHN1cmZhY2UgYXR0cmlidXRlcyBhbmQgYXNzb2NpYXRlIHRvIGEgc3RyZWFtCi0g KiBUaGUgc3VyZmFjZXMgcGFyYW1ldGVyIGlzIGFuIGFic29sdXRlIHNldCBvZiBhbGwgc3VyZmFj ZSBhY3RpdmUgZm9yIHRoZSBzdHJlYW0uCi0gKiBJZiBubyBzdXJmYWNlcyBhcmUgcHJvdmlkZWQs IHRoZSBzdHJlYW0gd2lsbCBiZSBibGFua2VkOyBubyBtZW1vcnkgcmVhZC4KLSAqIEFueSBmbGlw IHJlbGF0ZWQgYXR0cmlidXRlIGNoYW5nZXMgbXVzdCBiZSBkb25lIHRocm91Z2ggdGhpcyBpbnRl cmZhY2UuCi0gKgotICogQWZ0ZXIgdGhpcyBjYWxsOgotICogICBTdXJmYWNlcyBhdHRyaWJ1dGVz IGFyZSBwcm9ncmFtbWVkIGFuZCBjb25maWd1cmVkIHRvIGJlIGNvbXBvc2VkIGludG8gc3RyZWFt LgotICogICBUaGlzIGRvZXMgbm90IHRyaWdnZXIgYSBmbGlwLiAgTm8gc3VyZmFjZSBhZGRyZXNz IGlzIHByb2dyYW1tZWQuCi0gKi8KLQotYm9vbCBkY19jb21taXRfcGxhbmVzX3RvX3N0cmVhbSgK LQkJc3RydWN0IGRjICpkYywKLQkJc3RydWN0IGRjX3BsYW5lX3N0YXRlICoqcGxhbmVfc3RhdGVz LAotCQl1aW50OF90IG5ld19wbGFuZV9jb3VudCwKLQkJc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAq c3RyZWFtKTsKLQogYm9vbCBkY19wb3N0X3VwZGF0ZV9zdXJmYWNlc190b19zdHJlYW0oCiAJCXN0 cnVjdCBkYyAqZGMpOwogCkBAIC01NzEsOSArNTU0LDYgQEAgYm9vbCBkY19pc19zdHJlYW1fdW5j aGFuZ2VkKAogCXN0cnVjdCBkY19zdHJlYW1fc3RhdGUgKm9sZF9zdHJlYW0sIHN0cnVjdCBkY19z dHJlYW1fc3RhdGUgKnN0cmVhbSk7CiAKIC8qCi0gKiBTZXR1cCBzdHJlYW0gYXR0cmlidXRlcyBp ZiBubyBzdHJlYW0gdXBkYXRlcyBhcmUgcHJvdmlkZWQKLSAqIHRoZXJlIHdpbGwgYmUgbm8gaW1w YWN0IG9uIHRoZSBzdHJlYW0gcGFyYW1ldGVycwotICoKICAqIFNldCB1cCBzdXJmYWNlIGF0dHJp YnV0ZXMgYW5kIGFzc29jaWF0ZSB0byBhIHN0cmVhbQogICogVGhlIHN1cmZhY2VzIHBhcmFtZXRl ciBpcyBhbiBhYnNvbHV0ZSBzZXQgb2YgYWxsIHN1cmZhY2UgYWN0aXZlIGZvciB0aGUgc3RyZWFt LgogICogSWYgbm8gc3VyZmFjZXMgYXJlIHByb3ZpZGVkLCB0aGUgc3RyZWFtIHdpbGwgYmUgYmxh bmtlZDsgbm8gbWVtb3J5IHJlYWQuCkBAIC01ODIsMTQgKzU2MiwyMiBAQCBib29sIGRjX2lzX3N0 cmVhbV91bmNoYW5nZWQoCiAgKiBBZnRlciB0aGlzIGNhbGw6CiAgKiAgIFN1cmZhY2VzIGF0dHJp YnV0ZXMgYXJlIHByb2dyYW1tZWQgYW5kIGNvbmZpZ3VyZWQgdG8gYmUgY29tcG9zZWQgaW50byBz dHJlYW0uCiAgKiAgIFRoaXMgZG9lcyBub3QgdHJpZ2dlciBhIGZsaXAuICBObyBzdXJmYWNlIGFk ZHJlc3MgaXMgcHJvZ3JhbW1lZC4KLSAqCiAgKi8KIAotdm9pZCBkY191cGRhdGVfcGxhbmVzX2Fu ZF9zdHJlYW0oc3RydWN0IGRjICpkYywKLQkJc3RydWN0IGRjX3N1cmZhY2VfdXBkYXRlICpzdXJm YWNlX3VwZGF0ZXMsIGludCBzdXJmYWNlX2NvdW50LAorYm9vbCBkY19jb21taXRfcGxhbmVzX3Rv X3N0cmVhbSgKKwkJc3RydWN0IGRjICpkYywKKwkJc3RydWN0IGRjX3BsYW5lX3N0YXRlICoqcGxh bmVfc3RhdGVzLAorCQl1aW50OF90IG5ld19wbGFuZV9jb3VudCwKIAkJc3RydWN0IGRjX3N0cmVh bV9zdGF0ZSAqZGNfc3RyZWFtLAotCQlzdHJ1Y3QgZGNfc3RyZWFtX3VwZGF0ZSAqc3RyZWFtX3Vw ZGF0ZSk7CisJCXN0cnVjdCBkY19zdGF0ZSAqc3RhdGUpOwogCit2b2lkIGRjX2NvbW1pdF91cGRh dGVzX2Zvcl9zdHJlYW0oc3RydWN0IGRjICpkYywKKwkJc3RydWN0IGRjX3N1cmZhY2VfdXBkYXRl ICpzcmZfdXBkYXRlcywKKwkJaW50IHN1cmZhY2VfY291bnQsCisJCXN0cnVjdCBkY19zdHJlYW1f c3RhdGUgKnN0cmVhbSwKKwkJc3RydWN0IGRjX3N0cmVhbV91cGRhdGUgKnN0cmVhbV91cGRhdGUs CisJCXN0cnVjdCBkY19wbGFuZV9zdGF0ZSAqKnBsYW5lX3N0YXRlcywKKwkJc3RydWN0IGRjX3N0 YXRlICpzdGF0ZSk7CiAvKgogICogTG9nIHRoZSBjdXJyZW50IHN0cmVhbSBzdGF0ZS4KICAqLwot LSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK