From: Subject: [PATCH 52/87] drm/amd/display: Optimize gamma calculations Date: Mon, 15 Jul 2019 17:20:14 -0400 Message-ID: <20190715212049.4584-53-sunpeng.li@amd.com> References: <20190715212049.4584-1-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190715212049.4584-1-sunpeng.li-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: Leo Li , Aric Cyr , Krunoslav Kovac , Anthony Koo RnJvbTogS3J1bm9zbGF2IEtvdmFjIDxLcnVub3NsYXYuS292YWNAYW1kLmNvbT4KCltXaHkmSG93 XQoKMS4gU3RhY2sgdXNhZ2UgaXMgcHJldHR5IGhpZ2ggYXMgZml4ZWQzMV8zMiBzdHJ1Y3QgaXMg OCBieXRlcyBhbmQgd2UKaGF2ZSBmdW5jdGlvbnMgd2l0aCA+MzAgdmFycyBvbiB0aGUgc3RhY2su CgoyLiBPcHRpbWl6ZSBnYW1tYSBjYWxjdWxhdGlvbiBieSByZWR1Y2luZyBudW1iZXIgb2YgY2Fs bHMgdG8KZGNfZml4cHRfcG93IE91ciBYIHBvaW50cyBhcmUgZGl2aWRlZCBpbnRvIDMyIHJlZ2lv bnMgd3RoIDE2IHB0cyBlYWNoLgpFYWNoIHJlZ2lvbiBpcyAyeCB0aGUgcHJldmlvdXMsIG1lYW5p bmcgeFtpXSA9IDIqeFtpLTE2XSBmb3IgaT49MTYuClVzaW5nICgyeCleZ2FtbWEgPSAyXmdhbW1h ICogeF5nYW1tYSwgd2UgY2FuIHJlY3Vyc2l2ZWx5IGNvbXB1dGUgcG93ZXJzCm9mIGdhbW1hLCB3 ZSBqdXN0IG5lZWQgZmlyc3QgMTYgcHRzIHRvIHN0YXJ0IGl0IHVwLiBkY19maXhwdF9wb3coKSBp cwpleHBlbnNpdmUsIGl0IGNvbXB1dGVzIHheeSBieSBkb2luZyBleHAoeSpsb2d4KSBFeHAgaXMg ZG9uZSBieSBUYXlsb3IKc2VyaWVzIGFwcHJveGltYXRpb24sIGFuZCBsb2cgYnkgTmV3dG9uLWxp a2UgYXBwcm94aW1hdGlvbiB0aGF0IGFsc28KdXNlcyBleHAgaW50ZXJuYWxseS4gSW4gc2hvcnQs IGl0J3Mgc2lnbmlmaWNhbnRseSBoZWF2aWVyIHRoYW4KcnVuLW9mLXRoZS1taWxsIGFkZGl0aW9u L3N1YnRyYWN0aW9uL211bHRpcGx5LgoKU2lnbmVkLW9mZi1ieTogS3J1bm9zbGF2IEtvdmFjIDxL cnVub3NsYXYuS292YWNAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEFudGhvbnkgS29vIDxBbnRob255 Lktvb0BhbWQuY29tPgpBY2tlZC1ieTogQXJpYyBDeXIgPEFyaWMuQ3lyQGFtZC5jb20+CkFja2Vk LWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNfaHdfdHlwZXMuaCAgfCAgIDEgLQogLi4uL2FtZC9kaXNwbGF5L21vZHVs ZXMvY29sb3IvY29sb3JfZ2FtbWEuYyAgIHwgMTYzICsrKysrKysrKysrLS0tLS0tLQogLi4uL2Ft ZC9kaXNwbGF5L21vZHVsZXMvY29sb3IvY29sb3JfZ2FtbWEuaCAgIHwgICA5ICsKIDMgZmlsZXMg Y2hhbmdlZCwgMTExIGluc2VydGlvbnMoKyksIDYyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY19od190eXBlcy5oIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjX2h3X3R5cGVzLmgKaW5kZXggMjJkYjU2ODJhYTZjLi5l OWE2MjI1ZjQ3MjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y19od190eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY19od190 eXBlcy5oCkBAIC00ODIsNyArNDgyLDYgQEAgc3RydWN0IGRjX2dhbW1hIHsKIAkgKiBpc19sb2dp Y2FsX2lkZW50aXR5IGluZGljYXRlcyB0aGUgZ2l2ZW4gZ2FtbWEgcmFtcCByZWdhcmRsZXNzIG9m IHR5cGUgaXMgaWRlbnRpdHkuCiAJICovCiAJYm9vbCBpc19pZGVudGl0eTsKLQlib29sIGlzX2xv Z2ljYWxfaWRlbnRpdHk7CiB9OwogCiAvKiBVc2VkIGJ5IGJvdGggaXBwIGFtZCBvcHAgZnVuY3Rp b25zKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2Nv bG9yL2NvbG9yX2dhbW1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9j b2xvci9jb2xvcl9nYW1tYS5jCmluZGV4IDNmNDEzZmI5ZjJjZS4uMjk0ZmU0ZjBjYjY3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvbW9kdWxlcy9jb2xvci9jb2xvcl9n YW1tYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2NvbG9yL2Nv bG9yX2dhbW1hLmMKQEAgLTM3LDYgKzM3LDMzIEBAIHN0YXRpYyBzdHJ1Y3QgaHdfeF9wb2ludCBj b29yZGluYXRlc194W01BWF9IV19QT0lOVFMgKyAyXTsKIHN0YXRpYyBzdHJ1Y3QgZml4ZWQzMV8z MiBwcV90YWJsZVtNQVhfSFdfUE9JTlRTICsgMl07CiBzdGF0aWMgc3RydWN0IGZpeGVkMzFfMzIg ZGVfcHFfdGFibGVbTUFYX0hXX1BPSU5UUyArIDJdOwogCisvLyB0aGVzZSBhcmUgaGVscGVycyBm b3IgY2FsY3VsYXRpb25zIHRvIHJlZHVjZSBzdGFjayB1c2FnZQorLy8gZG8gbm90IGRlcGVuZCBv biB0aGVzZSBiZWluZyBwcmVzZXJ2ZWQgYWNyb3NzIGNhbGxzCitzdGF0aWMgc3RydWN0IGZpeGVk MzFfMzIgc2NyYXRjaF8xOworc3RhdGljIHN0cnVjdCBmaXhlZDMxXzMyIHNjcmF0Y2hfMjsKK3N0 YXRpYyBzdHJ1Y3QgdHJhbnNsYXRlX2Zyb21fbGluZWFyX3NwYWNlX2FyZ3Mgc2NyYXRjaF9nYW1t YV9hcmdzOworCisvKiBIZWxwZXIgdG8gb3B0aW1pemUgZ2FtbWEgY2FsY3VsYXRpb24sIG9ubHkg dXNlIGluIHRyYW5zbGF0ZV9mcm9tX2xpbmVhciwgaW4KKyAqIHBhcnRpY3VsYXIgdGhlIGRjX2Zp eHB0X3BvdyBmdW5jdGlvbiB3aGljaCBpcyB2ZXJ5IGV4cGVuc2l2ZQorICogVGhlIGlkZWEgaXMg dGhhdCBvdXIgcmVnaW9ucyBmb3IgWCBwb2ludHMgYXJlIGV4cG9uZW50aWFsIGFuZCBjdXJyZW50 bHkgdGhleSBhbGwgdXNlCisgKiB0aGUgc2FtZSBudW1iZXIgb2YgcG9pbnRzIChOVU1fUFRTX0lO X1JFR0lPTikgYW5kIGluIGVhY2ggcmVnaW9uIGV2ZXJ5IHBvaW50CisgKiBpcyBleGFjdGx5IDJ4 IHRoZSBvbmUgYXQgdGhlIHNhbWUgaW5kZXggaW4gdGhlIHByZXZpb3VzIHJlZ2lvbi4gSW4gb3Ro ZXIgd29yZHMKKyAqIFhbaV0gPSAyICogWFtpLU5VTV9QVFNfSU5fUkVHSU9OXSBmb3IgaT49MTYK KyAqIFRoZSBvdGhlciBmYWN0IGlzIHRoYXQgKDJ4KV5nYW1tYSA9IDJeZ2FtbWEgKiB4XmdhbW1h CisgKiBTbyB3ZSBjb21wdXRlIGFuZCBzYXZlIHheZ2FtbWEgZm9yIHRoZSBmaXJzdCAxNiByZWdp b25zLCBhbmQgZm9yIGV2ZXJ5IG5leHQgcmVnaW9uCisgKiBqdXN0IG11bHRpcGx5IHdpdGggMl5n YW1tYSB3aGljaCBjYW4gYmUgY29tcHV0ZWQgb25jZSwgYW5kIHNhdmUgdGhlIHJlc3VsdCBzbyB3 ZQorICogcmVjdXJzaXZlbHkgY29tcHV0ZSBhbGwgdGhlIHZhbHVlcy4KKyAqLworc3RhdGljIHN0 cnVjdCBmaXhlZDMxXzMyIHBvd19idWZmZXJbTlVNX1BUU19JTl9SRUdJT05dOworc3RhdGljIHN0 cnVjdCBmaXhlZDMxXzMyIGdhbW1hX29mXzI7IC8vIDJeZ2FtbWEKK2ludCBwb3dfYnVmZmVyX3B0 ciA9IC0xOworCitzdGF0aWMgY29uc3QgaW50MzJfdCBnYW1tYV9udW1lcmF0b3IwMVtdID0geyAz MTMwOCwJMTgwMDAwLAkwfTsKK3N0YXRpYyBjb25zdCBpbnQzMl90IGdhbW1hX251bWVyYXRvcjAy W10gPSB7IDEyOTIwLAk0NTAwLAkwfTsKK3N0YXRpYyBjb25zdCBpbnQzMl90IGdhbW1hX251bWVy YXRvcjAzW10gPSB7IDU1LAk5OSwJMH07CitzdGF0aWMgY29uc3QgaW50MzJfdCBnYW1tYV9udW1l cmF0b3IwNFtdID0geyA1NSwJOTksCTB9Oworc3RhdGljIGNvbnN0IGludDMyX3QgZ2FtbWFfbnVt ZXJhdG9yMDVbXSA9IHsgMjQwMCwJMjIwMCwgMjIwMH07CisKIHN0YXRpYyBib29sIHBxX2luaXRp YWxpemVkOyAvKiA9IGZhbHNlOyAqLwogc3RhdGljIGJvb2wgZGVfcHFfaW5pdGlhbGl6ZWQ7IC8q ID0gZmFsc2U7ICovCiAKQEAgLTI0OCwxMSArMjc1LDcgQEAgZW51bSBnYW1tYV90eXBlX2luZGV4 IHsKIAogc3RhdGljIHZvaWQgYnVpbGRfY29lZmZpY2llbnRzKHN0cnVjdCBnYW1tYV9jb2VmZmlj aWVudHMgKmNvZWZmaWNpZW50cywgZW51bSBnYW1tYV90eXBlX2luZGV4IHR5cGUpCiB7Ci0Jc3Rh dGljIGNvbnN0IGludDMyX3QgbnVtZXJhdG9yMDFbXSA9IHsgMzEzMDgsCTE4MDAwMCwJMH07Ci0J c3RhdGljIGNvbnN0IGludDMyX3QgbnVtZXJhdG9yMDJbXSA9IHsgMTI5MjAsCTQ1MDAsCTB9Owot CXN0YXRpYyBjb25zdCBpbnQzMl90IG51bWVyYXRvcjAzW10gPSB7IDU1LAkJOTksCQkwfTsKLQlz dGF0aWMgY29uc3QgaW50MzJfdCBudW1lcmF0b3IwNFtdID0geyA1NSwJCTk5LAkJMH07Ci0Jc3Rh dGljIGNvbnN0IGludDMyX3QgbnVtZXJhdG9yMDVbXSA9IHsgMjQwMCwJMjIwMCwgMjIwMH07CisK IAogCXVpbnQzMl90IGkgPSAwOwogCXVpbnQzMl90IGluZGV4ID0gMDsKQEAgLTI2NCw2OSArMjg3 LDc0IEBAIHN0YXRpYyB2b2lkIGJ1aWxkX2NvZWZmaWNpZW50cyhzdHJ1Y3QgZ2FtbWFfY29lZmZp Y2llbnRzICpjb2VmZmljaWVudHMsIGVudW0gZ2FtCiAKIAlkbyB7CiAJCWNvZWZmaWNpZW50cy0+ YTBbaV0gPSBkY19maXhwdF9mcm9tX2ZyYWN0aW9uKAotCQkJbnVtZXJhdG9yMDFbaW5kZXhdLCAx MDAwMDAwMCk7CisJCQlnYW1tYV9udW1lcmF0b3IwMVtpbmRleF0sIDEwMDAwMDAwKTsKIAkJY29l ZmZpY2llbnRzLT5hMVtpXSA9IGRjX2ZpeHB0X2Zyb21fZnJhY3Rpb24oCi0JCQludW1lcmF0b3Iw MltpbmRleF0sIDEwMDApOworCQkJZ2FtbWFfbnVtZXJhdG9yMDJbaW5kZXhdLCAxMDAwKTsKIAkJ Y29lZmZpY2llbnRzLT5hMltpXSA9IGRjX2ZpeHB0X2Zyb21fZnJhY3Rpb24oCi0JCQludW1lcmF0 b3IwM1tpbmRleF0sIDEwMDApOworCQkJZ2FtbWFfbnVtZXJhdG9yMDNbaW5kZXhdLCAxMDAwKTsK IAkJY29lZmZpY2llbnRzLT5hM1tpXSA9IGRjX2ZpeHB0X2Zyb21fZnJhY3Rpb24oCi0JCQludW1l cmF0b3IwNFtpbmRleF0sIDEwMDApOworCQkJZ2FtbWFfbnVtZXJhdG9yMDRbaW5kZXhdLCAxMDAw KTsKIAkJY29lZmZpY2llbnRzLT51c2VyX2dhbW1hW2ldID0gZGNfZml4cHRfZnJvbV9mcmFjdGlv bigKLQkJCW51bWVyYXRvcjA1W2luZGV4XSwgMTAwMCk7CisJCQlnYW1tYV9udW1lcmF0b3IwNVtp bmRleF0sIDEwMDApOwogCiAJCSsraTsKIAl9IHdoaWxlIChpICE9IEFSUkFZX1NJWkUoY29lZmZp Y2llbnRzLT5hMCkpOwogfQogCiBzdGF0aWMgc3RydWN0IGZpeGVkMzFfMzIgdHJhbnNsYXRlX2Zy b21fbGluZWFyX3NwYWNlKAotCXN0cnVjdCBmaXhlZDMxXzMyIGFyZywKLQlzdHJ1Y3QgZml4ZWQz MV8zMiBhMCwKLQlzdHJ1Y3QgZml4ZWQzMV8zMiBhMSwKLQlzdHJ1Y3QgZml4ZWQzMV8zMiBhMiwK LQlzdHJ1Y3QgZml4ZWQzMV8zMiBhMywKLQlzdHJ1Y3QgZml4ZWQzMV8zMiBnYW1tYSkKKwkJc3Ry dWN0IHRyYW5zbGF0ZV9mcm9tX2xpbmVhcl9zcGFjZV9hcmdzICphcmdzKQogewogCWNvbnN0IHN0 cnVjdCBmaXhlZDMxXzMyIG9uZSA9IGRjX2ZpeHB0X2Zyb21faW50KDEpOwogCi0JaWYgKGRjX2Zp eHB0X2x0KG9uZSwgYXJnKSkKKwlpZiAoZGNfZml4cHRfbGUob25lLCBhcmdzLT5hcmcpKQogCQly ZXR1cm4gb25lOwogCi0JaWYgKGRjX2ZpeHB0X2xlKGFyZywgZGNfZml4cHRfbmVnKGEwKSkpCi0J CXJldHVybiBkY19maXhwdF9zdWIoCi0JCQlhMiwKLQkJCWRjX2ZpeHB0X211bCgKLQkJCQlkY19m aXhwdF9hZGQoCi0JCQkJCW9uZSwKLQkJCQkJYTMpLAotCQkJCWRjX2ZpeHB0X3BvdygKLQkJCQkJ ZGNfZml4cHRfbmVnKGFyZyksCi0JCQkJCWRjX2ZpeHB0X3JlY2lwKGdhbW1hKSkpKTsKLQllbHNl IGlmIChkY19maXhwdF9sZShhMCwgYXJnKSkKLQkJcmV0dXJuIGRjX2ZpeHB0X3N1YigKLQkJCWRj X2ZpeHB0X211bCgKLQkJCQlkY19maXhwdF9hZGQoCi0JCQkJCW9uZSwKLQkJCQkJYTMpLAotCQkJ CWRjX2ZpeHB0X3BvdygKLQkJCQkJYXJnLAotCQkJCQlkY19maXhwdF9yZWNpcChnYW1tYSkpKSwK LQkJCWEyKTsKKwlpZiAoZGNfZml4cHRfbGUoYXJncy0+YXJnLCBkY19maXhwdF9uZWcoYXJncy0+ YTApKSkgeworCQlzY3JhdGNoXzEgPSBkY19maXhwdF9hZGQob25lLCBhcmdzLT5hMyk7CisJCXNj cmF0Y2hfMiA9IGRjX2ZpeHB0X3BvdygKKwkJCQlkY19maXhwdF9uZWcoYXJncy0+YXJnKSwKKwkJ CQlkY19maXhwdF9yZWNpcChhcmdzLT5nYW1tYSkpOworCQlzY3JhdGNoXzEgPSBkY19maXhwdF9t dWwoc2NyYXRjaF8xLCBzY3JhdGNoXzIpOworCQlzY3JhdGNoXzEgPSBkY19maXhwdF9zdWIoYXJn cy0+YTIsIHNjcmF0Y2hfMSk7CisKKwkJcmV0dXJuIHNjcmF0Y2hfMTsKKwl9IGVsc2UgaWYgKGRj X2ZpeHB0X2xlKGFyZ3MtPmEwLCBhcmdzLT5hcmcpKSB7CisJCWlmIChwb3dfYnVmZmVyX3B0ciA9 PSAwKSB7CisJCQlnYW1tYV9vZl8yID0gZGNfZml4cHRfcG93KGRjX2ZpeHB0X2Zyb21faW50KDIp LAorCQkJCQlkY19maXhwdF9yZWNpcChhcmdzLT5nYW1tYSkpOworCQl9CisJCXNjcmF0Y2hfMSA9 IGRjX2ZpeHB0X2FkZChvbmUsIGFyZ3MtPmEzKTsKKwkJaWYgKHBvd19idWZmZXJfcHRyIDwgMTYp CisJCQlzY3JhdGNoXzIgPSBkY19maXhwdF9wb3coYXJncy0+YXJnLAorCQkJCQlkY19maXhwdF9y ZWNpcChhcmdzLT5nYW1tYSkpOworCQllbHNlCisJCQlzY3JhdGNoXzIgPSBkY19maXhwdF9tdWwo Z2FtbWFfb2ZfMiwKKwkJCQkJcG93X2J1ZmZlcltwb3dfYnVmZmVyX3B0ciUxNl0pOworCisJCXBv d19idWZmZXJbcG93X2J1ZmZlcl9wdHIlMTZdID0gc2NyYXRjaF8yOworCQlwb3dfYnVmZmVyX3B0 cisrOworCisJCXNjcmF0Y2hfMSA9IGRjX2ZpeHB0X211bChzY3JhdGNoXzEsIHNjcmF0Y2hfMik7 CisJCXNjcmF0Y2hfMSA9IGRjX2ZpeHB0X3N1YihzY3JhdGNoXzEsIGFyZ3MtPmEyKTsKKworCQly ZXR1cm4gc2NyYXRjaF8xOworCX0KIAllbHNlCi0JCXJldHVybiBkY19maXhwdF9tdWwoCi0JCQlh cmcsCi0JCQlhMSk7CisJCXJldHVybiBkY19maXhwdF9tdWwoYXJncy0+YXJnLCBhcmdzLT5hMSk7 CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgZml4ZWQzMV8zMiBjYWxjdWxhdGVfZ2FtbWEyMihzdHJ1Y3Qg Zml4ZWQzMV8zMiBhcmcpCiB7CiAJc3RydWN0IGZpeGVkMzFfMzIgZ2FtbWEgPSBkY19maXhwdF9m cm9tX2ZyYWN0aW9uKDIyLCAxMCk7CiAKLQlyZXR1cm4gdHJhbnNsYXRlX2Zyb21fbGluZWFyX3Nw YWNlKGFyZywKLQkJCWRjX2ZpeHB0X3plcm8sCi0JCQlkY19maXhwdF96ZXJvLAotCQkJZGNfZml4 cHRfemVybywKLQkJCWRjX2ZpeHB0X3plcm8sCi0JCQlnYW1tYSk7CisJc2NyYXRjaF9nYW1tYV9h cmdzLmFyZyA9IGFyZzsKKwlzY3JhdGNoX2dhbW1hX2FyZ3MuYTAgPSBkY19maXhwdF96ZXJvOwor CXNjcmF0Y2hfZ2FtbWFfYXJncy5hMSA9IGRjX2ZpeHB0X3plcm87CisJc2NyYXRjaF9nYW1tYV9h cmdzLmEyID0gZGNfZml4cHRfemVybzsKKwlzY3JhdGNoX2dhbW1hX2FyZ3MuYTMgPSBkY19maXhw dF96ZXJvOworCXNjcmF0Y2hfZ2FtbWFfYXJncy5nYW1tYSA9IGdhbW1hOworCisJcmV0dXJuIHRy YW5zbGF0ZV9mcm9tX2xpbmVhcl9zcGFjZSgmc2NyYXRjaF9nYW1tYV9hcmdzKTsKIH0KIAogc3Rh dGljIHN0cnVjdCBmaXhlZDMxXzMyIHRyYW5zbGF0ZV90b19saW5lYXJfc3BhY2UoCkBAIC0zNjIs MTggKzM5MCwxOSBAQCBzdGF0aWMgc3RydWN0IGZpeGVkMzFfMzIgdHJhbnNsYXRlX3RvX2xpbmVh cl9zcGFjZSgKIAlyZXR1cm4gbGluZWFyOwogfQogCi1zdGF0aWMgaW5saW5lIHN0cnVjdCBmaXhl ZDMxXzMyIHRyYW5zbGF0ZV9mcm9tX2xpbmVhcl9zcGFjZV9leCgKK3N0YXRpYyBzdHJ1Y3QgZml4 ZWQzMV8zMiB0cmFuc2xhdGVfZnJvbV9saW5lYXJfc3BhY2VfZXgoCiAJc3RydWN0IGZpeGVkMzFf MzIgYXJnLAogCXN0cnVjdCBnYW1tYV9jb2VmZmljaWVudHMgKmNvZWZmLAogCXVpbnQzMl90IGNv bG9yX2luZGV4KQogewotCXJldHVybiB0cmFuc2xhdGVfZnJvbV9saW5lYXJfc3BhY2UoCi0JCWFy ZywKLQkJY29lZmYtPmEwW2NvbG9yX2luZGV4XSwKLQkJY29lZmYtPmExW2NvbG9yX2luZGV4XSwK LQkJY29lZmYtPmEyW2NvbG9yX2luZGV4XSwKLQkJY29lZmYtPmEzW2NvbG9yX2luZGV4XSwKLQkJ Y29lZmYtPnVzZXJfZ2FtbWFbY29sb3JfaW5kZXhdKTsKKwlzY3JhdGNoX2dhbW1hX2FyZ3MuYXJn ID0gYXJnOworCXNjcmF0Y2hfZ2FtbWFfYXJncy5hMCA9IGNvZWZmLT5hMFtjb2xvcl9pbmRleF07 CisJc2NyYXRjaF9nYW1tYV9hcmdzLmExID0gY29lZmYtPmExW2NvbG9yX2luZGV4XTsKKwlzY3Jh dGNoX2dhbW1hX2FyZ3MuYTIgPSBjb2VmZi0+YTJbY29sb3JfaW5kZXhdOworCXNjcmF0Y2hfZ2Ft bWFfYXJncy5hMyA9IGNvZWZmLT5hM1tjb2xvcl9pbmRleF07CisJc2NyYXRjaF9nYW1tYV9hcmdz LmdhbW1hID0gY29lZmYtPnVzZXJfZ2FtbWFbY29sb3JfaW5kZXhdOworCisJcmV0dXJuIHRyYW5z bGF0ZV9mcm9tX2xpbmVhcl9zcGFjZSgmc2NyYXRjaF9nYW1tYV9hcmdzKTsKIH0KIAogCkBAIC03 MTIsMjQgKzc0MSwzMiBAQCBzdGF0aWMgdm9pZCBidWlsZF9yZWdhbW1hKHN0cnVjdCBwd2xfZmxv YXRfZGF0YV9leCAqcmdiX3JlZ2FtbWEsCiB7CiAJdWludDMyX3QgaTsKIAotCXN0cnVjdCBnYW1t YV9jb2VmZmljaWVudHMgY29lZmY7CisJc3RydWN0IGdhbW1hX2NvZWZmaWNpZW50cyAqY29lZmY7 CiAJc3RydWN0IHB3bF9mbG9hdF9kYXRhX2V4ICpyZ2IgPSByZ2JfcmVnYW1tYTsKIAljb25zdCBz dHJ1Y3QgaHdfeF9wb2ludCAqY29vcmRfeCA9IGNvb3JkaW5hdGVfeDsKIAotCWJ1aWxkX2NvZWZm aWNpZW50cygmY29lZmYsIHR5cGUpOworCWNvZWZmID0ga3Z6YWxsb2Moc2l6ZW9mKCpjb2VmZiks IEdGUF9LRVJORUwpOworCWlmICghY29lZmYpCisJCXJldHVybjsKIAotCWkgPSAwOworCWJ1aWxk X2NvZWZmaWNpZW50cyhjb2VmZiwgdHlwZSk7CiAKLQl3aGlsZSAoaSAhPSBod19wb2ludHNfbnVt ICsgMSkgeworCW1lbXNldChwb3dfYnVmZmVyLCAwLCBOVU1fUFRTX0lOX1JFR0lPTiAqIHNpemVv ZihzdHJ1Y3QgZml4ZWQzMV8zMikpOworCXBvd19idWZmZXJfcHRyID0gMDsgLy8gc2VlIHZhcmlh YmxlIGRlZmluaXRpb24gZm9yIG1vcmUgaW5mbworCWkgPSAwOworCXdoaWxlIChpIDw9IGh3X3Bv aW50c19udW0pIHsKIAkJLypUT0RPIHVzZSB5IHZzIHIsZyxiKi8KIAkJcmdiLT5yID0gdHJhbnNs YXRlX2Zyb21fbGluZWFyX3NwYWNlX2V4KAotCQkJY29vcmRfeC0+eCwgJmNvZWZmLCAwKTsKKwkJ CWNvb3JkX3gtPngsIGNvZWZmLCAwKTsKIAkJcmdiLT5nID0gcmdiLT5yOwogCQlyZ2ItPmIgPSBy Z2ItPnI7CiAJCSsrY29vcmRfeDsKIAkJKytyZ2I7CiAJCSsraTsKIAl9CisJcG93X2J1ZmZlcl9w dHIgPSAtMTsgLy8gcmVzZXQgYmFjayB0byBubyBvcHRpbWl6ZQorCisJa2ZyZWUoY29lZmYpOwog fQogCiBzdGF0aWMgdm9pZCBoZXJtaXRlX3NwbGluZV9lZXRmKHN0cnVjdCBmaXhlZDMxXzMyIGlu cHV0X3gsCkBAIC04NTksNiArODk2LDggQEAgc3RhdGljIGJvb2wgYnVpbGRfZnJlZXN5bmNfaGRy KHN0cnVjdCBwd2xfZmxvYXRfZGF0YV9leCAqcmdiX3JlZ2FtbWEsCiAJZWxzZQogCQltYXhfY29u dGVudCA9IG1heF9kaXNwbGF5OwogCisJaWYgKCF1c2VfZWV0ZikKKwkJcG93X2J1ZmZlcl9wdHIg PSAwOyAvLyBzZWUgdmFyIGRlZmluaXRpb24gZm9yIG1vcmUgaW5mbwogCXJnYiArPSAzMjsgLy8g Zmlyc3QgMzIgcG9pbnRzIGhhdmUgcHJvYmxlbXMgd2l0aCBmaXhlZCBwb2ludCwgdG9vIHNtYWxs CiAJY29vcmRfeCArPSAzMjsKIAlmb3IgKGkgPSAzMjsgaSA8PSBod19wb2ludHNfbnVtOyBpKysp IHsKQEAgLTg5Nyw2ICs5MzYsNyBAQCBzdGF0aWMgYm9vbCBidWlsZF9mcmVlc3luY19oZHIoc3Ry dWN0IHB3bF9mbG9hdF9kYXRhX2V4ICpyZ2JfcmVnYW1tYSwKIAkJKytjb29yZF94OwogCQkrK3Jn YjsKIAl9CisJcG93X2J1ZmZlcl9wdHIgPSAtMTsKIAogCXJldHVybiB0cnVlOwogfQpAQCAtMTU2 OSwxNCArMTYwOSwxNSBAQCBib29sIG1vZF9jb2xvcl9jYWxjdWxhdGVfcmVnYW1tYV9wYXJhbXMo c3RydWN0IGRjX3RyYW5zZmVyX2Z1bmMgKm91dHB1dF90ZiwKIAkJCW91dHB1dF90Zi0+dGYgPT0g VFJBTlNGRVJfRlVOQ1RJT05fU1JHQikgewogCQlpZiAocmFtcCA9PSBOVUxMKQogCQkJcmV0dXJu IHRydWU7Ci0JCWlmICgocmFtcC0+aXNfbG9naWNhbF9pZGVudGl0eSkgfHwKKwkJaWYgKChyYW1w LT5pc19pZGVudGl0eSAmJiByYW1wLT50eXBlICE9IEdBTU1BX0NTX1RGTV8xRCkgfHwKIAkJCQko IW1hcFVzZXJSYW1wICYmIHJhbXAtPnR5cGUgPT0gR0FNTUFfUkdCXzI1NikpCiAJCQlyZXR1cm4g dHJ1ZTsKIAl9CiAKIAlvdXRwdXRfdGYtPnR5cGUgPSBURl9UWVBFX0RJU1RSSUJVVEVEX1BPSU5U UzsKIAotCWlmIChyYW1wICYmIChtYXBVc2VyUmFtcCB8fCByYW1wLT50eXBlICE9IEdBTU1BX1JH Ql8yNTYpKSB7CisJaWYgKHJhbXAgJiYgcmFtcC0+dHlwZSAhPSBHQU1NQV9DU19URk1fMUQgJiYK KwkJCShtYXBVc2VyUmFtcCB8fCByYW1wLT50eXBlICE9IEdBTU1BX1JHQl8yNTYpKSB7CiAJCXJn Yl91c2VyID0ga3ZjYWxsb2MocmFtcC0+bnVtX2VudHJpZXMgKyBfRVhUUkFfUE9JTlRTLAogCQkJ ICAgIHNpemVvZigqcmdiX3VzZXIpLAogCQkJICAgIEdGUF9LRVJORUwpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L21vZHVsZXMvY29sb3IvY29sb3JfZ2FtbWEuaCBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2NvbG9yL2NvbG9yX2dhbW1hLmgK aW5kZXggMzY5OTUzZmFmYWRmLi42OWNlY2QyZWMyNTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9tb2R1bGVzL2NvbG9yL2NvbG9yX2dhbW1hLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L21vZHVsZXMvY29sb3IvY29sb3JfZ2FtbWEuaApAQCAtODIs NiArODIsMTUgQEAgc3RydWN0IGZyZWVzeW5jX2hkcl90Zl9wYXJhbXMgewogCXVuc2lnbmVkIGlu dCBza2lwX3RtOyAvLyBza2lwIHRtCiB9OwogCitzdHJ1Y3QgdHJhbnNsYXRlX2Zyb21fbGluZWFy X3NwYWNlX2FyZ3MgeworCXN0cnVjdCBmaXhlZDMxXzMyIGFyZzsKKwlzdHJ1Y3QgZml4ZWQzMV8z MiBhMDsKKwlzdHJ1Y3QgZml4ZWQzMV8zMiBhMTsKKwlzdHJ1Y3QgZml4ZWQzMV8zMiBhMjsKKwlz dHJ1Y3QgZml4ZWQzMV8zMiBhMzsKKwlzdHJ1Y3QgZml4ZWQzMV8zMiBnYW1tYTsKK307CisKIHZv aWQgc2V0dXBfeF9wb2ludHNfZGlzdHJpYnV0aW9uKHZvaWQpOwogdm9pZCBwcmVjb21wdXRlX3Bx KHZvaWQpOwogdm9pZCBwcmVjb21wdXRlX2RlX3BxKHZvaWQpOwotLSAKMi4yMi4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcg bGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=