From: Ville Syrjala Subject: [PATCH] drm/i915: Promote .format_mod_supported() to the lead role Date: Mon, 19 Mar 2018 18:50:17 +0200 Message-ID: <20180319165017.31908-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVw IHRvIG5vdyB3ZSd2ZSB1c2VkIHRoZSBwbGFuZSdzIG1vZGlmaWVyIGxpc3QgYXMgdGhlIHByaW1h cnkKc291cmNlIG9mIGluZm9ybWF0aW9uIGZvciB3aGljaCBtb2RpZmllcnMgYXJlIHN1cHBvcnRl ZCBieSBhCmdpdmVuIHBsYW5lLiBJbiBvcmRlciB0byBhbGxvdyBhdXhpbGlhcnkgbWV0YWRhdGEg dG8gYmUgZW1iZWRkZWQKd2l0aGluIHRoZSBiaXRzIG9mIHRoZSBtb2RpZmllciB3ZSBuZWVkIHRv IHN0b3AgZG9pbmcgdGhhdC4KClRodXMgd2UgaGF2ZSB0byBtYWtlIC5mb3JtYXRfbW9kX3N1cHBv cnRlZCgpIGF3YXJlIG9mIHRoZSBwbGFuZSdzCmNhcGFiaWxpdGllcyBhbmQgZ3JhY2VmdWxseSBk ZWFsIHdpdGggYW55IG1vZGlmaWVyIGJlaW5nIHBhc3NlZAppbiBkaXJlY3RseSBmcm9tIHVzZXJz cGFjZS4KCkNjOiBFcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PgpSZWZlcmVuY2VzOiBodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9kcmktZGV2ZWwvMjAxOC1NYXJjaC8x Njk3ODIuaHRtbApTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDE0NyArKysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgIHwgICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jICB8IDE5NCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCAyMTAgaW5zZXJ0aW9ucygrKSwgMTMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzZTdhYjc1ZTFiNDEuLmQ3MTcwMDRiZTBiOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtODgsMTUgKzg4LDcgQEAgc3RhdGlj IGNvbnN0IHVpbnQzMl90IHNrbF9wcmltYXJ5X2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX1ZZ VVksCiB9OwogCi1zdGF0aWMgY29uc3QgdWludDY0X3Qgc2tsX2Zvcm1hdF9tb2RpZmllcnNfbm9j Y3NbXSA9IHsKLQlJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQsCi0JSTkxNV9GT1JNQVRfTU9EX1lf VElMRUQsCi0JSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQsCi0JRFJNX0ZPUk1BVF9NT0RfTElORUFS LAotCURSTV9GT1JNQVRfTU9EX0lOVkFMSUQKLX07Ci0KLXN0YXRpYyBjb25zdCB1aW50NjRfdCBz a2xfZm9ybWF0X21vZGlmaWVyc19jY3NbXSA9IHsKK3N0YXRpYyBjb25zdCB1aW50NjRfdCBza2xf Zm9ybWF0X21vZGlmaWVyc1tdID0gewogCUk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1MsCiAJ STkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTLAogCUk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCwK QEAgLTEyOTk3LDggKzEyOTg5LDE3IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSkKIAlrZnJlZSh0b19pbnRlbF9wbGFuZShwbGFuZSkpOwogfQogCi1z dGF0aWMgYm9vbCBpOHh4X21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBt b2RpZmllcikKK3N0YXRpYyBib29sIGk4eHhfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3Ry dWN0IGRybV9wbGFuZSAqX3BsYW5lLAorCQkJCQkgICAgdTMyIGZvcm1hdCwgdTY0IG1vZGlmaWVy KQogeworCXN3aXRjaCAobW9kaWZpZXIpIHsKKwljYXNlIERSTV9GT1JNQVRfTU9EX0xJTkVBUjoK KwljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgorCQlicmVhazsKKwlkZWZhdWx0OgorCQly ZXR1cm4gZmFsc2U7CisJfQorCiAJc3dpdGNoIChmb3JtYXQpIHsKIAljYXNlIERSTV9GT1JNQVRf Qzg6CiAJY2FzZSBEUk1fRk9STUFUX1JHQjU2NToKQEAgLTEzMDExLDggKzEzMDEyLDE3IEBAIHN0 YXRpYyBib29sIGk4eHhfbW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1v ZGlmaWVyKQogCX0KIH0KIAotc3RhdGljIGJvb2wgaTk2NV9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90 IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIpCitzdGF0aWMgYm9vbCBpOTY1X3BsYW5lX2Zvcm1h dF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwKKwkJCQkJICAgIHUzMiBm b3JtYXQsIHU2NCBtb2RpZmllcikKIHsKKwlzd2l0Y2ggKG1vZGlmaWVyKSB7CisJY2FzZSBEUk1f Rk9STUFUX01PRF9MSU5FQVI6CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoKKwkJYnJl YWs7CisJZGVmYXVsdDoKKwkJcmV0dXJuIGZhbHNlOworCX0KKwogCXN3aXRjaCAoZm9ybWF0KSB7 CiAJY2FzZSBEUk1fRk9STUFUX0M4OgogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6CkBAIC0xMzAy NywxNyArMTMwMzcsMzcgQEAgc3RhdGljIGJvb2wgaTk2NV9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90 IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIpCiAJfQogfQogCi1zdGF0aWMgYm9vbCBza2xfbW9k X3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQorc3RhdGljIGJv b2wgc2tsX3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFu ZSwKKwkJCQkJICAgdTMyIGZvcm1hdCwgdTY0IG1vZGlmaWVyKQogeworCXN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShfcGxhbmUpOworCisJc3dpdGNoIChtb2RpZmll cikgeworCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTElORUFSOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9E X1hfVElMRUQ6CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKKwljYXNlIEk5MTVfRk9S TUFUX01PRF9ZZl9USUxFRDoKKwkJYnJlYWs7CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxF RF9DQ1M6CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRURfQ0NTOgorCQlpZiAoIXBsYW5l LT5oYXNfY2NzKQorCQkJcmV0dXJuIGZhbHNlOworCQlicmVhazsKKwlkZWZhdWx0OgorCQlyZXR1 cm4gZmFsc2U7CisJfQorCiAJc3dpdGNoIChmb3JtYXQpIHsKIAljYXNlIERSTV9GT1JNQVRfWFJH Qjg4ODg6CiAJY2FzZSBEUk1fRk9STUFUX1hCR1I4ODg4OgogCWNhc2UgRFJNX0ZPUk1BVF9BUkdC ODg4ODoKIAljYXNlIERSTV9GT1JNQVRfQUJHUjg4ODg6Ci0JCWlmIChtb2RpZmllciA9PSBJOTE1 X0ZPUk1BVF9NT0RfWWZfVElMRURfQ0NTIHx8Ci0JCSAgICBtb2RpZmllciA9PSBJOTE1X0ZPUk1B VF9NT0RfWV9USUxFRF9DQ1MpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJLyogZmFsbCB0aHJvdWdoICov CisJCXJldHVybiBtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwKKwkJCW1vZGlm aWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZP Uk1BVF9NT0RfWV9USUxFRCB8fAorCQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJ TEVEIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRF9DQ1MgfHwKKwkJ CW1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1M7CiAJY2FzZSBEUk1fRk9S TUFUX1JHQjU2NToKIAljYXNlIERSTV9GT1JNQVRfWFJHQjIxMDEwMTA6CiAJY2FzZSBEUk1fRk9S TUFUX1hCR1IyMTAxMDEwOgpAQCAtMTMwNDUsNTIgKzEzMDc1LDQ5IEBAIHN0YXRpYyBib29sIHNr bF9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIpCiAJY2Fz ZSBEUk1fRk9STUFUX1lWWVU6CiAJY2FzZSBEUk1fRk9STUFUX1VZVlk6CiAJY2FzZSBEUk1fRk9S TUFUX1ZZVVk6Ci0JCWlmIChtb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpCi0J CQlyZXR1cm4gdHJ1ZTsKLQkJLyogZmFsbCB0aHJvdWdoICovCisJCXJldHVybiBtb2RpZmllciA9 PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwKKwkJCW1vZGlmaWVyID09IEk5MTVfRk9STUFUX01P RF9YX1RJTEVEIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAor CQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOwogCWNhc2UgRFJNX0ZPUk1B VF9DODoKLQkJaWYgKG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUiB8fAotCQkgICAg bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQgfHwKLQkJICAgIG1vZGlmaWVyID09 IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEKQotCQkJcmV0dXJuIHRydWU7Ci0JCS8qIGZhbGwgdGhy b3VnaCAqLworCQlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSIHx8CisJ CQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCB8fAorCQkJbW9kaWZpZXIgPT0g STkxNV9GT1JNQVRfTU9EX1lfVElMRUQ7CiAJZGVmYXVsdDoKIAkJcmV0dXJuIGZhbHNlOwogCX0K IH0KIAotc3RhdGljIGJvb2wgaW50ZWxfcHJpbWFyeV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRl ZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkJCSAgICAgdWludDMyX3QgZm9ybWF0LAot CQkJCQkJICAgICB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29sIGludGVsX2N1cnNvcl9m b3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUsCisJCQkJCSAgICAg IHUzMiBmb3JtYXQsIHU2NCBtb2RpZmllcikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOwotCi0JaWYgKFdBUk5fT04obW9kaWZpZXIg PT0gRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRCkpCi0JCXJldHVybiBmYWxzZTsKLQotCWlmICgobW9k aWZpZXIgPj4gNTYpICE9IERSTV9GT1JNQVRfTU9EX1ZFTkRPUl9JTlRFTCAmJgotCSAgICBtb2Rp ZmllciAhPSBEUk1fRk9STUFUX01PRF9MSU5FQVIpCi0JCXJldHVybiBmYWxzZTsKLQotCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXJldHVybiBza2xfbW9kX3N1cHBvcnRlZChmb3Jt YXQsIG1vZGlmaWVyKTsKLQllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpCi0JCXJl dHVybiBpOTY1X21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Ci0JZWxzZQotCQlyZXR1 cm4gaTh4eF9tb2Rfc3VwcG9ydGVkKGZvcm1hdCwgbW9kaWZpZXIpOworCXJldHVybiBtb2RpZmll ciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgJiYKKwkJZm9ybWF0ID09IERSTV9GT1JNQVRfQVJH Qjg4ODg7CiB9CiAKLXN0YXRpYyBib29sIGludGVsX2N1cnNvcl9wbGFuZV9mb3JtYXRfbW9kX3N1 cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkJCSAgICB1aW50MzJfdCBmb3Jt YXQsCi0JCQkJCQkgICAgdWludDY0X3QgbW9kaWZpZXIpCi17Ci0JaWYgKFdBUk5fT04obW9kaWZp ZXIgPT0gRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRCkpCi0JCXJldHVybiBmYWxzZTsKK3N0YXRpYyBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIHNrbF9wbGFuZV9mdW5jcyA9IHsKKwkudXBkYXRlX3BsYW5l ID0gZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3BsYW5lLAorCS5kaXNhYmxlX3BsYW5lID0gZHJt X2F0b21pY19oZWxwZXJfZGlzYWJsZV9wbGFuZSwKKwkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rl c3Ryb3ksCisJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3By b3BlcnR5LAorCS5hdG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX3NldF9w cm9wZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0 ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0 YXRlLAorCS5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9IHNrbF9wbGFuZV9mb3JtYXRfbW9kX3N1cHBv cnRlZCwKK307CiAKLQlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSICYm IGZvcm1hdCA9PSBEUk1fRk9STUFUX0FSR0I4ODg4OwotfQorc3RhdGljIHN0cnVjdCBkcm1fcGxh bmVfZnVuY3MgaTk2NV9wbGFuZV9mdW5jcyA9IHsKKwkudXBkYXRlX3BsYW5lID0gZHJtX2F0b21p Y19oZWxwZXJfdXBkYXRlX3BsYW5lLAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX2F0b21pY19oZWxw ZXJfZGlzYWJsZV9wbGFuZSwKKwkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCisJLmF0 b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5h dG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eSwKKwku YXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKKwku YXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlLAorCS5mb3Jt YXRfbW9kX3N1cHBvcnRlZCA9IGk5NjVfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCit9Owog Ci1zdGF0aWMgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9wbGFuZV9mdW5jcyA9IHsKK3N0 YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGk4eHhfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0 ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFu ZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCiAJLmRlc3Ryb3kgPSBpbnRlbF9w bGFuZV9kZXN0cm95LApAQCAtMTMwOTgsNyArMTMxMjUsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9w bGFuZV9mdW5jcyBpbnRlbF9wbGFuZV9mdW5jcyA9IHsKIAkuYXRvbWljX3NldF9wcm9wZXJ0eSA9 IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHksCiAJLmF0b21pY19kdXBsaWNhdGVfc3Rh dGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21pY19kZXN0cm95X3N0YXRl ID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKLQkuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBp bnRlbF9wcmltYXJ5X3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAorCS5mb3JtYXRfbW9kX3N1 cHBvcnRlZCA9IGk4eHhfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCiB9OwogCiBzdGF0aWMg aW50CkBAIC0xMzIyMyw3ICsxMzI1MCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X2Z1bmNzIGludGVsX2N1cnNvcl9wbGFuZV9mdW5jcyA9IHsKIAkuYXRvbWljX3NldF9wcm9wZXJ0 eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHksCiAJLmF0b21pY19kdXBsaWNhdGVf c3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21pY19kZXN0cm95X3N0 YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKLQkuZm9ybWF0X21vZF9zdXBwb3J0ZWQg PSBpbnRlbF9jdXJzb3JfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCisJLmZvcm1hdF9tb2Rf c3VwcG9ydGVkID0gaW50ZWxfY3Vyc29yX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAogfTsKIAogc3Rh dGljIGJvb2wgaTl4eF9wbGFuZV9oYXNfZmJjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKQEAgLTEzMzE0LDExICsxMzM0MSwxMCBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0 ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0g c2tsX3ByaW1hcnlfZm9ybWF0czsKIAkJbnVtX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNrbF9wcmlt YXJ5X2Zvcm1hdHMpOworCQltb2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVyczsKIAotCQlp ZiAoc2tsX3BsYW5lX2hhc19jY3MoZGV2X3ByaXYsIHBpcGUsIFBMQU5FX1BSSU1BUlkpKQotCQkJ bW9kaWZpZXJzID0gc2tsX2Zvcm1hdF9tb2RpZmllcnNfY2NzOwotCQllbHNlCi0JCQltb2RpZmll cnMgPSBza2xfZm9ybWF0X21vZGlmaWVyc19ub2NjczsKKwkJcHJpbWFyeS0+aGFzX2NjcyA9IHNr bF9wbGFuZV9oYXNfY2NzKGRldl9wcml2LCBwaXBlLAorCQkJCQkJICAgICBQTEFORV9QUklNQVJZ KTsKIAogCQlwcmltYXJ5LT51cGRhdGVfcGxhbmUgPSBza2xfdXBkYXRlX3BsYW5lOwogCQlwcmlt YXJ5LT5kaXNhYmxlX3BsYW5lID0gc2tsX2Rpc2FibGVfcGxhbmU7CkBAIC0xMzM0MywyMSArMTMz NjksMjIgQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDkpCiAJCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwg JnByaW1hcnktPmJhc2UsCi0JCQkJCSAgICAgICAwLCAmaW50ZWxfcGxhbmVfZnVuY3MsCisJCQkJ CSAgICAgICAwLCAmc2tsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJpbWFyeV9m b3JtYXRzLCBudW1fZm9ybWF0cywKIAkJCQkJICAgICAgIG1vZGlmaWVycywKIAkJCQkJICAgICAg IERSTV9QTEFORV9UWVBFX1BSSU1BUlksCiAJCQkJCSAgICAgICAicGxhbmUgMSVjIiwgcGlwZV9u YW1lKHBpcGUpKTsKIAllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNfRzRY KGRldl9wcml2KSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ ZHJtLCAmcHJpbWFyeS0+YmFzZSwKLQkJCQkJICAgICAgIDAsICZpbnRlbF9wbGFuZV9mdW5jcywK KwkJCQkJICAgICAgIDAsICZpOTY1X3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJp bWFyeV9mb3JtYXRzLCBudW1fZm9ybWF0cywKIAkJCQkJICAgICAgIG1vZGlmaWVycywKIAkJCQkJ ICAgICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlksCiAJCQkJCSAgICAgICAicHJpbWFyeSAlYyIs IHBpcGVfbmFtZShwaXBlKSk7CiAJZWxzZQogCQlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2lu aXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5iYXNlLAotCQkJCQkgICAgICAgMCwgJmludGVs X3BsYW5lX2Z1bmNzLAorCQkJCQkgICAgICAgMCwgSVNfR0VONChkZXZfcHJpdikgPworCQkJCQkg ICAgICAgJmk5NjVfcGxhbmVfZnVuY3MgOiAmaTh4eF9wbGFuZV9mdW5jcywKIAkJCQkJICAgICAg IGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCiAJCQkJCSAgICAgICBtb2RpZmll cnMsCiAJCQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9QUklNQVJZLApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAppbmRleCBhMjE1YWE3OGIwYmUuLmUwYjcwYzU2M2U5ZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKQEAgLTkzNyw2ICs5MzcsNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUgewogCWVu dW0gcGlwZSBwaXBlOwogCWJvb2wgY2FuX3NjYWxlOwogCWJvb2wgaGFzX2ZiYzsKKwlib29sIGhh c19jY3M7CiAJaW50IG1heF9kb3duc2NhbGU7CiAJdWludDMyX3QgZnJvbnRidWZmZXJfYml0Owog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGRiZGNmODUwMzJkZi4uZjRkYmRk NmQxZGRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTI0OCwxNSArMTI0 OCw3IEBAIHN0YXRpYyB1aW50MzJfdCBza2xfcGxhbmVfZm9ybWF0c1tdID0gewogCURSTV9GT1JN QVRfVllVWSwKIH07CiAKLXN0YXRpYyBjb25zdCB1aW50NjRfdCBza2xfcGxhbmVfZm9ybWF0X21v ZGlmaWVyc19ub2Njc1tdID0gewotCUk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCwKLQlJOTE1X0ZP Uk1BVF9NT0RfWV9USUxFRCwKLQlJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCwKLQlEUk1fRk9STUFU X01PRF9MSU5FQVIsCi0JRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRAotfTsKLQotc3RhdGljIGNvbnN0 IHVpbnQ2NF90IHNrbF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzX2Njc1tdID0geworc3RhdGljIGNv bnN0IHVpbnQ2NF90IHNrbF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzW10gPSB7CiAJSTkxNV9GT1JN QVRfTU9EX1lmX1RJTEVEX0NDUywKIAlJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRF9DQ1MsCiAJSTkx NV9GT1JNQVRfTU9EX1lmX1RJTEVELApAQCAtMTI2NiwyNSArMTI1OCw0MSBAQCBzdGF0aWMgY29u c3QgdWludDY0X3Qgc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmllcnNfY2NzW10gPSB7CiAJRFJNX0ZP Uk1BVF9NT0RfSU5WQUxJRAogfTsKIAotc3RhdGljIGJvb2wgZzR4X21vZF9zdXBwb3J0ZWQodWlu dDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29sIGc0eF9zcHJpdGVf Zm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAorCQkJCQkgICAg dTMyIGZvcm1hdCwgdTY0IG1vZGlmaWVyKQogeworCXN3aXRjaCAobW9kaWZpZXIpIHsKKwljYXNl IERSTV9GT1JNQVRfTU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgor CQlicmVhazsKKwlkZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorCiAJc3dpdGNoIChmb3Jt YXQpIHsKIAljYXNlIERSTV9GT1JNQVRfWFJHQjg4ODg6CiAJY2FzZSBEUk1fRk9STUFUX1lVWVY6 CiAJY2FzZSBEUk1fRk9STUFUX1lWWVU6CiAJY2FzZSBEUk1fRk9STUFUX1VZVlk6CiAJY2FzZSBE Uk1fRk9STUFUX1ZZVVk6Ci0JCWlmIChtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIg fHwKLQkJICAgIG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEKQotCQkJcmV0dXJu IHRydWU7Ci0JCS8qIGZhbGwgdGhyb3VnaCAqLworCQlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZP Uk1BVF9NT0RfTElORUFSIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxF RDsKIAlkZWZhdWx0OgogCQlyZXR1cm4gZmFsc2U7CiAJfQogfQogCi1zdGF0aWMgYm9vbCBzbmJf bW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQorc3RhdGlj IGJvb2wgc25iX3Nwcml0ZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpf cGxhbmUsCisJCQkJCSAgICB1MzIgZm9ybWF0LCB1NjQgbW9kaWZpZXIpCiB7CisJc3dpdGNoICht b2RpZmllcikgeworCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTElORUFSOgorCWNhc2UgSTkxNV9GT1JN QVRfTU9EX1hfVElMRUQ6CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCXJldHVybiBmYWxzZTsKKwl9 CisKIAlzd2l0Y2ggKGZvcm1hdCkgewogCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKIAljYXNl IERSTV9GT1JNQVRfWEJHUjg4ODg6CkBAIC0xMjkyLDE3ICsxMzAwLDI0IEBAIHN0YXRpYyBib29s IHNuYl9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIpCiAJ Y2FzZSBEUk1fRk9STUFUX1lWWVU6CiAJY2FzZSBEUk1fRk9STUFUX1VZVlk6CiAJY2FzZSBEUk1f Rk9STUFUX1ZZVVk6Ci0JCWlmIChtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwK LQkJICAgIG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEKQotCQkJcmV0dXJuIHRy dWU7Ci0JCS8qIGZhbGwgdGhyb3VnaCAqLworCQlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1B VF9NT0RfTElORUFSIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDsK IAlkZWZhdWx0OgogCQlyZXR1cm4gZmFsc2U7CiAJfQogfQogCi1zdGF0aWMgYm9vbCB2bHZfbW9k X3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQorc3RhdGljIGJv b2wgdmx2X3Nwcml0ZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpfcGxh bmUsCisJCQkJCSAgICB1MzIgZm9ybWF0LCB1NjQgbW9kaWZpZXIpCiB7CisJc3dpdGNoIChtb2Rp ZmllcikgeworCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTElORUFSOgorCWNhc2UgSTkxNV9GT1JNQVRf TU9EX1hfVElMRUQ6CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCXJldHVybiBmYWxzZTsKKwl9CisK IAlzd2l0Y2ggKGZvcm1hdCkgewogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6CiAJY2FzZSBEUk1f Rk9STUFUX0FCR1I4ODg4OgpAQCAtMTMxNSwyNiArMTMzMCw0NCBAQCBzdGF0aWMgYm9vbCB2bHZf bW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQogCWNhc2Ug RFJNX0ZPUk1BVF9ZVllVOgogCWNhc2UgRFJNX0ZPUk1BVF9VWVZZOgogCWNhc2UgRFJNX0ZPUk1B VF9WWVVZOgotCQlpZiAobW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSIHx8Ci0JCSAg ICBtb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCkKLQkJCXJldHVybiB0cnVlOwot CQkvKiBmYWxsIHRocm91Z2ggKi8KKwkJcmV0dXJuIG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9E X0xJTkVBUiB8fAorCQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQ7CiAJZGVm YXVsdDoKIAkJcmV0dXJuIGZhbHNlOwogCX0KIH0KIAotc3RhdGljIGJvb2wgc2tsX21vZF9zdXBw b3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29sIHNr bF9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUsCisJ CQkJCSAgIHUzMiBmb3JtYXQsIHU2NCBtb2RpZmllcikKIHsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUg KnBsYW5lID0gdG9faW50ZWxfcGxhbmUoX3BsYW5lKTsKKworCXN3aXRjaCAobW9kaWZpZXIpIHsK KwljYXNlIERSTV9GT1JNQVRfTU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJ TEVEOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQ6CisJY2FzZSBJOTE1X0ZPUk1BVF9N T0RfWWZfVElMRUQ6CisJCWJyZWFrOworCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NT OgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEX0NDUzoKKwkJaWYgKCFwbGFuZS0+aGFz X2NjcykKKwkJCXJldHVybiBmYWxzZTsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJcmV0dXJuIGZh bHNlOworCX0KKwogCXN3aXRjaCAoZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4 OgogCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKIAljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6 CiAJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgotCQlpZiAobW9kaWZpZXIgPT0gSTkxNV9GT1JN QVRfTU9EX1lmX1RJTEVEX0NDUyB8fAotCQkgICAgbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9E X1lfVElMRURfQ0NTKQotCQkJcmV0dXJuIHRydWU7Ci0JCS8qIGZhbGwgdGhyb3VnaCAqLworCQly ZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSIHx8CisJCQltb2RpZmllciA9 PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCB8fAorCQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRf TU9EX1lfVElMRUQgfHwKKwkJCW1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCB8 fAorCQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTIHx8CisJCQltb2Rp ZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRURfQ0NTOwogCWNhc2UgRFJNX0ZPUk1BVF9S R0I1NjU6CiAJY2FzZSBEUk1fRk9STUFUX1hSR0IyMTAxMDEwOgogCWNhc2UgRFJNX0ZPUk1BVF9Y QkdSMjEwMTAxMDoKQEAgLTEzNDIsNTIgKzEzNzUsNjEgQEAgc3RhdGljIGJvb2wgc2tsX21vZF9z dXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKIAljYXNlIERSTV9G T1JNQVRfWVZZVToKIAljYXNlIERSTV9GT1JNQVRfVVlWWToKIAljYXNlIERSTV9GT1JNQVRfVllV WToKLQkJaWYgKG1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkKLQkJCXJldHVy biB0cnVlOwotCQkvKiBmYWxsIHRocm91Z2ggKi8KKwkJcmV0dXJuIG1vZGlmaWVyID09IERSTV9G T1JNQVRfTU9EX0xJTkVBUiB8fAorCQkJbW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElM RUQgfHwKKwkJCW1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8CisJCQltb2Rp ZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQ7CiAJY2FzZSBEUk1fRk9STUFUX0M4Ogot CQlpZiAobW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSIHx8Ci0JCSAgICBtb2RpZmll ciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCB8fAotCQkgICAgbW9kaWZpZXIgPT0gSTkxNV9G T1JNQVRfTU9EX1lfVElMRUQpCi0JCQlyZXR1cm4gdHJ1ZTsKLQkJLyogZmFsbCB0aHJvdWdoICov CisJCXJldHVybiBtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwKKwkJCW1vZGlm aWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZP Uk1BVF9NT0RfWV9USUxFRDsKIAlkZWZhdWx0OgogCQlyZXR1cm4gZmFsc2U7CiAJfQogfQogCi1z dGF0aWMgYm9vbCBpbnRlbF9zcHJpdGVfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdWludDMyX3QgZm9ybWF0LAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IG1vZGlmaWVyKQotewotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmRldik7Ci0KLQlp ZiAoV0FSTl9PTihtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9JTlZBTElEKSkKLQkJcmV0dXJu IGZhbHNlOworc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgZzR4X3Nwcml0ZV9m dW5jcyA9IHsKKwkudXBkYXRlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3BsYW5l LAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9wbGFuZSwKKwku ZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCisJLmF0b21pY19nZXRfcHJvcGVydHkgPSBp bnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5hdG9taWNfc2V0X3Byb3BlcnR5ID0g aW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0 ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUg PSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlLAorCS5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9IGc0 eF9zcHJpdGVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCit9OwogCi0JaWYgKChtb2RpZmllciA+PiA1 NikgIT0gRFJNX0ZPUk1BVF9NT0RfVkVORE9SX0lOVEVMICYmCi0JICAgIG1vZGlmaWVyICE9IERS TV9GT1JNQVRfTU9EX0xJTkVBUikKLQkJcmV0dXJuIGZhbHNlOworc3RhdGljIGNvbnN0IHN0cnVj dCBkcm1fcGxhbmVfZnVuY3Mgc25iX3Nwcml0ZV9mdW5jcyA9IHsKKwkudXBkYXRlX3BsYW5lID0g ZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3BsYW5lLAorCS5kaXNhYmxlX3BsYW5lID0gZHJtX2F0 b21pY19oZWxwZXJfZGlzYWJsZV9wbGFuZSwKKwkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ry b3ksCisJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3Bl cnR5LAorCS5hdG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9w ZXJ0eSwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9z dGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRl LAorCS5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9IHNuYl9zcHJpdGVfZm9ybWF0X21vZF9zdXBwb3J0 ZWQsCit9OwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKLQkJcmV0dXJuIHNrbF9t b2Rfc3VwcG9ydGVkKGZvcm1hdCwgbW9kaWZpZXIpOwotCWVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQotCQlyZXR1cm4gdmx2X21vZF9z dXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Ci0JZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA2KQotCQlyZXR1cm4gc25iX21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Ci0J ZWxzZQotCQlyZXR1cm4gZzR4X21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Ci19Citz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyB2bHZfc3ByaXRlX2Z1bmNzID0gewor CS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUsCisJLmRpc2Fi bGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAorCS5kZXN0cm95ID0g aW50ZWxfcGxhbmVfZGVzdHJveSwKKwkuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5l X2F0b21pY19nZXRfcHJvcGVydHksCisJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFu ZV9hdG9taWNfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxf cGxhbmVfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVsX3Bs YW5lX2Rlc3Ryb3lfc3RhdGUsCisJLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gdmx2X3Nwcml0ZV9m b3JtYXRfbW9kX3N1cHBvcnRlZCwKK307CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X2Z1bmNzIGludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyA9IHsKLSAgICAgICAgLnVwZGF0ZV9wbGFu ZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKLSAgICAgICAgLmRpc2FibGVfcGxh bmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAotICAgICAgICAuZGVzdHJveSA9 IGludGVsX3BsYW5lX2Rlc3Ryb3ksCi0gICAgICAgIC5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50 ZWxfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKLSAgICAgICAgLmF0b21pY19zZXRfcHJvcGVy dHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAotICAgICAgICAuYXRvbWljX2R1 cGxpY2F0ZV9zdGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKLSAgICAgICAgLmF0 b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKLSAgICAgICAg LmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gaW50ZWxfc3ByaXRlX3BsYW5lX2Zvcm1hdF9tb2Rfc3Vw cG9ydGVkLAorc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3Mgc2tsX3BsYW5lX2Z1 bmNzID0geworCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUs CisJLmRpc2FibGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAorCS5k ZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKKwkuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGlu dGVsX3BsYW5lX2F0b21pY19nZXRfcHJvcGVydHksCisJLmF0b21pY19zZXRfcHJvcGVydHkgPSBp bnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRl ID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9 IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisJLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gc2ts X3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAogfTsKIAogYm9vbCBza2xfcGxhbmVfaGFzX2Nj cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xNDEzLDYgKzE0NTUsNyBA QCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gTlVMTDsKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwljb25zdCBzdHJ1Y3QgZHJtX3Bs YW5lX2Z1bmNzICpwbGFuZV9mdW5jczsKIAl1bnNpZ25lZCBsb25nIHBvc3NpYmxlX2NydGNzOwog CWNvbnN0IHVpbnQzMl90ICpwbGFuZV9mb3JtYXRzOwogCWNvbnN0IHVpbnQ2NF90ICptb2RpZmll cnM7CkBAIC0xNDM2LDYgKzE0NzksOCBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSA5KSB7CiAJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0cnVlOwogCQlzdGF0ZS0+c2NhbGVy X2lkID0gLTE7CisJCWludGVsX3BsYW5lLT5oYXNfY2NzID0gc2tsX3BsYW5lX2hhc19jY3MoZGV2 X3ByaXYsIHBpcGUsCisJCQkJCQkJIFBMQU5FX1NQUklURTAgKyBwbGFuZSk7CiAKIAkJaW50ZWxf cGxhbmUtPnVwZGF0ZV9wbGFuZSA9IHNrbF91cGRhdGVfcGxhbmU7CiAJCWludGVsX3BsYW5lLT5k aXNhYmxlX3BsYW5lID0gc2tsX2Rpc2FibGVfcGxhbmU7CkBAIC0xNDQzLDExICsxNDg4LDkgQEAg aW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAKIAkJcGxhbmVfZm9ybWF0cyA9IHNrbF9wbGFuZV9mb3JtYXRzOwogCQludW1fcGxhbmVf Zm9ybWF0cyA9IEFSUkFZX1NJWkUoc2tsX3BsYW5lX2Zvcm1hdHMpOworCQltb2RpZmllcnMgPSBz a2xfcGxhbmVfZm9ybWF0X21vZGlmaWVyczsKIAotCQlpZiAoc2tsX3BsYW5lX2hhc19jY3MoZGV2 X3ByaXYsIHBpcGUsIFBMQU5FX1NQUklURTAgKyBwbGFuZSkpCi0JCQltb2RpZmllcnMgPSBza2xf cGxhbmVfZm9ybWF0X21vZGlmaWVyc19jY3M7Ci0JCWVsc2UKLQkJCW1vZGlmaWVycyA9IHNrbF9w bGFuZV9mb3JtYXRfbW9kaWZpZXJzX25vY2NzOworCQlwbGFuZV9mdW5jcyA9ICZza2xfcGxhbmVf ZnVuY3M7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllW SUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7CiAJCWlu dGVsX3BsYW5lLT5tYXhfZG93bnNjYWxlID0gMTsKQEAgLTE0NTksNiArMTUwMiw4IEBAIGludGVs X3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQlwbGFuZV9mb3JtYXRzID0gdmx2X3BsYW5lX2Zvcm1hdHM7CiAJCW51bV9wbGFuZV9mb3JtYXRz ID0gQVJSQVlfU0laRSh2bHZfcGxhbmVfZm9ybWF0cyk7CiAJCW1vZGlmaWVycyA9IGk5eHhfcGxh bmVfZm9ybWF0X21vZGlmaWVyczsKKworCQlwbGFuZV9mdW5jcyA9ICZ2bHZfc3ByaXRlX2Z1bmNz OwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA3KSB7CiAJCWlmIChJU19JVllC UklER0UoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKQEAg LTE0NzUsNiArMTUyMCw4IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlwbGFuZV9mb3JtYXRzID0gc25iX3BsYW5lX2Zvcm1h dHM7CiAJCW51bV9wbGFuZV9mb3JtYXRzID0gQVJSQVlfU0laRShzbmJfcGxhbmVfZm9ybWF0cyk7 CiAJCW1vZGlmaWVycyA9IGk5eHhfcGxhbmVfZm9ybWF0X21vZGlmaWVyczsKKworCQlwbGFuZV9m dW5jcyA9ICZzbmJfc3ByaXRlX2Z1bmNzOwogCX0gZWxzZSB7CiAJCWludGVsX3BsYW5lLT5jYW5f c2NhbGUgPSB0cnVlOwogCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDE2OwpAQCAtMTQ5 MSw2ICsxNTM4LDkgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlwbGFuZV9mb3JtYXRzID0gZzR4X3BsYW5lX2Zvcm1hdHM7 CiAJCQludW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUoZzR4X3BsYW5lX2Zvcm1hdHMpOwog CQl9CisKKwkJcGxhbmVfZnVuY3MgPSBJU19HRU42KGRldl9wcml2KSA/CisJCQkmc25iX3Nwcml0 ZV9mdW5jcyA6ICZnNHhfc3ByaXRlX2Z1bmNzOwogCX0KIAogCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDkpIHsKQEAgLTE1MTYsMTQgKzE1NjYsMTQgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA+PSA5KQogCQlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9w cml2LT5kcm0sICZpbnRlbF9wbGFuZS0+YmFzZSwKLQkJCQkJICAgICAgIHBvc3NpYmxlX2NydGNz LCAmaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzLAorCQkJCQkgICAgICAgcG9zc2libGVfY3J0Y3Ms IHBsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVfZm9ybWF0cywgbnVtX3BsYW5lX2Zvcm1h dHMsCiAJCQkJCSAgICAgICBtb2RpZmllcnMsCiAJCQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9P VkVSTEFZLAogCQkJCQkgICAgICAgInBsYW5lICVkJWMiLCBwbGFuZSArIDIsIHBpcGVfbmFtZShw aXBlKSk7CiAJZWxzZQogCQlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2 LT5kcm0sICZpbnRlbF9wbGFuZS0+YmFzZSwKLQkJCQkJICAgICAgIHBvc3NpYmxlX2NydGNzLCAm aW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzLAorCQkJCQkgICAgICAgcG9zc2libGVfY3J0Y3MsIHBs YW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVfZm9ybWF0cywgbnVtX3BsYW5lX2Zvcm1hdHMs CiAJCQkJCSAgICAgICBtb2RpZmllcnMsCiAJCQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9PVkVS TEFZLAotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK