From: Subject: [PATCH 53/81] drm/amd/display: Attach surface to dm_plane_state. Date: Tue, 25 Jul 2017 09:54:13 -0400 Message-ID: <1500990881-6100-54-git-send-email-sunpeng.li@amd.com> References: <1500990881-6100-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500990881-6100-1-git-send-email-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: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpBdHRh Y2ggc3VyZmFjZSB0byBzdGF0ZS4KUmVtb3ZlIENyZWF0ZSBzdXJmYWNlIGZyb20gY29tbWl0LgpQ cm9wb2dhdGUgYW55IHN1cmZhY2UgY3JlYXRpb24gYW5kIGluaXRpYWxpemF0aW9uIGVycm9yIGJh Y2sgdG8gYXRvbWljX2NoZWNrIGNhbGxlci4KY2xlYW4gb3V0ZGF0ZWQgY29kZSBpbiBjaGVjayBh bmQgY29tbWl0LgoKQ2hhbmdlLUlkOiBJNDJkMWRjOTFlMTUyZTQ0ZGFmYjlhMmVlMzIxYWY5Mjc3 YTBkZDQ0ZApTaWduZWQtb2ZmLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8QW5kcmV5Lkdyb2R6b3Zz a3lAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4K QWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIC4u Li9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jICAgIHwgMzQ4ICsr KysrKysrKy0tLS0tLS0tLS0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtX3R5cGVzLmggICAgfCAgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTQ3IGluc2VydGlvbnMo KyksIDIwMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYwppbmRleCA2YWVmYTE5Li4zMmIzYTM5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbV90eXBlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtX3R5cGVzLmMKQEAgLTMwMCwxNiArMzAwLDE2IEBAIHN0YXRpYyBib29sIGZpbGxf cmVjdHNfZnJvbV9wbGFuZV9zdGF0ZSgKIAogCXJldHVybiB0cnVlOwogfQotc3RhdGljIGJvb2wg Z2V0X2ZiX2luZm8oCitzdGF0aWMgaW50IGdldF9mYl9pbmZvKAogCWNvbnN0IHN0cnVjdCBhbWRn cHVfZnJhbWVidWZmZXIgKmFtZGdwdV9mYiwKIAl1aW50NjRfdCAqdGlsaW5nX2ZsYWdzLAogCXVp bnQ2NF90ICpmYl9sb2NhdGlvbikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpyYm8gPSBnZW1fdG9f YW1kZ3B1X2JvKGFtZGdwdV9mYi0+b2JqKTsKIAlpbnQgciA9IGFtZGdwdV9ib19yZXNlcnZlKHJi bywgZmFsc2UpOwotCWlmICh1bmxpa2VseShyICE9IDApKXsKKwlpZiAodW5saWtlbHkocikpIHsK IAkJRFJNX0VSUk9SKCJVbmFibGUgdG8gcmVzZXJ2ZSBidWZmZXJcbiIpOwotCQlyZXR1cm4gZmFs c2U7CisJCXJldHVybiByOwogCX0KIAogCWlmIChmYl9sb2NhdGlvbikKQEAgLTMyMCw5ICszMjAs MTAgQEAgc3RhdGljIGJvb2wgZ2V0X2ZiX2luZm8oCiAKIAlhbWRncHVfYm9fdW5yZXNlcnZlKHJi byk7CiAKLQlyZXR1cm4gdHJ1ZTsKKwlyZXR1cm4gcjsKIH0KLXN0YXRpYyB2b2lkIGZpbGxfcGxh bmVfYXR0cmlidXRlc19mcm9tX2ZiKAorCitzdGF0aWMgaW50IGZpbGxfcGxhbmVfYXR0cmlidXRl c19mcm9tX2ZiKAogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXN0cnVjdCBkY19zdXJm YWNlICpzdXJmYWNlLAogCWNvbnN0IHN0cnVjdCBhbWRncHVfZnJhbWVidWZmZXIgKmFtZGdwdV9m YiwgYm9vbCBhZGRSZXEpCkBAIC0zMzEsMTMgKzMzMiwxNiBAQCBzdGF0aWMgdm9pZCBmaWxsX3Bs YW5lX2F0dHJpYnV0ZXNfZnJvbV9mYigKIAl1aW50NjRfdCBmYl9sb2NhdGlvbiA9IDA7CiAJdW5z aWduZWQgaW50IGF3aWR0aDsKIAljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9ICZh bWRncHVfZmItPmJhc2U7CisJaW50IHJldCA9IDA7CiAJc3RydWN0IGRybV9mb3JtYXRfbmFtZV9i dWYgZm9ybWF0X25hbWU7CiAKLQlnZXRfZmJfaW5mbygKKwlyZXQgPSBnZXRfZmJfaW5mbygKIAkJ YW1kZ3B1X2ZiLAogCQkmdGlsaW5nX2ZsYWdzLAogCQlhZGRSZXEgPT0gdHJ1ZSA/ICZmYl9sb2Nh dGlvbjpOVUxMKTsKIAorCWlmIChyZXQpCisJCXJldHVybiByZXQ7CiAKIAlzd2l0Y2ggKGZiLT5m b3JtYXQtPmZvcm1hdCkgewogCWNhc2UgRFJNX0ZPUk1BVF9DODoKQEAgLTM2Nyw3ICszNzEsNyBA QCBzdGF0aWMgdm9pZCBmaWxsX3BsYW5lX2F0dHJpYnV0ZXNfZnJvbV9mYigKIAlkZWZhdWx0Ogog CQlEUk1fRVJST1IoIlVuc3VwcG9ydGVkIHNjcmVlbiBmb3JtYXQgJXNcbiIsCiAJCSAgICAgICAg ICBkcm1fZ2V0X2Zvcm1hdF9uYW1lKGZiLT5mb3JtYXQtPmZvcm1hdCwgJmZvcm1hdF9uYW1lKSk7 Ci0JCXJldHVybjsKKwkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCiAJaWYgKHN1cmZhY2UtPmZvcm1h dCA8IFNVUkZBQ0VfUElYRUxfRk9STUFUX1ZJREVPX0JFR0lOKSB7CkBAIC00NjgsMjMgKzQ3Miwy NiBAQCBzdGF0aWMgdm9pZCBmaWxsX3BsYW5lX2F0dHJpYnV0ZXNfZnJvbV9mYigKIAlzdXJmYWNl LT5zY2FsaW5nX3F1YWxpdHkudl90YXBzID0gMDsKIAlzdXJmYWNlLT5zdGVyZW9fZm9ybWF0ID0g UExBTkVfU1RFUkVPX0ZPUk1BVF9OT05FOwogCisJcmV0dXJuIHJldDsKKwogfQogCiAjZGVmaW5l IE5VTV9PRl9SQVdfR0FNTUFfUkFNUF9SR0JfMjU2IDI1NgogCi1zdGF0aWMgdm9pZCBmaWxsX2dh bW1hX2Zyb21fY3J0YygKLQljb25zdCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCitzdGF0aWMgdm9p ZCBmaWxsX2dhbW1hX2Zyb21fY3J0Y19zdGF0ZSgKKwljb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJc3RydWN0IGRjX3N1cmZhY2UgKmRjX3N1cmZhY2UpCiB7CiAJaW50 IGk7CiAJc3RydWN0IGRjX2dhbW1hICpnYW1tYTsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0 YXRlID0gY3J0Yy0+c3RhdGU7Ci0Jc3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dCA9IChzdHJ1Y3Qg ZHJtX2NvbG9yX2x1dCAqKSBzdGF0ZS0+Z2FtbWFfbHV0LT5kYXRhOworCXN0cnVjdCBkcm1fY29s b3JfbHV0ICpsdXQgPSAoc3RydWN0IGRybV9jb2xvcl9sdXQgKikgY3J0Y19zdGF0ZS0+Z2FtbWFf bHV0LT5kYXRhOwogCiAJZ2FtbWEgPSBkY19jcmVhdGVfZ2FtbWEoKTsKIAotCWlmIChnYW1tYSA9 PSBOVUxMKQorCWlmIChnYW1tYSA9PSBOVUxMKSB7CisJCVdBUk5fT04oMSk7CiAJCXJldHVybjsK Kwl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgTlVNX09GX1JBV19HQU1NQV9SQU1QX1JHQl8yNTY7IGkr KykgewogCQlnYW1tYS0+cmVkW2ldID0gbHV0W2ldLnJlZDsKQEAgLTQ5NSwyNyArNTAyLDM1IEBA IHN0YXRpYyB2b2lkIGZpbGxfZ2FtbWFfZnJvbV9jcnRjKAogCWRjX3N1cmZhY2UtPmdhbW1hX2Nv cnJlY3Rpb24gPSBnYW1tYTsKIH0KIAotc3RhdGljIHZvaWQgZmlsbF9wbGFuZV9hdHRyaWJ1dGVz KAorc3RhdGljIGludCBmaWxsX3BsYW5lX2F0dHJpYnV0ZXMoCiAJCQlzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAkJCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlLAotCQkJc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqc3RhdGUsIGJvb2wgYWRkclJlcSkKKwkJCXN0cnVjdCBkcm1fcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlLAorCQkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAorCQkJYm9vbCBhZGRyUmVxKQogewogCWNvbnN0IHN0cnVjdCBhbWRncHVfZnJhbWVidWZmZXIg KmFtZGdwdV9mYiA9Ci0JCXRvX2FtZGdwdV9mcmFtZWJ1ZmZlcihzdGF0ZS0+ZmIpOwotCWNvbnN0 IHN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjOworCQl0b19hbWRncHVfZnJhbWVi dWZmZXIocGxhbmVfc3RhdGUtPmZiKTsKKwljb25zdCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBw bGFuZV9zdGF0ZS0+Y3J0YzsKIAlzdHJ1Y3QgZGNfdHJhbnNmZXJfZnVuYyAqaW5wdXRfdGY7CisJ aW50IHJldCA9IDA7CiAKLQlmaWxsX3JlY3RzX2Zyb21fcGxhbmVfc3RhdGUoc3RhdGUsIHN1cmZh Y2UpOwotCWZpbGxfcGxhbmVfYXR0cmlidXRlc19mcm9tX2ZiKAorCWlmICghZmlsbF9yZWN0c19m cm9tX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlLCBzdXJmYWNlKSkKKwkJcmV0dXJuIC1FSU5WQUw7 CisKKwlyZXQgPSBmaWxsX3BsYW5lX2F0dHJpYnV0ZXNfZnJvbV9mYigKIAkJY3J0Yy0+ZGV2LT5k ZXZfcHJpdmF0ZSwKIAkJc3VyZmFjZSwKIAkJYW1kZ3B1X2ZiLAogCQlhZGRyUmVxKTsKIAorCWlm IChyZXQpCisJCXJldHVybiByZXQ7CisKIAlpbnB1dF90ZiA9IGRjX2NyZWF0ZV90cmFuc2Zlcl9m dW5jKCk7CiAKIAlpZiAoaW5wdXRfdGYgPT0gTlVMTCkKLQkJcmV0dXJuOworCQlyZXR1cm4gLUVO T01FTTsKIAogCWlucHV0X3RmLT50eXBlID0gVEZfVFlQRV9QUkVERUZJTkVEOwogCWlucHV0X3Rm LT50ZiA9IFRSQU5TRkVSX0ZVTkNUSU9OX1NSR0I7CkBAIC01MjMsOSArNTM4LDEwIEBAIHN0YXRp YyB2b2lkIGZpbGxfcGxhbmVfYXR0cmlidXRlcygKIAlzdXJmYWNlLT5pbl90cmFuc2Zlcl9mdW5j ID0gaW5wdXRfdGY7CiAKIAkvKiBJbiBjYXNlIG9mIGdhbW1hIHNldCwgdXBkYXRlIGdhbW1hIHZh bHVlICovCi0JaWYgKHN0YXRlLT5jcnRjLT5zdGF0ZS0+Z2FtbWFfbHV0KSB7Ci0JCWZpbGxfZ2Ft bWFfZnJvbV9jcnRjKGNydGMsIHN1cmZhY2UpOwotCX0KKwlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFf bHV0KQorCQlmaWxsX2dhbW1hX2Zyb21fY3J0Y19zdGF0ZShjcnRjX3N0YXRlLCBzdXJmYWNlKTsK KworCXJldHVybiByZXQ7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KQEAgLTYwOCw1NyAr NjI0LDYgQEAgc3RhdGljIHZvaWQgdXBkYXRlX3N0cmVhbV9zY2FsaW5nX3NldHRpbmdzKAogCiB9 CiAKLXN0YXRpYyB2b2lkIGFkZF9zdXJmYWNlKHN0cnVjdCBkYyAqZGMsCi0JCQlzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCi0JCQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCWNvbnN0IHN0cnVj dCBkY19zdXJmYWNlICoqZGNfc3VyZmFjZXMpCi17Ci0Jc3RydWN0IGRjX3N1cmZhY2UgKmRjX3N1 cmZhY2U7Ci0Jc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMp OwotCXN0cnVjdCBkbV9jcnRjX3N0YXRlICphY3J0Y19zdGF0ZSA9IHRvX2RtX2NydGNfc3RhdGUo Y3J0Yy0+c3RhdGUpOwotCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKmRjX3N0cmVhbSA9IGFjcnRj X3N0YXRlLT5zdHJlYW07Ci0JdW5zaWduZWQgbG9uZyBmbGFnczsKLQotCXNwaW5fbG9ja19pcnFz YXZlKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKLQlpZiAoYWNydGMtPnBmbGlwX3N0 YXR1cyAhPSBBTURHUFVfRkxJUF9OT05FKSB7Ci0JCURSTV9FUlJPUigiYWRkX3N1cmZhY2U6IGFj cnRjICVkLCBhbHJlYWR5IGJ1c3lcbiIsCi0JCQkgIGFjcnRjLT5jcnRjX2lkKTsKLQkJc3Bpbl91 bmxvY2tfaXJxcmVzdG9yZSgmY3J0Yy0+ZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7Ci0JCS8qIElu IGNvbWl0IHRhaWwgZnJhbWV3b3JrIHRoaXMgY2Fubm90IGhhcHBlbiAqLwotCQlCVUdfT04oMCk7 Ci0JfQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmNydGMtPmRldi0+ZXZlbnRfbG9jaywgZmxh Z3MpOwotCi0JaWYgKCFkY19zdHJlYW0pIHsKLQkJZG1fZXJyb3IoCi0JCQkiJXM6IEZhaWxlZCB0 byBvYnRhaW4gc3RyZWFtIG9uIGNydGMgKCVkKSFcbiIsCi0JCQlfX2Z1bmNfXywKLQkJCWFjcnRj LT5jcnRjX2lkKTsKLQkJZ290byBmYWlsOwotCX0KLQotCWRjX3N1cmZhY2UgPSBkY19jcmVhdGVf c3VyZmFjZShkYyk7Ci0KLQlpZiAoIWRjX3N1cmZhY2UpIHsKLQkJZG1fZXJyb3IoCi0JCQkiJXM6 IEZhaWxlZCB0byBjcmVhdGUgYSBzdXJmYWNlIVxuIiwKLQkJCV9fZnVuY19fKTsKLQkJZ290byBm YWlsOwotCX0KLQotCS8qIFN1cmZhY2UgcHJvZ3JhbW1pbmcgKi8KLQlmaWxsX3BsYW5lX2F0dHJp YnV0ZXMoCi0JCQljcnRjLT5kZXYtPmRldl9wcml2YXRlLAotCQkJZGNfc3VyZmFjZSwKLQkJCXBs YW5lLT5zdGF0ZSwKLQkJCXRydWUpOwotCi0JKmRjX3N1cmZhY2VzID0gZGNfc3VyZmFjZTsKLQot ZmFpbDoKLQlyZXR1cm47Ci19Ci0KIHN0YXRpYyBlbnVtIGRjX2NvbG9yX2RlcHRoIGNvbnZlcnRf Y29sb3JfZGVwdGhfZnJvbV9kaXNwbGF5X2luZm8oCiAJCWNvbnN0IHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IpCiB7CkBAIC0xNjAyLDkgKzE1NjcsOSBAQCBkbV9kcm1fcGxhbmVfZHVw bGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogCiAJX19kcm1fYXRvbWljX2hl bHBlcl9wbGFuZV9kdXBsaWNhdGVfc3RhdGUocGxhbmUsICZkbV9wbGFuZV9zdGF0ZS0+YmFzZSk7 CiAKLQlpZiAob2xkX2RtX3BsYW5lX3N0YXRlLT5kY19zdXJmYWNlKSB7Ci0JCWRtX3BsYW5lX3N0 YXRlLT5kY19zdXJmYWNlID0gb2xkX2RtX3BsYW5lX3N0YXRlLT5kY19zdXJmYWNlOwotCQlkY19z dXJmYWNlX3JldGFpbihkbV9wbGFuZV9zdGF0ZS0+ZGNfc3VyZmFjZSk7CisJaWYgKG9sZF9kbV9w bGFuZV9zdGF0ZS0+c3VyZmFjZSkgeworCQlkbV9wbGFuZV9zdGF0ZS0+c3VyZmFjZSA9IG9sZF9k bV9wbGFuZV9zdGF0ZS0+c3VyZmFjZTsKKwkJZGNfc3VyZmFjZV9yZXRhaW4oZG1fcGxhbmVfc3Rh dGUtPnN1cmZhY2UpOwogCX0KIAogCXJldHVybiAmZG1fcGxhbmVfc3RhdGUtPmJhc2U7CkBAIC0x NjE1LDggKzE1ODAsOCBAQCB2b2lkIGRtX2RybV9wbGFuZV9kZXN0cm95X3N0YXRlKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogewogCXN0cnVjdCBkbV9wbGFuZV9zdGF0ZSAqZG1fcGxhbmVfc3Rh dGUgPSB0b19kbV9wbGFuZV9zdGF0ZShzdGF0ZSk7CiAKLQlpZiAoZG1fcGxhbmVfc3RhdGUtPmRj X3N1cmZhY2UpCi0JCWRjX3N1cmZhY2VfcmVsZWFzZShkbV9wbGFuZV9zdGF0ZS0+ZGNfc3VyZmFj ZSk7CisJaWYgKGRtX3BsYW5lX3N0YXRlLT5zdXJmYWNlKQorCQlkY19zdXJmYWNlX3JlbGVhc2Uo ZG1fcGxhbmVfc3RhdGUtPnN1cmZhY2UpOwogCiAJX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9k ZXN0cm95X3N0YXRlKHN0YXRlKTsKIAlrZnJlZShkbV9wbGFuZV9zdGF0ZSk7CkBAIC0xNjQwLDYg KzE2MDUsMTEgQEAgc3RhdGljIGludCBkbV9wbGFuZV9oZWxwZXJfcHJlcGFyZV9mYigKIAlzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKm9iajsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpyYm87CiAJaW50IHI7 CisJc3RydWN0IGRtX3BsYW5lX3N0YXRlICpkbV9wbGFuZV9zdGF0ZV9uZXcsICpkbV9wbGFuZV9z dGF0ZV9vbGQ7CisJdW5zaWduZWQgaW50IGF3aWR0aDsKKworCWRtX3BsYW5lX3N0YXRlX29sZCA9 IHRvX2RtX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CisJZG1fcGxhbmVfc3RhdGVfbmV3ID0g dG9fZG1fcGxhbmVfc3RhdGUobmV3X3N0YXRlKTsKIAogCWlmICghbmV3X3N0YXRlLT5mYikgewog CQlEUk1fREVCVUdfS01TKCJObyBGQiBib3VuZFxuIik7CkBAIC0xNjU2LDYgKzE2MjYsNyBAQCBz dGF0aWMgaW50IGRtX3BsYW5lX2hlbHBlcl9wcmVwYXJlX2ZiKAogCiAJciA9IGFtZGdwdV9ib19w aW4ocmJvLCBBTURHUFVfR0VNX0RPTUFJTl9WUkFNLCAmYWZiLT5hZGRyZXNzKTsKIAorCiAJYW1k Z3B1X2JvX3VucmVzZXJ2ZShyYm8pOwogCiAJaWYgKHVubGlrZWx5KHIgIT0gMCkpIHsKQEAgLTE2 NjUsNiArMTYzNiwyMyBAQCBzdGF0aWMgaW50IGRtX3BsYW5lX2hlbHBlcl9wcmVwYXJlX2ZiKAog CiAJYW1kZ3B1X2JvX3JlZihyYm8pOwogCisJaWYgKGRtX3BsYW5lX3N0YXRlX25ldy0+c3VyZmFj ZSAmJgorCQkJZG1fcGxhbmVfc3RhdGVfb2xkLT5zdXJmYWNlICE9IGRtX3BsYW5lX3N0YXRlX25l dy0+c3VyZmFjZSkgeworCQlzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZSA9IGRtX3BsYW5lX3N0 YXRlX25ldy0+c3VyZmFjZTsKKworCQlpZiAoc3VyZmFjZS0+Zm9ybWF0IDwgU1VSRkFDRV9QSVhF TF9GT1JNQVRfVklERU9fQkVHSU4pIHsKKwkJCXN1cmZhY2UtPmFkZHJlc3MuZ3JwaC5hZGRyLmxv d19wYXJ0ID0gbG93ZXJfMzJfYml0cyhhZmItPmFkZHJlc3MpOworCQkJc3VyZmFjZS0+YWRkcmVz cy5ncnBoLmFkZHIuaGlnaF9wYXJ0ID0gdXBwZXJfMzJfYml0cyhhZmItPmFkZHJlc3MpOworCQl9 IGVsc2UgeworCQkJYXdpZHRoID0gQUxJR04obmV3X3N0YXRlLT5mYi0+d2lkdGgsIDY0KTsKKwkJ CXN1cmZhY2UtPmFkZHJlc3MudmlkZW9fcHJvZ3Jlc3NpdmUubHVtYV9hZGRyLmxvd19wYXJ0CisJ CQkJCQkJPSBsb3dlcl8zMl9iaXRzKGFmYi0+YWRkcmVzcyk7CisJCQlzdXJmYWNlLT5hZGRyZXNz LnZpZGVvX3Byb2dyZXNzaXZlLmNocm9tYV9hZGRyLmxvd19wYXJ0CisJCQkJCQkJPSBsb3dlcl8z Ml9iaXRzKGFmYi0+YWRkcmVzcykgKworCQkJCQkJCQkoYXdpZHRoICogbmV3X3N0YXRlLT5mYi0+ aGVpZ2h0KTsKKwkJfQorCX0KKwogCS8qIEl0J3MgYSBoYWNrIGZvciBzMyBzaW5jZSBpbiA0Ljkg a2VybmVsIGZpbHRlciBvdXQgY3Vyc29yIGJ1ZmZlcgogCSAqIHByZXBhcmUgYW5kIGNsZWFudXAg aW4gZHJtX2F0b21pY19oZWxwZXJfcHJlcGFyZV9wbGFuZXMKIAkgKiBhbmQgZHJtX2F0b21pY19o ZWxwZXJfY2xlYW51cF9wbGFuZXMgYmVjYXVzZSBmYiBkb2Vucyd0IGluIHMzLgpAQCAtMjUyOSw1 OSArMjUxNyw0MyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fY29tbWl0X3N1cmZhY2VzKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjX2F0 dGFjaCA9IHRvX2FtZGdwdV9jcnRjKHBjcnRjKTsKIAlzdHJ1Y3QgZG1fY3J0Y19zdGF0ZSAqYWNy dGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKHBjcnRjLT5zdGF0ZSk7CiAJaW50IHBsYW5lc19j b3VudCA9IDA7CisJdW5zaWduZWQgbG9uZyBmbGFnczsKIAogCS8qIHVwZGF0ZSBwbGFuZXMgd2hl biBuZWVkZWQgKi8KIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIG9sZF9w bGFuZV9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9 IHBsYW5lLT5zdGF0ZTsKIAkJc3RydWN0IGRybV9jcnRjICpjcnRjID0gcGxhbmVfc3RhdGUtPmNy dGM7CiAJCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwotCQlz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0 YXRlICpjb25fc3RhdGUgPSBOVUxMOwogCQlib29sIHBmbGlwX25lZWRlZDsKKwkJc3RydWN0IGRt X3BsYW5lX3N0YXRlICpkbV9wbGFuZV9zdGF0ZSA9IHRvX2RtX3BsYW5lX3N0YXRlKHBsYW5lX3N0 YXRlKTsKIAogCQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CiAJ CQloYW5kbGVfY3Vyc29yX3VwZGF0ZShwbGFuZSwgb2xkX3BsYW5lX3N0YXRlKTsKIAkJCWNvbnRp bnVlOwogCQl9CiAKLQkJaWYgKCFmYiB8fCAhY3J0YyB8fCBwY3J0YyAhPSBjcnRjIHx8ICFjcnRj LT5zdGF0ZS0+YWN0aXZlKQorCQlpZiAoIWZiIHx8ICFjcnRjIHx8IHBjcnRjICE9IGNydGMgfHwg IWNydGMtPnN0YXRlLT5hY3RpdmUgfHwKKwkJCQkoIWNydGMtPnN0YXRlLT5wbGFuZXNfY2hhbmdl ZCAmJgorCQkJCQkJIXBjcnRjLT5zdGF0ZS0+Y29sb3JfbWdtdF9jaGFuZ2VkKSkKIAkJCWNvbnRp bnVlOwogCiAJCXBmbGlwX25lZWRlZCA9ICFzdGF0ZS0+YWxsb3dfbW9kZXNldDsKKworCQlzcGlu X2xvY2tfaXJxc2F2ZSgmY3J0Yy0+ZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CisJCWlmIChhY3J0 Y19hdHRhY2gtPnBmbGlwX3N0YXR1cyAhPSBBTURHUFVfRkxJUF9OT05FKSB7CisJCQlEUk1fRVJS T1IoImFkZF9zdXJmYWNlOiBhY3J0YyAlZCwgYWxyZWFkeSBidXN5XG4iLAorCQkJCQlhY3J0Y19h dHRhY2gtPmNydGNfaWQpOworCQkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY3J0Yy0+ZGV2LT5l dmVudF9sb2NrLCBmbGFncyk7CisJCQkvKiBJbiBjb21pdCB0YWlsIGZyYW1ld29yayB0aGlzIGNh bm5vdCBoYXBwZW4gKi8KKwkJCVdBUk5fT04oMSk7CisJCX0KKwkJc3Bpbl91bmxvY2tfaXJxcmVz dG9yZSgmY3J0Yy0+ZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CisKIAkJaWYgKCFwZmxpcF9uZWVk ZWQpIHsKLQkJCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLAotCQkJCQkgICAgJmRldi0+ bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsCi0JCQkJCSAgICBoZWFkKSB7Ci0JCQkJaWYgKGNv bm5lY3Rvci0+c3RhdGUtPmNydGMgPT0gY3J0YykgewotCQkJCQljb25fc3RhdGUgPSB0b19kbV9j b25uZWN0b3Jfc3RhdGUoCi0JCQkJCQkJY29ubmVjdG9yLT5zdGF0ZSk7Ci0JCQkJCWJyZWFrOwot CQkJCX0KLQkJCX0KKwkJCVdBUk5fT04oIWRtX3BsYW5lX3N0YXRlLT5zdXJmYWNlKTsKIAotCQkJ LyoKLQkJCSAqIFRoaXMgc2l0dWF0aW9uIGhhcHBlbnMgaW4gdGhlIGZvbGxvd2luZyBjYXNlOgot CQkJICogd2UgYXJlIGFib3V0IHRvIGdldCBzZXQgbW9kZSBmb3IgY29ubmVjdG9yIHdobydzIG9u bHkKLQkJCSAqIHBvc3NpYmxlIGNydGMgKGluIGVuY29kZXIgY3J0YyBtYXNrKSBpcyB1c2VkIGJ5 Ci0JCQkgKiBhbm90aGVyIGNvbm5lY3RvciwgdGhhdCBpcyB3aHkgaXQgd2lsbCB0cnkgdG8KLQkJ CSAqIHJlLWFzc2luZyBjcnRjcyBpbiBvcmRlciB0byBtYWtlIGNvbmZpZ3VyYXRpb24KLQkJCSAq IHN1cHBvcnRlZC4gRm9yIG91ciBpbXBsZW1lbnRhdGlvbiB3ZSBuZWVkIHRvIG1ha2UgYWxsCi0J CQkgKiBlbmNvZGVycyBzdXBwb3J0IGFsbCBjcnRjcywgdGhlbiB0aGlzIGlzc3VlIHdpbGwKLQkJ CSAqIG5ldmVyIGFyaXNlIGFnYWluLiBCdXQgdG8gZ3VhcmQgY29kZSBmcm9tIHRoaXMgaXNzdWUK LQkJCSAqIGNoZWNrIGlzIGxlZnQuCi0JCQkgKgotCQkJICogQWxzbyBpdCBzaG91bGQgYmUgbmVl ZGVkIHdoZW4gdXNlZCB3aXRoIGFjdHVhbAotCQkJICogZHJtX2F0b21pY19jb21taXQgaW9jdGwg aW4gZnV0dXJlCi0JCQkgKi8KLQkJCWlmICghY29uX3N0YXRlKQotCQkJCWNvbnRpbnVlOworCQkJ ZGNfc3VyZmFjZXNfY29uc3RydWN0ZWRbcGxhbmVzX2NvdW50XSA9IGRtX3BsYW5lX3N0YXRlLT5z dXJmYWNlOwogCi0JCQlhZGRfc3VyZmFjZShkbS0+ZGMsIGNydGMsIHBsYW5lLAotCQkJCSAgICAm ZGNfc3VyZmFjZXNfY29uc3RydWN0ZWRbcGxhbmVzX2NvdW50XSk7Ci0JCQlpZiAoZGNfc3VyZmFj ZXNfY29uc3RydWN0ZWRbcGxhbmVzX2NvdW50XSA9PSBOVUxMKSB7Ci0JCQkJZG1fZXJyb3IoIiVz OiBGYWlsZWQgdG8gYWRkIHN1cmZhY2UhXG4iLCBfX2Z1bmNfXyk7Ci0JCQkJY29udGludWU7Ci0J CQl9CiAJCQlkY19zdHJlYW1fYXR0YWNoID0gYWNydGNfc3RhdGUtPnN0cmVhbTsKIAkJCXBsYW5l c19jb3VudCsrOwogCkBAIC0yNjI4LDkgKzI2MDAsNiBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1f Y29tbWl0X3N1cmZhY2VzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCQkJCQkg IHBsYW5lc19jb3VudCwKIAkJCQkJCQkgIGRjX3N0cmVhbV9hdHRhY2gpKQogCQkJZG1fZXJyb3Io IiVzOiBGYWlsZWQgdG8gYXR0YWNoIHN1cmZhY2UhXG4iLCBfX2Z1bmNfXyk7Ci0KLQkJZm9yIChp ID0gMDsgaSA8IHBsYW5lc19jb3VudDsgaSsrKQotCQkJZGNfc3VyZmFjZV9yZWxlYXNlKGRjX3N1 cmZhY2VzX2NvbnN0cnVjdGVkW2ldKTsKIAl9IGVsc2UgewogCiAJCS8qVE9ETyBCVUcgSGVyZSBz aG91bGQgZ28gZGlzYWJsZSBwbGFuZXMgb24gQ1JUQy4gKi8KQEAgLTMwMTQsNyArMjk4Myw2IEBA IHN0YXRpYyB1aW50MzJfdCBhZGRfdmFsX3NldHNfc3VyZmFjZSgKIAogc3RhdGljIHVpbnQzMl90 IHVwZGF0ZV9pbl92YWxfc2V0c19zdHJlYW0oCiAJc3RydWN0IGRjX3ZhbGlkYXRpb25fc2V0ICp2 YWxfc2V0cywKLQlzdHJ1Y3QgZHJtX2NydGMgKipjcnRjcywKIAl1aW50MzJfdCBzZXRfY291bnQs CiAJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqb2xkX3N0cmVhbSwKIAljb25zdCBzdHJ1Y3QgZGNf c3RyZWFtICpuZXdfc3RyZWFtLApAQCAtMzAyOSw3ICsyOTk3LDYgQEAgc3RhdGljIHVpbnQzMl90 IHVwZGF0ZV9pbl92YWxfc2V0c19zdHJlYW0oCiAJfQogCiAJdmFsX3NldHNbaV0uc3RyZWFtID0g bmV3X3N0cmVhbTsKLQljcnRjc1tpXSA9IGNydGM7CiAKIAlpZiAoaSA9PSBzZXRfY291bnQpCiAJ CS8qIG5vdGhpbmcgZm91bmQuIGFkZCBuZXcgb25lIHRvIHRoZSBlbmQgKi8KQEAgLTMxMjMsMTAg KzMwOTAsOCBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwogCWludCBpLCBqOwog CWludCByZXQ7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjX3NldFtNQVhfU1RSRUFNU10gPSB7IDAg fTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3Ry dWN0IGRjICpkYyA9IGFkZXYtPmRtLmRjOwotCWJvb2wgbmVlZF90b192YWxpZGF0ZSA9IGZhbHNl OwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CiAJaW50IHNldF9jb3VudDsKQEAgLTMxNDIsMTMgKzMxMDcs MTAgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVjayhkZXYsIHN0YXRlKTsKIAogCWlmIChyZXQp IHsKLQkJRFJNX0VSUk9SKCJBdG9taWMgc3RhdGUgdmFsaWRhdGlvbiBmYWlsZWQgd2l0aCBlcnJv ciA6JWQgIVxuIiwKLQkJCQlyZXQpOworCQlEUk1fRVJST1IoIkF0b21pYyBzdGF0ZSB2YWxpZGF0 aW9uIGZhaWxlZCB3aXRoIGVycm9yIDolZCAhXG4iLCByZXQpOwogCQlyZXR1cm4gcmV0OwogCX0K IAotCXJldCA9IC1FSU5WQUw7Ci0KIAlkbV9zdGF0ZSA9IHRvX2RtX2F0b21pY19zdGF0ZShzdGF0 ZSk7CiAKIAkvKiBjb3B5IGV4aXN0aW5nIGNvbmZpZ3VyYXRpb24gKi8KQEAgLTMxNjAsNyArMzEy Miw2IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCWlmIChvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSkgewogCQkJZGNfc3RyZWFtX3JldGFpbihv bGRfYWNydGNfc3RhdGUtPnN0cmVhbSk7CiAJCQlzZXRbc2V0X2NvdW50XS5zdHJlYW0gPSBvbGRf YWNydGNfc3RhdGUtPnN0cmVhbTsKLQkJCWNydGNfc2V0W3NldF9jb3VudF0gPSBjcnRjOwogCQkJ KytzZXRfY291bnQ7CiAJCX0KIAl9CkBAIC0zMTk1LDggKzMxNTYsMTEgQEAgaW50IGFtZGdwdV9k bV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQkJaWYgKGFjb25uZWN0 b3IpIHsKIAkJCQljb25uX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0 YXRlLCAmYWNvbm5lY3Rvci0+YmFzZSk7Ci0JCQkJaWYgKElTX0VSUihjb25uX3N0YXRlKSkKLQkJ CQkJcmV0dXJuIHJldDsKKwkJCQlpZiAoSVNfRVJSKGNvbm5fc3RhdGUpKSB7CisJCQkJCXJldCA9 IFBUUl9FUlJfT1JfWkVSTyhjb25uX3N0YXRlKTsKKwkJCQkJZ290byBmYWlsX2NydGNzOworCQkJ CX0KKwogCQkJCWRtX2Nvbm5fc3RhdGUgPSB0b19kbV9jb25uZWN0b3Jfc3RhdGUoY29ubl9zdGF0 ZSk7CiAJCQl9CiAKQEAgLTMyMTYsMTcgKzMxODAsMTYgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQkJaWYgKG5ld19hY3J0Y19zdGF0ZS0+ c3RyZWFtKQogCQkJCWRjX3N0cmVhbV9yZWxlYXNlKG5ld19hY3J0Y19zdGF0ZS0+c3RyZWFtKTsK KwogCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0gPSBuZXdfc3RyZWFtOwogCiAJCQlzZXRfY291 bnQgPSB1cGRhdGVfaW5fdmFsX3NldHNfc3RyZWFtKAogCQkJCQlzZXQsCi0JCQkJCWNydGNfc2V0 LAogCQkJCQlzZXRfY291bnQsCiAJCQkJCW9sZF9hY3J0Y19zdGF0ZS0+c3RyZWFtLAogCQkJCQlu ZXdfYWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkJY3J0Yyk7CiAKLQkJCW5lZWRfdG9fdmFsaWRh dGUgPSB0cnVlOwogCQkJYXF1aXJlX2dsb2JhbF9sb2NrID0gdHJ1ZTsKIAogCQl9IGVsc2UgaWYg KG1vZGVyZXNldF9yZXF1aXJlZChjcnRjX3N0YXRlKSkgewpAQCAtMzI1NCw5ICszMjE3LDcgQEAg aW50IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQkJ cmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCBjcnRjKTsKIAkJCWlm IChyZXQpCi0JCQkJcmV0dXJuIHJldDsKLQotCQkJcmV0ID0gLUVJTlZBTDsKKwkJCQlnb3RvIGZh aWxfY3J0Y3M7CiAJCX0KIAl9CiAKQEAgLTMyODEsMTE4ICszMjQyLDEwMSBAQCBpbnQgYW1kZ3B1 X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIWlzX3NjYWxp bmdfc3RhdGVfZGlmZmVyZW50KGNvbl9uZXdfc3RhdGUsIGNvbl9vbGRfc3RhdGUpKQogCQkJY29u dGludWU7CiAKLQkJbmVlZF90b192YWxpZGF0ZSA9IHRydWU7CiAJCWFxdWlyZV9nbG9iYWxfbG9j ayA9IHRydWU7CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IHNldF9jb3VudDsgaSsrKSB7CisJZm9y X2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQluZXdf YWNydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOworCiAJCWZvcl9lYWNo X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGopIHsKLQkJCXN0cnVj dCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRlLT5jcnRjOworCQkJc3RydWN0IGRybV9jcnRj ICpwbGFuZV9jcnRjID0gcGxhbmVfc3RhdGUtPmNydGM7CiAJCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKLQkJCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3I7Ci0JCQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9jb25uX3N0YXRlID0gTlVM TDsKLQkJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAkJCWJvb2wgcGZsaXBf bmVlZGVkOworCQkJc3RydWN0IGRtX3BsYW5lX3N0YXRlICpkbV9wbGFuZV9zdGF0ZSA9IHRvX2Rt X3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKIAogCQkJLypUT0RPIEltcGxlbWVudCBhdG9taWMg Y2hlY2sgZm9yIGN1cnNvciBwbGFuZSAqLwogCQkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFO RV9UWVBFX0NVUlNPUikKIAkJCQljb250aW51ZTsKIAotCQkJaWYgKCFmYiB8fCAhY3J0YyB8fCBj cnRjX3NldFtpXSAhPSBjcnRjIHx8Ci0JCQkJIWNydGMtPnN0YXRlLT5wbGFuZXNfY2hhbmdlZCB8 fCAhY3J0Yy0+c3RhdGUtPmFjdGl2ZSkKKwkJCWlmICghZmIgfHwgIXBsYW5lX2NydGMgfHwgY3J0 YyAhPSBwbGFuZV9jcnRjIHx8CisJCQkJKCFjcnRjX3N0YXRlLT5wbGFuZXNfY2hhbmdlZCAmJgor CQkJCQkJIWNydGNfc3RhdGUtPmNvbG9yX21nbXRfY2hhbmdlZCkgfHwKKwkJCQkhY3J0Y19zdGF0 ZS0+YWN0aXZlKQogCQkJCWNvbnRpbnVlOwogCisJCQlXQVJOX09OKCFuZXdfYWNydGNfc3RhdGUt PnN0cmVhbSk7CiAKLQkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0 YXRlLCBjcnRjKTsKIAkJCXBmbGlwX25lZWRlZCA9ICFzdGF0ZS0+YWxsb3dfbW9kZXNldDsKIAkJ CWlmICghcGZsaXBfbmVlZGVkKSB7CiAJCQkJc3RydWN0IGRjX3N1cmZhY2UgKnN1cmZhY2U7CiAK LQkJCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwKLQkJCQkJJmRldi0+bW9kZV9jb25m aWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpCXsKLQkJCQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmNy dGMgPT0gY3J0YykgewotCQkJCQkJZG1fY29ubl9zdGF0ZSA9IHRvX2RtX2Nvbm5lY3Rvcl9zdGF0 ZSgKLQkJCQkJCQljb25uZWN0b3ItPnN0YXRlKTsKLQkJCQkJCWJyZWFrOwotCQkJCQl9Ci0JCQkJ fQotCi0JCQkJLyoKLQkJCQkgKiBUaGlzIHNpdHVhdGlvbiBoYXBwZW5zIGluIHRoZSBmb2xsb3dp bmcgY2FzZToKLQkJCQkgKiB3ZSBhcmUgYWJvdXQgdG8gZ2V0IHNldCBtb2RlIGZvciBjb25uZWN0 b3Igd2hvJ3Mgb25seQotCQkJCSAqIHBvc3NpYmxlIGNydGMgKGluIGVuY29kZXIgY3J0YyBtYXNr KSBpcyB1c2VkIGJ5Ci0JCQkJICogYW5vdGhlciBjb25uZWN0b3IsIHRoYXQgaXMgd2h5IGl0IHdp bGwgdHJ5IHRvCi0JCQkJICogcmUtYXNzaW5nIGNydGNzIGluIG9yZGVyIHRvIG1ha2UgY29uZmln dXJhdGlvbgotCQkJCSAqIHN1cHBvcnRlZC4gRm9yIG91ciBpbXBsZW1lbnRhdGlvbiB3ZSBuZWVk IHRvIG1ha2UgYWxsCi0JCQkJICogZW5jb2RlcnMgc3VwcG9ydCBhbGwgY3J0Y3MsIHRoZW4gdGhp cyBpc3N1ZSB3aWxsCi0JCQkJICogbmV2ZXIgYXJpc2UgYWdhaW4uIEJ1dCB0byBndWFyZCBjb2Rl IGZyb20gdGhpcyBpc3N1ZQotCQkJCSAqIGNoZWNrIGlzIGxlZnQuCi0JCQkJICoKLQkJCQkgKiBB bHNvIGl0IHNob3VsZCBiZSBuZWVkZWQgd2hlbiB1c2VkIHdpdGggYWN0dWFsCi0JCQkJICogZHJt X2F0b21pY19jb21taXQgaW9jdGwgaW4gZnV0dXJlCi0JCQkJICovCi0JCQkJaWYgKCFkbV9jb25u X3N0YXRlKQotCQkJCQljb250aW51ZTsKLQogCQkJCXN1cmZhY2UgPSBkY19jcmVhdGVfc3VyZmFj ZShkYyk7Ci0JCQkJZmlsbF9wbGFuZV9hdHRyaWJ1dGVzKAotCQkJCQljcnRjLT5kZXYtPmRldl9w cml2YXRlLAorCisJCQkJcmV0ID0gZmlsbF9wbGFuZV9hdHRyaWJ1dGVzKAorCQkJCQlwbGFuZV9j cnRjLT5kZXYtPmRldl9wcml2YXRlLAogCQkJCQlzdXJmYWNlLAogCQkJCQlwbGFuZV9zdGF0ZSwK KwkJCQkJY3J0Y19zdGF0ZSwKIAkJCQkJZmFsc2UpOworCQkJCWlmIChyZXQpCisJCQkJCWdvdG8g ZmFpbF9wbGFuZXM7CisKKworCQkJCWlmIChkbV9wbGFuZV9zdGF0ZS0+c3VyZmFjZSkKKwkJCQkJ ZGNfc3VyZmFjZV9yZWxlYXNlKGRtX3BsYW5lX3N0YXRlLT5zdXJmYWNlKTsKKworCQkJCWRtX3Bs YW5lX3N0YXRlLT5zdXJmYWNlID0gc3VyZmFjZTsKIAogCQkJCWFkZF92YWxfc2V0c19zdXJmYWNl KHNldCwKIAkJCQkJCSAgICAgc2V0X2NvdW50LAotCQkJCQkJICAgICBzZXRbaV0uc3RyZWFtLAor CQkJCQkJICAgICBuZXdfYWNydGNfc3RhdGUtPnN0cmVhbSwKIAkJCQkJCSAgICAgc3VyZmFjZSk7 CiAKLQkJCQluZWVkX3RvX3ZhbGlkYXRlID0gdHJ1ZTsKIAkJCQlhcXVpcmVfZ2xvYmFsX2xvY2sg PSB0cnVlOwogCQkJfQogCQl9CiAJfQogCiAJZG1fc3RhdGUtPmNvbnRleHQgPSBkY19nZXRfdmFs aWRhdGVfY29udGV4dChkYywgc2V0LCBzZXRfY291bnQpOwotCi0JaWYgKG5lZWRfdG9fdmFsaWRh dGUgPT0gZmFsc2UgfHwgc2V0X2NvdW50ID09IDAgfHwgZG1fc3RhdGUtPmNvbnRleHQpIHsKLQkJ cmV0ID0gMDsKLQkJLyoKLQkJICogRm9yIGZ1bGwgdXBkYXRlcyBjYXNlIHdoZW4KLQkJICogcmVt b3ZpbmcvYWRkaW5nL3VwZGF0ZWRpbmcgIHN0cmVhbXMgb24gb25jZSBDUlRDIHdoaWxlIGZsaXBw aW5nCi0JCSAqIG9uIGFub3RoZXIgQ1JUQywKLQkJICogYWNxdWlyaW5nIGdsb2JhbCBsb2NrICB3 aWxsIGd1YXJhbnRlZSB0aGF0IGFueSBzdWNoIGZ1bGwKLQkJICogdXBkYXRlIGNvbW1pdAotCQkg KiB3aWxsIHdhaXQgZm9yIGNvbXBsZXRpb24gb2YgYW55IG91dHN0YW5kaW5nIGZsaXAgdXNpbmcg RFJNcwotCQkgKiBzeW5jaHJvbml6YXRpb24gZXZlbnRzLgotCQkgKi8KLQkJaWYgKGFxdWlyZV9n bG9iYWxfbG9jaykKLQkJCXJldCA9IGRvX2FxdWlyZV9nbG9iYWxfbG9jayhkZXYsIHN0YXRlKTsK LQorCWlmICghZG1fc3RhdGUtPmNvbnRleHQpIHsKKwkJcmV0ID0gLUVJTlZBTDsKKwkJZ290byBm YWlsX3BsYW5lczsKIAl9CiAKLQkvKiBUT0RPIHVudGlsIHN1cmZhY2VzIGFyZSBtb3ZlZCBpbnRv IGRtX3BsYW5lX3N0YXRlIHJlbGVhc2UgdGhlbQotCSAqIGhlcmUKKwkvKgorCSAqIEZvciBmdWxs IHVwZGF0ZXMgY2FzZSB3aGVuCisJICogcmVtb3ZpbmcvYWRkaW5nL3VwZGF0aW5nICBzdHJlYW1z IG9uIG9uY2UgQ1JUQyB3aGlsZSBmbGlwcGluZworCSAqIG9uIGFub3RoZXIgQ1JUQywKKwkgKiBh Y3F1aXJpbmcgZ2xvYmFsIGxvY2sgIHdpbGwgZ3VhcmFudGVlIHRoYXQgYW55IHN1Y2ggZnVsbAor CSAqIHVwZGF0ZSBjb21taXQKKwkgKiB3aWxsIHdhaXQgZm9yIGNvbXBsZXRpb24gb2YgYW55IG91 dHN0YW5kaW5nIGZsaXAgdXNpbmcgRFJNcworCSAqIHN5bmNocm9uaXphdGlvbiBldmVudHMuCiAJ ICovCisJaWYgKGFxdWlyZV9nbG9iYWxfbG9jaykgeworCQlyZXQgPSBkb19hcXVpcmVfZ2xvYmFs X2xvY2soZGV2LCBzdGF0ZSk7CisJCWlmIChyZXQpCisJCQlnb3RvIGZhaWxfcGxhbmVzOworCX0K KworCS8qIE11c3QgYmUgc3VjY2VzcyAqLworCVdBUk5fT04ocmV0KTsKKwlyZXR1cm4gcmV0Owor CitmYWlsX3BsYW5lczoKIAlmb3IgKGkgPSAwOyBpIDwgc2V0X2NvdW50OyBpKyspCiAJCWZvciAo aiA9IDA7IGogPCBzZXRbaV0uc3VyZmFjZV9jb3VudDsgaisrKQogCQkJZGNfc3VyZmFjZV9yZWxl YXNlKHNldFtpXS5zdXJmYWNlc1tqXSk7CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZk ZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgewotCQlvbGRfYWNydGNfc3RhdGUgPSB0 b19kbV9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQotCQlpZiAob2xkX2FjcnRjX3N0YXRlLT5z dHJlYW0pCi0JCQlkY19zdHJlYW1fcmVsZWFzZShvbGRfYWNydGNfc3RhdGUtPnN0cmVhbSk7Ci0J fQotCitmYWlsX2NydGNzOgorCWZvciAoaSA9IDA7IGkgPCBzZXRfY291bnQ7IGkrKykKKwkJZGNf c3RyZWFtX3JlbGVhc2Uoc2V0W2ldLnN0cmVhbSk7CiAKLQlpZiAocmV0ICE9IDApIHsKLQkJaWYg KHJldCA9PSAtRURFQURMSykKLQkJCURSTV9ERUJVR19LTVMoIkF0b21pYyBjaGVjayBzdG9wcGVk IGR1ZSB0byB0byBkZWFkbG9jay5cbiIpOwotCQllbHNlIGlmIChyZXQgPT0gLUVJTlRSIHx8IHJl dCA9PSAtRUFHQUlOIHx8IHJldCA9PSAtRVJFU1RBUlRTWVMpCi0JCQlEUk1fREVCVUdfS01TKCJB dG9taWMgY2hlY2sgc3RvcHBlZCBkdWUgdG8gdG8gc2lnbmFsLlxuIik7Ci0JCWVsc2UKLQkJCURS TV9FUlJPUigiQXRvbWljIGNoZWNrIGZhaWxlZC5cbiIpOwotCX0KKwlpZiAocmV0ID09IC1FREVB RExLKQorCQlEUk1fREVCVUdfS01TKCJBdG9taWMgY2hlY2sgc3RvcHBlZCBkdWUgdG8gdG8gZGVh ZGxvY2suXG4iKTsKKwllbHNlIGlmIChyZXQgPT0gLUVJTlRSIHx8IHJldCA9PSAtRUFHQUlOIHx8 IHJldCA9PSAtRVJFU1RBUlRTWVMpCisJCURSTV9ERUJVR19LTVMoIkF0b21pYyBjaGVjayBzdG9w cGVkIGR1ZSB0byB0byBzaWduYWwuXG4iKTsKKwllbHNlCisJCURSTV9FUlJPUigiQXRvbWljIGNo ZWNrIGZhaWxlZCB3aXRoIGVycjogJWQgLlxuIiwgcmV0KTsKIAogCXJldHVybiByZXQ7CiB9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9k bV90eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVf ZG1fdHlwZXMuaAppbmRleCAzNmNiMWM4Li4xMTVkOTA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmgKQEAgLTQw LDcgKzQwLDcgQEAgc3RydWN0ICBkY19zdHJlYW07CiAKIHN0cnVjdCBkbV9wbGFuZV9zdGF0ZSB7 CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBiYXNlOwotCXN0cnVjdCBkY19zdXJmYWNlICpkY19z dXJmYWNlOworCXN0cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlOwogfTsKIAogc3RydWN0IGRtX2Ny dGNfc3RhdGUgewotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1k LWdmeAo=