From: Harry Wentland Subject: [PATCH 009/103] drm/amd/display: update mpc add/remove functions Date: Tue, 10 Oct 2017 18:39:38 -0400 Message-ID: <20171010224112.3023-10-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: Eric Bernstein RnJvbTogRXJpYyBCZXJuc3RlaW4gPGVyaWMuYmVybnN0ZWluQGFtZC5jb20+CgpTaWduZWQtb2Zm LWJ5OiBFcmljIEJlcm5zdGVpbiA8ZXJpYy5iZXJuc3RlaW5AYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IERteXRybyBMYWt0eXVzaGtpbiA8RG15dHJvLkxha3R5dXNoa2luQGFtZC5jb20+CkFja2VkLWJ5 OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jICB8ICAxNyArLQogZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX21wYy5jICAgfCAxNzMgKysrKysr KysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L21w Yy5oICAgICAgICB8ICAxMCArLQogMyBmaWxlcyBjaGFuZ2VkLCAxMzAgaW5zZXJ0aW9ucygrKSwg NzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCmluZGV4IGU2MGJlMDBhYmNmMi4uODJh OTg1YTk4MWJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNu MTAvZGNuMTBfaHdfc2VxdWVuY2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCkBAIC04ODEsNyArODgxLDggQEAgc3RhdGlj IHZvaWQgZGNuMTBfaW5pdF9odyhzdHJ1Y3QgZGMgKmRjKQogCiAJCXhmbS0+ZnVuY3MtPnRyYW5z Zm9ybV9yZXNldCh4Zm0pOwogCQlkYy0+cmVzX3Bvb2wtPm1wYy0+ZnVuY3MtPnJlbW92ZSgKLQkJ CQlkYy0+cmVzX3Bvb2wtPm1wYywgZGMtPnJlc19wb29sLT5vcHBzW2ldLCBpKTsKKwkJCQlkYy0+ cmVzX3Bvb2wtPm1wYywgJihkYy0+cmVzX3Bvb2wtPm9wcHNbaV0tPm1wY190cmVlKSwKKwkJCQlk Yy0+cmVzX3Bvb2wtPm9wcHNbaV0tPmluc3QsIGkpOwogCiAJCS8qIEJsYW5rIGNvbnRyb2xsZXIg dXNpbmcgZHJpdmVyIGNvZGUgaW5zdGVhZCBvZgogCQkgKiBjb21tYW5kIHRhYmxlLgpAQCAtMTA3 OSw3ICsxMDgwLDggQEAgc3RhdGljIHZvaWQgcGxhbmVfYXRvbWljX2Rpc2Nvbm5lY3Qoc3RydWN0 IGRjICpkYywKIAlpZiAoZGMtPmRlYnVnLnNhbml0eV9jaGVja3MpCiAJCXZlcmlmeV9hbGxvd19w c3RhdGVfY2hhbmdlX2hpZ2goZGMtPmh3c2VxKTsKIAotCW1wYy0+ZnVuY3MtPnJlbW92ZShtcGMs IGRjLT5yZXNfcG9vbC0+b3Bwc1tvcHBfaWRdLCBmZV9pZHgpOworCW1wYy0+ZnVuY3MtPnJlbW92 ZShtcGMsICYoZGMtPnJlc19wb29sLT5vcHBzW29wcF9pZF0tPm1wY190cmVlKSwKKwkJCWRjLT5y ZXNfcG9vbC0+b3Bwc1tvcHBfaWRdLT5pbnN0LCBmZV9pZHgpOwogfQogCiAvKiBkaXNhYmxlIEhX IHVzZWQgYnkgcGxhbmUuCkBAIC0yMjk5LDggKzIzMDEsOSBAQCBzdGF0aWMgdm9pZCB1cGRhdGVf ZGNodWJwX2RwcCgKIAkJCXBsYW5lX3N0YXRlLT5mb3JtYXQsCiAJCQlFWFBBTlNJT05fTU9ERV9a RVJPKTsKIAotCW1wY2NfY2ZnLm1pID0gbWk7Ci0JbXBjY19jZmcub3BwID0gcGlwZV9jdHgtPnN0 cmVhbV9yZXMub3BwOworCW1wY2NfY2ZnLmRwcF9pZCA9IG1pLT5pbnN0OworCW1wY2NfY2ZnLm9w cF9pZCA9IHBpcGVfY3R4LT5zdHJlYW1fcmVzLm9wcC0+aW5zdDsKKwltcGNjX2NmZy50cmVlX2Nm ZyA9ICYocGlwZV9jdHgtPnN0cmVhbV9yZXMub3BwLT5tcGNfdHJlZSk7CiAJZm9yICh0b3BfcGlw ZSA9IHBpcGVfY3R4LT50b3BfcGlwZTsgdG9wX3BpcGU7IHRvcF9waXBlID0gdG9wX3BpcGUtPnRv cF9waXBlKQogCQltcGNjX2NmZy56X2luZGV4Kys7CiAJaWYgKGRjLT5kZWJ1Zy5zdXJmYWNlX3Zp c3VhbF9jb25maXJtKQpAQCAtMjMxNyw3ICsyMzIwLDggQEAgc3RhdGljIHZvaWQgdXBkYXRlX2Rj aHVicF9kcHAoCiAJbXBjY19jZmcucHJlX211bHRpcGxpZWRfYWxwaGEgPSBpc19yZ2JfY3NwYWNl KAogCQkJcGlwZV9jdHgtPnN0cmVhbS0+b3V0cHV0X2NvbG9yX3NwYWNlKQogCQkJCQkmJiBwZXJf cGl4ZWxfYWxwaGE7Ci0JZGMtPnJlc19wb29sLT5tcGMtPmZ1bmNzLT5hZGQoZGMtPnJlc19wb29s LT5tcGMsICZtcGNjX2NmZyk7CisJbWktPm1wY2NfaWQgPSBkYy0+cmVzX3Bvb2wtPm1wYy0+ZnVu Y3MtPmFkZChkYy0+cmVzX3Bvb2wtPm1wYywgJm1wY2NfY2ZnKTsKKwltaS0+b3BwX2lkID0gbXBj Y19jZmcub3BwX2lkOwogCiAJcGlwZV9jdHgtPnBsYW5lX3Jlcy5zY2xfZGF0YS5sYl9wYXJhbXMu YWxwaGFfZW4gPSBwZXJfcGl4ZWxfYWxwaGE7CiAJcGlwZV9jdHgtPnBsYW5lX3Jlcy5zY2xfZGF0 YS5sYl9wYXJhbXMuZGVwdGggPSBMQl9QSVhFTF9ERVBUSF8zMEJQUDsKQEAgLTI1MjgsNyArMjUz Miw4IEBAIHN0YXRpYyB2b2lkIGRjbjEwX2FwcGx5X2N0eF9mb3Jfc3VyZmFjZSgKIAkJCS8qIHJl c2V0IG1wYyAqLwogCQkJZGMtPnJlc19wb29sLT5tcGMtPmZ1bmNzLT5yZW1vdmUoCiAJCQkJCWRj LT5yZXNfcG9vbC0+bXBjLAotCQkJCQlvbGRfcGlwZV9jdHgtPnN0cmVhbV9yZXMub3BwLAorCQkJ CQkmKG9sZF9waXBlX2N0eC0+c3RyZWFtX3Jlcy5vcHAtPm1wY190cmVlKSwKKwkJCQkJb2xkX3Bp cGVfY3R4LT5zdHJlYW1fcmVzLm9wcC0+aW5zdCwKIAkJCQkJb2xkX3BpcGVfY3R4LT5waXBlX2lk eCk7CiAJCQlvbGRfcGlwZV9jdHgtPnN0cmVhbV9yZXMub3BwLT5tcGNjX2Rpc2Nvbm5lY3RfcGVu ZGluZ1tvbGRfcGlwZV9jdHgtPnBsYW5lX3Jlcy5taS0+bXBjY19pZF0gPSB0cnVlOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbXBjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbXBjLmMKaW5kZXgg MDgyYjM5YTY1ZTZhLi44ZTc2N2M4NDM1OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9tcGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbXBjLmMKQEAgLTExOCwxNyArMTE4LDE5IEBAIHN0YXRp YyB2b2lkIG1wYzEwX2Fzc2VydF9tcGNjX2lkbGVfYmVmb3JlX2Nvbm5lY3Qoc3RydWN0IGRjbjEw X21wYyAqbXBjMTAsIGludCBpCiAKIHN0YXRpYyB2b2lkIG1wYzEwX21wY2NfcmVtb3ZlKAogCQlz dHJ1Y3QgbXBjICptcGMsCi0JCXN0cnVjdCBvdXRwdXRfcGl4ZWxfcHJvY2Vzc29yICpvcHAsCisJ CXN0cnVjdCBtcGNfdHJlZV9jZmcgKnRyZWVfY2ZnLAorCQlpbnQgb3BwX2lkLAogCQlpbnQgZHBw X2lkKQogewogCXN0cnVjdCBkY24xMF9tcGMgKm1wYzEwID0gVE9fRENOMTBfTVBDKG1wYyk7CiAJ aW50IG1wY2NfaWQsIHpfaWR4OwogCi0JZm9yICh6X2lkeCA9IDA7IHpfaWR4IDwgb3BwLT5tcGNf dHJlZS5udW1fcGlwZXM7IHpfaWR4KyspCi0JCWlmIChvcHAtPm1wY190cmVlLmRwcFt6X2lkeF0g PT0gZHBwX2lkKQorCS8qIGZpbmQgel9pZHggZm9yIHRoZSBkcHAgdG8gYmUgcmVtb3ZlZCAqLwor CWZvciAoel9pZHggPSAwOyB6X2lkeCA8IHRyZWVfY2ZnLT5udW1fcGlwZXM7IHpfaWR4KyspCisJ CWlmICh0cmVlX2NmZy0+ZHBwW3pfaWR4XSA9PSBkcHBfaWQpCiAJCQlicmVhazsKIAotCWlmICh6 X2lkeCA9PSBvcHAtPm1wY190cmVlLm51bV9waXBlcykgeworCWlmICh6X2lkeCA9PSB0cmVlX2Nm Zy0+bnVtX3BpcGVzKSB7CiAJCS8qIEluIGNhc2Ugb2YgcmVzdW1lIGZyb20gUzMvUzQsIHJlbW92 ZSBtcGNjIGZyb20gYmlvcyBsZWZ0IG92ZXIgKi8KIAkJUkVHX1NFVChNUENDX09QUF9JRFtkcHBf aWRdLCAwLAogCQkJCU1QQ0NfT1BQX0lELCAweGYpOwpAQCAtMTM5LDcgKzE0MSw3IEBAIHN0YXRp YyB2b2lkIG1wYzEwX21wY2NfcmVtb3ZlKAogCQlyZXR1cm47CiAJfQogCi0JbXBjY19pZCA9IG9w cC0+bXBjX3RyZWUubXBjY1t6X2lkeF07CisJbXBjY19pZCA9IHRyZWVfY2ZnLT5tcGNjW3pfaWR4 XTsKIAogCVJFR19TRVQoTVBDQ19PUFBfSURbbXBjY19pZF0sIDAsCiAJCQlNUENDX09QUF9JRCwg MHhmKTsKQEAgLTE0OSw4MiArMTUxLDEwMSBAQCBzdGF0aWMgdm9pZCBtcGMxMF9tcGNjX3JlbW92 ZSgKIAkJCU1QQ0NfQk9UX1NFTCwgMHhmKTsKIAogCWlmICh6X2lkeCA+IDApIHsKLQkJaW50IHRv cF9tcGNjX2lkID0gb3BwLT5tcGNfdHJlZS5tcGNjW3pfaWR4IC0gMV07CisJCWludCB0b3BfbXBj Y19pZCA9IHRyZWVfY2ZnLT5tcGNjW3pfaWR4IC0gMV07CiAKLQkJaWYgKHpfaWR4ICsgMSA8IG9w cC0+bXBjX3RyZWUubnVtX3BpcGVzKQorCQlpZiAoel9pZHggKyAxIDwgdHJlZV9jZmctPm51bV9w aXBlcykKKwkJCS8qIG1wY2MgdG8gYmUgcmVtb3ZlZCBpcyBpbiB0aGUgbWlkZGxlIG9mIHRoZSB0 cmVlICovCiAJCQlSRUdfU0VUKE1QQ0NfQk9UX1NFTFt0b3BfbXBjY19pZF0sIDAsCi0JCQkJCU1Q Q0NfQk9UX1NFTCwgb3BwLT5tcGNfdHJlZS5tcGNjW3pfaWR4ICsgMV0pOworCQkJCQlNUENDX0JP VF9TRUwsIHRyZWVfY2ZnLT5tcGNjW3pfaWR4ICsgMV0pOwogCQllbHNlIHsKKwkJCS8qIG1wY2Mg dG8gYmUgcmVtb3ZlZCBpcyBhdCB0aGUgYm90dG9tIG9mIHRoZSB0cmVlICovCiAJCQlSRUdfU0VU KE1QQ0NfQk9UX1NFTFt0b3BfbXBjY19pZF0sIDAsCiAJCQkJCU1QQ0NfQk9UX1NFTCwgMHhmKTsK IAkJCVJFR19VUERBVEUoTVBDQ19DT05UUk9MW3RvcF9tcGNjX2lkXSwKIAkJCQkJTVBDQ19NT0RF LCBNT0RFX1RPUF9PTkxZKTsKIAkJfQotCX0gZWxzZSBpZiAob3BwLT5tcGNfdHJlZS5udW1fcGlw ZXMgPiAxKQotCQlSRUdfU0VUKE1VWFtvcHAtPmluc3RdLCAwLAotCQkJCU1QQ19PVVRfTVVYLCBv cHAtPm1wY190cmVlLm1wY2Nbel9pZHggKyAxXSk7CisJfSBlbHNlIGlmICh0cmVlX2NmZy0+bnVt X3BpcGVzID4gMSkKKwkJLyogbXBjYyB0byBiZSByZW1vdmVkIGlzIGF0IHRoZSB0b3Agb2YgdGhl IHRyZWUgKi8KKwkJUkVHX1NFVChNVVhbb3BwX2lkXSwgMCwKKwkJCQlNUENfT1VUX01VWCwgdHJl ZV9jZmctPm1wY2Nbel9pZHggKyAxXSk7CiAJZWxzZQotCQlSRUdfU0VUKE1VWFtvcHAtPmluc3Rd LCAwLCBNUENfT1VUX01VWCwgMHhmKTsKKwkJLyogbXBjYyB0byBiZSByZW1vdmVkIGlzIHRoZSBv bmx5IG9uZSBpbiB0aGUgdHJlZSAqLworCQlSRUdfU0VUKE1VWFtvcHBfaWRdLCAwLCBNUENfT1VU X01VWCwgMHhmKTsKIAorCS8qIG1hcmsgdGhpcyBtcGNjIGFzIG5vdCBpbiB1c2UgKi8KIAltcGMx MC0+bXBjY19pbl91c2VfbWFzayAmPSB+KDEgPDwgbXBjY19pZCk7Ci0Jb3BwLT5tcGNfdHJlZS5u dW1fcGlwZXMtLTsKLQlmb3IgKDsgel9pZHggPCBvcHAtPm1wY190cmVlLm51bV9waXBlczsgel9p ZHgrKykgewotCQlvcHAtPm1wY190cmVlLmRwcFt6X2lkeF0gPSBvcHAtPm1wY190cmVlLmRwcFt6 X2lkeCArIDFdOwotCQlvcHAtPm1wY190cmVlLm1wY2Nbel9pZHhdID0gb3BwLT5tcGNfdHJlZS5t cGNjW3pfaWR4ICsgMV07CisJdHJlZV9jZmctPm51bV9waXBlcy0tOworCWZvciAoOyB6X2lkeCA8 IHRyZWVfY2ZnLT5udW1fcGlwZXM7IHpfaWR4KyspIHsKKwkJdHJlZV9jZmctPmRwcFt6X2lkeF0g PSB0cmVlX2NmZy0+ZHBwW3pfaWR4ICsgMV07CisJCXRyZWVfY2ZnLT5tcGNjW3pfaWR4XSA9IHRy ZWVfY2ZnLT5tcGNjW3pfaWR4ICsgMV07CiAJfQotCW9wcC0+bXBjX3RyZWUuZHBwW29wcC0+bXBj X3RyZWUubnVtX3BpcGVzXSA9IDB4ZGVhZGJlZWY7Ci0Jb3BwLT5tcGNfdHJlZS5tcGNjW29wcC0+ bXBjX3RyZWUubnVtX3BpcGVzXSA9IDB4ZGVhZGJlZWY7CisJdHJlZV9jZmctPmRwcFt0cmVlX2Nm Zy0+bnVtX3BpcGVzXSA9IDB4ZGVhZGJlZWY7CisJdHJlZV9jZmctPm1wY2NbdHJlZV9jZmctPm51 bV9waXBlc10gPSAweGRlYWRiZWVmOwogfQogCi1zdGF0aWMgdm9pZCBtcGMxMF9tcGNjX2FkZChz dHJ1Y3QgbXBjICptcGMsIHN0cnVjdCBtcGNjX2NmZyAqY2ZnKQorc3RhdGljIHZvaWQgbXBjMTBf YWRkX3RvX3RyZWVfY2ZnKAorCXN0cnVjdCBtcGMgKm1wYywKKwlzdHJ1Y3QgbXBjY19jZmcgKmNm ZywKKwlpbnQgbXBjY19pZCkKIHsKIAlzdHJ1Y3QgZGNuMTBfbXBjICptcGMxMCA9IFRPX0RDTjEw X01QQyhtcGMpOworCWludCBtcGNjX21vZGUgPSBNT0RFX1RPUF9PTkxZOworCWludCBwb3NpdGlv biA9IGNmZy0+el9pbmRleDsKKwlzdHJ1Y3QgbXBjX3RyZWVfY2ZnICp0cmVlX2NmZyA9IGNmZy0+ dHJlZV9jZmc7CiAJaW50IGFscGhhX2JsbmRfbW9kZSA9IGNmZy0+cGVyX3BpeGVsX2FscGhhID8K IAkJCUJMTkRfUFBfQUxQSEEgOiBCTE5EX0dMT0JBTF9BTFBIQTsKLQlpbnQgbXBjY19tb2RlID0g TU9ERV9UT1BfT05MWTsKLQlpbnQgbXBjY19pZCwgel9pZHg7CisJaW50IHpfaWR4OwogCi0JQVNT RVJUKGNmZy0+el9pbmRleCA8IG1wYzEwLT5udW1fbXBjYyk7CisJUkVHX1NFVChNUENDX09QUF9J RFttcGNjX2lkXSwgMCwKKwkJCU1QQ0NfT1BQX0lELCBjZmctPm9wcF9pZCk7CiAKLQlmb3IgKHpf aWR4ID0gMDsgel9pZHggPCBjZmctPm9wcC0+bXBjX3RyZWUubnVtX3BpcGVzOyB6X2lkeCsrKQot CQlpZiAoY2ZnLT5vcHAtPm1wY190cmVlLmRwcFt6X2lkeF0gPT0gY2ZnLT5taS0+aW5zdCkKLQkJ CWJyZWFrOwotCWlmICh6X2lkeCA9PSBjZmctPm9wcC0+bXBjX3RyZWUubnVtX3BpcGVzKSB7Ci0J CUFTU0VSVChjZmctPnpfaW5kZXggPD0gY2ZnLT5vcHAtPm1wY190cmVlLm51bV9waXBlcyk7Ci0J CW1wY2NfaWQgPSBtcGMxMF9nZXRfaWRsZV9tcGNjX2lkKG1wYzEwKTsKLQkJLyp0b2RvOiByZW1v dmUgaGFjayovCi0JCW1wY2NfaWQgPSBjZmctPm1pLT5pbnN0OwotCQlBU1NFUlQoIShtcGMxMC0+ bXBjY19pbl91c2VfbWFzayAmIDEgPDwgbXBjY19pZCkpOworCVJFR19TRVQoTVBDQ19UT1BfU0VM W21wY2NfaWRdLCAwLAorCQkJTVBDQ19UT1BfU0VMLCBjZmctPmRwcF9pZCk7CiAKLQkJaWYgKG1w Yy0+Y3R4LT5kYy0+ZGVidWcuc2FuaXR5X2NoZWNrcykKLQkJCW1wYzEwX2Fzc2VydF9tcGNjX2lk bGVfYmVmb3JlX2Nvbm5lY3QobXBjMTAsIG1wY2NfaWQpOwotCX0gZWxzZSB7Ci0JCUFTU0VSVChj ZmctPnpfaW5kZXggPCBjZmctPm9wcC0+bXBjX3RyZWUubnVtX3BpcGVzKTsKLQkJbXBjY19pZCA9 IGNmZy0+b3BwLT5tcGNfdHJlZS5tcGNjW3pfaWR4XTsKLQkJbXBjMTBfbXBjY19yZW1vdmUobXBj LCBjZmctPm9wcCwgY2ZnLT5taS0+aW5zdCk7Ci0JfQorCWlmIChwb3NpdGlvbiA9PSAwKSB7CisJ CS8qIGlkbGUgZHBwL21wY2MgaXMgYWRkZWQgdG8gdGhlIHRvcCBsYXllciBvZiB0cmVlICovCiAK LQlSRUdfU0VUKE1QQ0NfT1BQX0lEW21wY2NfaWRdLCAwLAotCQkJTVBDQ19PUFBfSUQsIGNmZy0+ b3BwLT5pbnN0KTsKKwkJaWYgKHRyZWVfY2ZnLT5udW1fcGlwZXMgPiAwKSB7CisJCQkvKiBnZXQg aW5zdGFuY2Ugb2YgcHJldmlvdXMgdG9wIG1wY2MgKi8KKwkJCWludCBwcmV2X3RvcF9tcGNjX2lk ID0gdHJlZV9jZmctPm1wY2NbMF07CiAKLQlSRUdfU0VUKE1QQ0NfVE9QX1NFTFttcGNjX2lkXSwg MCwKLQkJCU1QQ0NfVE9QX1NFTCwgY2ZnLT5taS0+aW5zdCk7CisJCQlSRUdfU0VUKE1QQ0NfQk9U X1NFTFttcGNjX2lkXSwgMCwKKwkJCQkJTVBDQ19CT1RfU0VMLCBwcmV2X3RvcF9tcGNjX2lkKTsK KwkJCW1wY2NfbW9kZSA9IE1PREVfQkxFTkQ7CisJCX0KKworCQkvKiBvcHAgd2lsbCBnZXQgbmV3 IG91dHB1dC4gZnJvbSBuZXcgYWRkZWQgbXBjYyAqLworCQlSRUdfU0VUKE1VWFtjZmctPm9wcF9p ZF0sIDAsIE1QQ19PVVRfTVVYLCBtcGNjX2lkKTsKKworCX0gZWxzZSBpZiAocG9zaXRpb24gPT0g dHJlZV9jZmctPm51bV9waXBlcykgeworCQkvKiBpZGxlIGRwcC9tcGNjIGlzIGFkZGVkIHRvIHRo ZSBib3R0b20gbGF5ZXIgb2YgdHJlZSAqLwogCi0JaWYgKGNmZy0+el9pbmRleCA+IDApIHsKLQkJ aW50IHRvcF9tcGNjX2lkID0gY2ZnLT5vcHAtPm1wY190cmVlLm1wY2NbY2ZnLT56X2luZGV4IC0g MV07CisJCS8qIGdldCBpbnN0YW5jZSBvZiBwcmV2aW91cyBib3R0b20gbXBjYywgc2V0IHRvIG1p ZGRsZSBsYXllciAqLworCQlpbnQgcHJldl9ib3RfbXBjY19pZCA9IHRyZWVfY2ZnLT5tcGNjW3Ry ZWVfY2ZnLT5udW1fcGlwZXMgLSAxXTsKIAotCQlSRUdfU0VUKE1QQ0NfQk9UX1NFTFt0b3BfbXBj Y19pZF0sIDAsCisJCVJFR19TRVQoTVBDQ19CT1RfU0VMW3ByZXZfYm90X21wY2NfaWRdLCAwLAog CQkJCU1QQ0NfQk9UX1NFTCwgbXBjY19pZCk7Ci0JCVJFR19VUERBVEUoTVBDQ19DT05UUk9MW3Rv cF9tcGNjX2lkXSwKKwkJUkVHX1VQREFURShNUENDX0NPTlRST0xbcHJldl9ib3RfbXBjY19pZF0s CiAJCQkJTVBDQ19NT0RFLCBNT0RFX0JMRU5EKTsKLQl9IGVsc2UKLQkJUkVHX1NFVChNVVhbY2Zn LT5vcHAtPmluc3RdLCAwLCBNUENfT1VUX01VWCwgbXBjY19pZCk7CiAKLQlpZiAoY2ZnLT56X2lu ZGV4IDwgY2ZnLT5vcHAtPm1wY190cmVlLm51bV9waXBlcykgewotCQlpbnQgYm90X21wY2NfaWQg PSBjZmctPm9wcC0+bXBjX3RyZWUubXBjY1tjZmctPnpfaW5kZXhdOworCQkvKiBtcGNjX2lkIGJl Y29tZSBuZXcgYm90dG9tIG1wY2MqLworCQlSRUdfU0VUKE1QQ0NfQk9UX1NFTFttcGNjX2lkXSwg MCwKKwkJCQlNUENDX0JPVF9TRUwsIDB4Zik7CisKKwl9IGVsc2UgeworCQkvKiBpZGxlIGRwcC9t cGNjIGlzIGFkZGVkIHRvIG1pZGRsZSBvZiB0cmVlICovCisJCWludCBhYm92ZV9tcGNjX2lkID0g dHJlZV9jZmctPm1wY2NbcG9zaXRpb24gLSAxXTsKKwkJaW50IGJlbG93X21wY2NfaWQgPSB0cmVl X2NmZy0+bXBjY1twb3NpdGlvbl07CisKKwkJLyogbXBjYyBhYm92ZSBuZXcgbXBjY19pZCBoYXMg bmV3IGJvdHRvbSBtdXgqLworCQlSRUdfU0VUKE1QQ0NfQk9UX1NFTFthYm92ZV9tcGNjX2lkXSwg MCwKKwkJCQlNUENDX0JPVF9TRUwsIG1wY2NfaWQpOworCQlSRUdfVVBEQVRFKE1QQ0NfQ09OVFJP TFthYm92ZV9tcGNjX2lkXSwKKwkJCQlNUENDX01PREUsIE1PREVfQkxFTkQpOwogCisJCS8qIG1w Y2NfaWQgYm90dG9tIG11eCBpcyBmcm9tIGJlbG93IG1wY2MqLwogCQlSRUdfU0VUKE1QQ0NfQk9U X1NFTFttcGNjX2lkXSwgMCwKLQkJCQlNUENDX0JPVF9TRUwsIGJvdF9tcGNjX2lkKTsKKwkJCQlN UENDX0JPVF9TRUwsIGJlbG93X21wY2NfaWQpOwogCQltcGNjX21vZGUgPSBNT0RFX0JMRU5EOwog CX0KIApAQCAtMjM0LDE4ICsyNTUsNTAgQEAgc3RhdGljIHZvaWQgbXBjMTBfbXBjY19hZGQoc3Ry dWN0IG1wYyAqbXBjLCBzdHJ1Y3QgbXBjY19jZmcgKmNmZykKIAkJTVBDQ19BTFBIQV9NVUxUSVBM SUVEX01PREUsIGNmZy0+cHJlX211bHRpcGxpZWRfYWxwaGEsCiAJCU1QQ0NfQkxORF9BQ1RJVkVf T1ZFUkxBUF9PTkxZLCBmYWxzZSk7CiAKKwkvKiB1cGRhdGUgbXBjX3RyZWVfY2ZnIHdpdGggbmV3 IG1wY2MgKi8KKwlmb3IgKHpfaWR4ID0gdHJlZV9jZmctPm51bV9waXBlczsgel9pZHggPiBwb3Np dGlvbjsgel9pZHgtLSkgeworCQl0cmVlX2NmZy0+ZHBwW3pfaWR4XSA9IHRyZWVfY2ZnLT5kcHBb el9pZHggLSAxXTsKKwkJdHJlZV9jZmctPm1wY2Nbel9pZHhdID0gdHJlZV9jZmctPm1wY2Nbel9p ZHggLSAxXTsKKwl9CisJdHJlZV9jZmctPmRwcFtwb3NpdGlvbl0gPSBjZmctPmRwcF9pZDsKKwl0 cmVlX2NmZy0+bXBjY1twb3NpdGlvbl0gPSBtcGNjX2lkOworCXRyZWVfY2ZnLT5udW1fcGlwZXMr KzsKK30KKworc3RhdGljIGludCBtcGMxMF9tcGNjX2FkZChzdHJ1Y3QgbXBjICptcGMsIHN0cnVj dCBtcGNjX2NmZyAqY2ZnKQoreworCXN0cnVjdCBkY24xMF9tcGMgKm1wYzEwID0gVE9fRENOMTBf TVBDKG1wYyk7CisJaW50IG1wY2NfaWQsIHpfaWR4OworCisJQVNTRVJUKGNmZy0+el9pbmRleCA8 IG1wYzEwLT5udW1fbXBjYyk7CisKKwkvKiBjaGVjayBpbiBkcHAgYWxyZWFkeSBleGlzdHMgaW4g bXBjIHRyZWUgKi8KKwlmb3IgKHpfaWR4ID0gMDsgel9pZHggPCBjZmctPnRyZWVfY2ZnLT5udW1f cGlwZXM7IHpfaWR4KyspCisJCWlmIChjZmctPnRyZWVfY2ZnLT5kcHBbel9pZHhdID09IGNmZy0+ ZHBwX2lkKQorCQkJYnJlYWs7CisJaWYgKHpfaWR4ID09IGNmZy0+dHJlZV9jZmctPm51bV9waXBl cykgeworCQlBU1NFUlQoY2ZnLT56X2luZGV4IDw9IGNmZy0+dHJlZV9jZmctPm51bV9waXBlcyk7 CisJCW1wY2NfaWQgPSBtcGMxMF9nZXRfaWRsZV9tcGNjX2lkKG1wYzEwKTsKKwkJQVNTRVJUKCEo bXBjMTAtPm1wY2NfaW5fdXNlX21hc2sgJiAxIDw8IG1wY2NfaWQpKTsKKworCQlpZiAobXBjLT5j dHgtPmRjLT5kZWJ1Zy5zYW5pdHlfY2hlY2tzKQorCQkJbXBjMTBfYXNzZXJ0X21wY2NfaWRsZV9i ZWZvcmVfY29ubmVjdChtcGMxMCwgbXBjY19pZCk7CisJfSBlbHNlIHsKKwkJQVNTRVJUKGNmZy0+ el9pbmRleCA8IGNmZy0+dHJlZV9jZmctPm51bV9waXBlcyk7CisJCW1wY2NfaWQgPSBjZmctPnRy ZWVfY2ZnLT5tcGNjW3pfaWR4XTsKKwkJbXBjMTBfbXBjY19yZW1vdmUobXBjLCBjZmctPnRyZWVf Y2ZnLCBjZmctPm9wcF9pZCwgY2ZnLT5kcHBfaWQpOworCX0KKworCS8qIGFkZCBkcHAvbXBjYyBw YWlyIHRvIG1wY190cmVlX2NmZyBhbmQgdXBkYXRlIG1wY2MgcmVnaXN0ZXJzICovCisJbXBjMTBf YWRkX3RvX3RyZWVfY2ZnKG1wYywgY2ZnLCBtcGNjX2lkKTsKKworCS8qIHNldCBiYWNrZ3JvdW5k IGNvbG9yICovCiAJbXBjMTBfc2V0X2JnX2NvbG9yKG1wYzEwLCAmY2ZnLT5ibGFja19jb2xvciwg bXBjY19pZCk7CiAKKwkvKiBtYXJrIHRoaXMgbXBjYyBhcyBpbiB1c2UgKi8KIAltcGMxMC0+bXBj Y19pbl91c2VfbWFzayB8PSAxIDw8IG1wY2NfaWQ7Ci0JZm9yICh6X2lkeCA9IGNmZy0+b3BwLT5t cGNfdHJlZS5udW1fcGlwZXM7IHpfaWR4ID4gY2ZnLT56X2luZGV4OyB6X2lkeC0tKSB7Ci0JCWNm Zy0+b3BwLT5tcGNfdHJlZS5kcHBbel9pZHhdID0gY2ZnLT5vcHAtPm1wY190cmVlLmRwcFt6X2lk eCAtIDFdOwotCQljZmctPm9wcC0+bXBjX3RyZWUubXBjY1t6X2lkeF0gPSBjZmctPm9wcC0+bXBj X3RyZWUubXBjY1t6X2lkeCAtIDFdOwotCX0KLQljZmctPm9wcC0+bXBjX3RyZWUuZHBwW2NmZy0+ el9pbmRleF0gPSBjZmctPm1pLT5pbnN0OwotCWNmZy0+b3BwLT5tcGNfdHJlZS5tcGNjW2NmZy0+ el9pbmRleF0gPSBtcGNjX2lkOwotCWNmZy0+b3BwLT5tcGNfdHJlZS5udW1fcGlwZXMrKzsKLQlj ZmctPm1pLT5vcHBfaWQgPSBjZmctPm9wcC0+aW5zdDsKLQljZmctPm1pLT5tcGNjX2lkID0gbXBj Y19pZDsKKworCXJldHVybiBtcGNjX2lkOwogfQogCiBjb25zdCBzdHJ1Y3QgbXBjX2Z1bmNzIGRj bjEwX21wY19mdW5jcyA9IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9pbmMvaHcvbXBjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3 L21wYy5oCmluZGV4IDRiYmNmZjQ4YWNjOC4uMmQzZGU1YjY4ZTM0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L21wYy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvbXBjLmgKQEAgLTI5LDggKzI5LDkgQEAKICNpbmNs dWRlICJvcHAuaCIKIAogc3RydWN0IG1wY2NfY2ZnIHsKLQlzdHJ1Y3QgbWVtX2lucHV0ICptaTsK LQlzdHJ1Y3Qgb3V0cHV0X3BpeGVsX3Byb2Nlc3NvciAqb3BwOworCWludCBkcHBfaWQ7CisJaW50 IG9wcF9pZDsKKwlzdHJ1Y3QgbXBjX3RyZWVfY2ZnICp0cmVlX2NmZzsKIAl1bnNpZ25lZCBpbnQg el9pbmRleDsKIAogCXN0cnVjdCB0Z19jb2xvciBibGFja19jb2xvcjsKQEAgLTQ0LDkgKzQ1LDEw IEBAIHN0cnVjdCBtcGMgewogfTsKIAogc3RydWN0IG1wY19mdW5jcyB7Ci0Jdm9pZCAoKmFkZCko c3RydWN0IG1wYyAqbXBjLCBzdHJ1Y3QgbXBjY19jZmcgKmNmZyk7CisJaW50ICgqYWRkKShzdHJ1 Y3QgbXBjICptcGMsIHN0cnVjdCBtcGNjX2NmZyAqY2ZnKTsKIAl2b2lkICgqcmVtb3ZlKShzdHJ1 Y3QgbXBjICptcGMsCi0JCQlzdHJ1Y3Qgb3V0cHV0X3BpeGVsX3Byb2Nlc3NvciAqb3BwLAorCQkJ c3RydWN0IG1wY190cmVlX2NmZyAqdHJlZV9jZmcsCisJCQlpbnQgb3BwX2lkLAogCQkJaW50IG1w Y2NfaW5zdCk7CiAJdm9pZCAoKndhaXRfZm9yX2lkbGUpKHN0cnVjdCBtcGMgKm1wYywgaW50IGlk KTsKIH07Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=