From: Harry Wentland Subject: [PATCH 10/20] drm/amd/display: rename dscl functions Date: Mon, 16 Oct 2017 16:31:44 -0400 Message-ID: <20171016203154.6401-11-harry.wentland@amd.com> References: <20171016203154.6401-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: <20171016203154.6401-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: Yue Hin Lau RnJvbTogWXVlIEhpbiBMYXUgPFl1ZWhpbi5MYXVAYW1kLmNvbT4KClNpZ25lZC1vZmYtYnk6IFl1 ZSBIaW4gTGF1IDxZdWVoaW4uTGF1QGFtZC5jb20+ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxU b255LkNoZW5nQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxh bmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNu MTBfZHBwLmMgICB8IDEwICstLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEw L2RjbjEwX2RwcC5oICAgfCAgNCArLQogLi4uL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAv ZGNuMTBfZHBwX2RzY2wuYyAgfCA5OCArKysrKysrKysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDU2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9kcHAuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9kcHAuYwppbmRleCA1OTYwZTQ5MTE1 OWQuLjc0ZTdjODJiZGM3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjEwL2RjbjEwX2RwcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kY24xMC9kY24xMF9kcHAuYwpAQCAtMzcyLDcgKzM3Miw3IEBAIHZvaWQgZHBwMV9jbnZfc2V0 dXAgKAogCX0KIH0KIAotdm9pZCBkY24xMF9zZXRfY3Vyc29yX2F0dHJpYnV0ZXMoCit2b2lkIGRw cDFfc2V0X2N1cnNvcl9hdHRyaWJ1dGVzKAogCQlzdHJ1Y3QgZHBwICpkcHBfYmFzZSwKIAkJY29u c3Qgc3RydWN0IGRjX2N1cnNvcl9hdHRyaWJ1dGVzICphdHRyKQogewpAQCAtNDAwLDcgKzQwMCw3 IEBAIHZvaWQgZGNuMTBfc2V0X2N1cnNvcl9hdHRyaWJ1dGVzKAogfQogCiAKLXZvaWQgZGNuMTBf c2V0X2N1cnNvcl9wb3NpdGlvbigKK3ZvaWQgZHBwMV9zZXRfY3Vyc29yX3Bvc2l0aW9uKAogCQlz dHJ1Y3QgZHBwICpkcHBfYmFzZSwKIAkJY29uc3Qgc3RydWN0IGRjX2N1cnNvcl9wb3NpdGlvbiAq cG9zLAogCQljb25zdCBzdHJ1Y3QgZGNfY3Vyc29yX21pX3BhcmFtICpwYXJhbSwKQEAgLTQ0MCwx MyArNDQwLDEzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHBwX2Z1bmNzIGRjbjEwX2RwcF9mdW5j cyA9IHsKIAkJLmlwcF9wcm9ncmFtX2RlZ2FtbWFfcHdsCT0gZHBwMV9zZXRfZGVnYW1tYV9wd2ws CiAJCS5pcHBfc2V0dXAJCQk9IGRwcDFfY252X3NldHVwLAogCQkuaXBwX2Z1bGxfYnlwYXNzCQk9 IGRwcDFfZnVsbF9ieXBhc3MsCi0JCS5zZXRfY3Vyc29yX2F0dHJpYnV0ZXMgPSBkY24xMF9zZXRf Y3Vyc29yX2F0dHJpYnV0ZXMsCi0JCS5zZXRfY3Vyc29yX3Bvc2l0aW9uID0gZGNuMTBfc2V0X2N1 cnNvcl9wb3NpdGlvbiwKKwkJLnNldF9jdXJzb3JfYXR0cmlidXRlcyA9IGRwcDFfc2V0X2N1cnNv cl9hdHRyaWJ1dGVzLAorCQkuc2V0X2N1cnNvcl9wb3NpdGlvbiA9IGRwcDFfc2V0X2N1cnNvcl9w b3NpdGlvbiwKIH07CiAKIHN0YXRpYyBzdHJ1Y3QgZHBwX2NhcHMgZGNuMTBfZHBwX2NhcCA9IHsK IAkuZHNjbF9kYXRhX3Byb2NfZm9ybWF0ID0gRFNDTF9EQVRBX1BSQ0VTU0lOR19GSVhFRF9GT1JN QVQsCi0JLmRzY2xfY2FsY19sYl9udW1fcGFydGl0aW9ucyA9IGRzY2wxX2NhbGNfbGJfbnVtX3Bh cnRpdGlvbnMsCisJLmRzY2xfY2FsY19sYl9udW1fcGFydGl0aW9ucyA9IGRwcDFfZHNjbF9jYWxj X2xiX251bV9wYXJ0aXRpb25zLAogfTsKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX2RwcC5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEw L2RjbjEwX2RwcC5oCmluZGV4IGZlNmMwYWExM2RhNC4uYTk3ODJiMWFiYTQ3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfZHBwLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2RwcC5oCkBAIC0xMjc0 LDEyICsxMjc0LDEyIEBAIGVudW0gZGNuMTBfaW5wdXRfY3NjX3NlbGVjdCB7CiAJSU5QVVRfQ1ND X1NFTEVDVF9DT01BCiB9OwogCi1ib29sIGlzX2xiX2NvbmZfdmFsaWQoCitib29sIGRwcDFfZHNj bF9pc19sYl9jb25mX3ZhbGlkKAogCQlpbnQgY2VpbF92cmF0aW8sCiAJCWludCBudW1fcGFydGl0 aW9ucywKIAkJaW50IHZ0YXBzKTsKIAotdm9pZCBkc2NsMV9jYWxjX2xiX251bV9wYXJ0aXRpb25z KAordm9pZCBkcHAxX2RzY2xfY2FsY19sYl9udW1fcGFydGl0aW9ucygKIAkJY29uc3Qgc3RydWN0 IHNjYWxlcl9kYXRhICpzY2xfZGF0YSwKIAkJZW51bSBsYl9tZW1vcnlfY29uZmlnIGxiX2NvbmZp ZywKIAkJaW50ICpudW1fcGFydF95LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjbjEwL2RjbjEwX2RwcF9kc2NsLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGNuMTAvZGNuMTBfZHBwX2RzY2wuYwppbmRleCBiNDQzYTkwOTc0YjkuLmNiYWQz NjQxMGIzMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEw L2RjbjEwX2RwcF9kc2NsLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj bjEwL2RjbjEwX2RwcF9kc2NsLmMKQEAgLTg1LDcgKzg1LDcgQEAgZW51bSBkc2NsX21vZGVfc2Vs IHsKIAlEU0NMX01PREVfRFNDTF9CWVBBU1MgPSA2CiB9OwogCi1zdGF0aWMgdm9pZCBkcHBfc2V0 X292ZXJzY2FuKAorc3RhdGljIHZvaWQgZHBwMV9kc2NsX3NldF9vdmVyc2NhbigKIAlzdHJ1Y3Qg ZGNuMTBfZHBwICpkcHAsCiAJY29uc3Qgc3RydWN0IHNjYWxlcl9kYXRhICpkYXRhKQogewpAQCAt MTEzLDcgKzExMyw3IEBAIHN0YXRpYyB2b2lkIGRwcF9zZXRfb3ZlcnNjYW4oCiAJCUVYVF9PVkVS U0NBTl9UT1AsIHRvcCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRwcF9zZXRfb3RnX2JsYW5rKAorc3Rh dGljIHZvaWQgZHBwMV9kc2NsX3NldF9vdGdfYmxhbmsoCiAJCXN0cnVjdCBkY24xMF9kcHAgKmRw cCwgY29uc3Qgc3RydWN0IHNjYWxlcl9kYXRhICpkYXRhKQogewogCXVpbnQzMl90IGhfYmxhbmtf c3RhcnQgPSBkYXRhLT5oX2FjdGl2ZTsKQEAgLTEzMCw3ICsxMzAsNyBAQCBzdGF0aWMgdm9pZCBk cHBfc2V0X290Z19ibGFuaygKIAkJCU9UR19WX0JMQU5LX0VORCwgdl9ibGFua19lbmQpOwogfQog Ci1zdGF0aWMgaW50IGdldF9waXhlbF9kZXB0aF92YWwoZW51bSBsYl9waXhlbF9kZXB0aCBkZXB0 aCkKK3N0YXRpYyBpbnQgZHBwMV9kc2NsX2dldF9waXhlbF9kZXB0aF92YWwoZW51bSBsYl9waXhl bF9kZXB0aCBkZXB0aCkKIHsKIAlpZiAoZGVwdGggPT0gTEJfUElYRUxfREVQVEhfMzBCUFApCiAJ CXJldHVybiAwOyAvKiAxMCBicGMgKi8KQEAgLTE0Niw3ICsxNDYsNyBAQCBzdGF0aWMgaW50IGdl dF9waXhlbF9kZXB0aF92YWwoZW51bSBsYl9waXhlbF9kZXB0aCBkZXB0aCkKIAl9CiB9CiAKLXN0 YXRpYyBib29sIGlzX3ZpZGVvX2Zvcm1hdChlbnVtIHBpeGVsX2Zvcm1hdCBmb3JtYXQpCitzdGF0 aWMgYm9vbCBkcHAxX2RzY2xfaXNfdmlkZW9fZm9ybWF0KGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1h dCkKIHsKIAlpZiAoZm9ybWF0ID49IFBJWEVMX0ZPUk1BVF9WSURFT19CRUdJTgogCQkJJiYgZm9y bWF0IDw9IFBJWEVMX0ZPUk1BVF9WSURFT19FTkQpCkBAIC0xNTUsNyArMTU1LDcgQEAgc3RhdGlj IGJvb2wgaXNfdmlkZW9fZm9ybWF0KGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCkKIAkJcmV0dXJu IGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBpc180MjBfZm9ybWF0KGVudW0gcGl4ZWxfZm9ybWF0 IGZvcm1hdCkKK3N0YXRpYyBib29sIGRwcDFfZHNjbF9pc180MjBfZm9ybWF0KGVudW0gcGl4ZWxf Zm9ybWF0IGZvcm1hdCkKIHsKIAlpZiAoZm9ybWF0ID09IFBJWEVMX0ZPUk1BVF80MjBCUFA4IHx8 CiAJCQlmb3JtYXQgPT0gUElYRUxfRk9STUFUXzQyMEJQUDEwKQpAQCAtMTY0LDcgKzE2NCw3IEBA IHN0YXRpYyBib29sIGlzXzQyMF9mb3JtYXQoZW51bSBwaXhlbF9mb3JtYXQgZm9ybWF0KQogCQly ZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBlbnVtIGRzY2xfbW9kZV9zZWwgZ2V0X2RzY2xfbW9k ZSgKK3N0YXRpYyBlbnVtIGRzY2xfbW9kZV9zZWwgZHBwMV9kc2NsX2dldF9kc2NsX21vZGUoCiAJ CXN0cnVjdCBkcHAgKmRwcF9iYXNlLAogCQljb25zdCBzdHJ1Y3Qgc2NhbGVyX2RhdGEgKmRhdGEs CiAJCWJvb2wgZGJnX2Fsd2F5c19zY2FsZSkKQEAgLTE4NCw4ICsxODQsOCBAQCBzdGF0aWMgZW51 bSBkc2NsX21vZGVfc2VsIGdldF9kc2NsX21vZGUoCiAJCQkmJiAhZGJnX2Fsd2F5c19zY2FsZSkK IAkJcmV0dXJuIERTQ0xfTU9ERV9TQ0FMSU5HXzQ0NF9CWVBBU1M7CiAKLQlpZiAoIWlzXzQyMF9m b3JtYXQoZGF0YS0+Zm9ybWF0KSkgewotCQlpZiAoaXNfdmlkZW9fZm9ybWF0KGRhdGEtPmZvcm1h dCkpCisJaWYgKCFkcHAxX2RzY2xfaXNfNDIwX2Zvcm1hdChkYXRhLT5mb3JtYXQpKSB7CisJCWlm IChkcHAxX2RzY2xfaXNfdmlkZW9fZm9ybWF0KGRhdGEtPmZvcm1hdCkpCiAJCQlyZXR1cm4gRFND TF9NT0RFX1NDQUxJTkdfNDQ0X1lDQkNSX0VOQUJMRTsKIAkJZWxzZQogCQkJcmV0dXJuIERTQ0xf TU9ERV9TQ0FMSU5HXzQ0NF9SR0JfRU5BQkxFOwpAQCAtMTk4LDcgKzE5OCw3IEBAIHN0YXRpYyBl bnVtIGRzY2xfbW9kZV9zZWwgZ2V0X2RzY2xfbW9kZSgKIAlyZXR1cm4gRFNDTF9NT0RFX1NDQUxJ TkdfNDIwX1lDQkNSX0VOQUJMRTsKIH0KIAotc3RhdGljIHZvaWQgZHBwX3NldF9sYigKK3N0YXRp YyB2b2lkIGRwcDFfZHNjbF9zZXRfbGIoCiAJc3RydWN0IGRjbjEwX2RwcCAqZHBwLAogCWNvbnN0 IHN0cnVjdCBsaW5lX2J1ZmZlcl9wYXJhbXMgKmxiX3BhcmFtcywKIAllbnVtIGxiX21lbW9yeV9j b25maWcgbWVtX3NpemVfY29uZmlnKQpAQCAtMjA2LDcgKzIwNiw3IEBAIHN0YXRpYyB2b2lkIGRw cF9zZXRfbGIoCiAJLyogTEIgKi8KIAlpZiAoZHBwLT5iYXNlLmNhcHMtPmRzY2xfZGF0YV9wcm9j X2Zvcm1hdCA9PSBEU0NMX0RBVEFfUFJDRVNTSU5HX0ZJWEVEX0ZPUk1BVCkgewogCQkvKiBEU0NM IGNhcHM6IHBpeGVsIGRhdGEgcHJvY2Vzc2VkIGluIGZpeGVkIGZvcm1hdCAqLwotCQl1aW50MzJf dCBwaXhlbF9kZXB0aCA9IGdldF9waXhlbF9kZXB0aF92YWwobGJfcGFyYW1zLT5kZXB0aCk7CisJ CXVpbnQzMl90IHBpeGVsX2RlcHRoID0gZHBwMV9kc2NsX2dldF9waXhlbF9kZXB0aF92YWwobGJf cGFyYW1zLT5kZXB0aCk7CiAJCXVpbnQzMl90IGR5bl9waXhfZGVwdGggPSBsYl9wYXJhbXMtPmR5 bmFtaWNfcGl4ZWxfZGVwdGg7CiAKIAkJUkVHX1NFVF83KExCX0RBVEFfRk9STUFULCAwLApAQCAt MjI0LDcgKzIyNCw3IEBAIHN0YXRpYyB2b2lkIGRwcF9zZXRfbGIoCiAJCUxCX01BWF9QQVJUSVRJ T05TLCA2Myk7CiB9CiAKLXN0YXRpYyBjb25zdCB1aW50MTZfdCAqZ2V0X2ZpbHRlcl9jb2VmZnNf NjRwKGludCB0YXBzLCBzdHJ1Y3QgZml4ZWQzMV8zMiByYXRpbykKK3N0YXRpYyBjb25zdCB1aW50 MTZfdCAqZHBwMV9kc2NsX2dldF9maWx0ZXJfY29lZmZzXzY0cChpbnQgdGFwcywgc3RydWN0IGZp eGVkMzFfMzIgcmF0aW8pCiB7CiAJaWYgKHRhcHMgPT0gOCkKIAkJcmV0dXJuIGdldF9maWx0ZXJf OHRhcF82NHAocmF0aW8pOwpAQCAtMjQ5LDcgKzI0OSw3IEBAIHN0YXRpYyBjb25zdCB1aW50MTZf dCAqZ2V0X2ZpbHRlcl9jb2VmZnNfNjRwKGludCB0YXBzLCBzdHJ1Y3QgZml4ZWQzMV8zMiByYXRp bykKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGRwcF9zZXRfc2NhbGVyX2ZpbHRlcigKK3N0YXRpYyB2 b2lkIGRwcDFfZHNjbF9zZXRfc2NhbGVyX2ZpbHRlcigKIAkJc3RydWN0IGRjbjEwX2RwcCAqZHBw LAogCQl1aW50MzJfdCB0YXBzLAogCQllbnVtIGRjbjEwX2NvZWZfZmlsdGVyX3R5cGVfc2VsIGZp bHRlcl90eXBlLApAQCAtMjg3LDcgKzI4Nyw3IEBAIHN0YXRpYyB2b2lkIGRwcF9zZXRfc2NhbGVy X2ZpbHRlcigKIAogfQogCi1zdGF0aWMgdm9pZCBkcHBfc2V0X3NjbF9maWx0ZXIoCitzdGF0aWMg dm9pZCBkcHAxX2RzY2xfc2V0X3NjbF9maWx0ZXIoCiAJCXN0cnVjdCBkY24xMF9kcHAgKmRwcCwK IAkJY29uc3Qgc3RydWN0IHNjYWxlcl9kYXRhICpzY2xfZGF0YSwKIAkJYm9vbCBjaHJvbWFfY29l Zl9tb2RlKQpAQCAtMzI1LDE4ICszMjUsMTggQEAgc3RhdGljIHZvaWQgZHBwX3NldF9zY2xfZmls dGVyKAogCWlmICghdl8ydGFwX2hhcmRjb2RlX2NvZWZfZW4gfHwgIWhfMnRhcF9oYXJkY29kZV9j b2VmX2VuKSB7CiAJCWJvb2wgZmlsdGVyX3VwZGF0ZWQgPSBmYWxzZTsKIAotCQlmaWx0ZXJfaCA9 IGdldF9maWx0ZXJfY29lZmZzXzY0cCgKKwkJZmlsdGVyX2ggPSBkcHAxX2RzY2xfZ2V0X2ZpbHRl cl9jb2VmZnNfNjRwKAogCQkJCXNjbF9kYXRhLT50YXBzLmhfdGFwcywgc2NsX2RhdGEtPnJhdGlv cy5ob3J6KTsKLQkJZmlsdGVyX3YgPSBnZXRfZmlsdGVyX2NvZWZmc182NHAoCisJCWZpbHRlcl92 ID0gZHBwMV9kc2NsX2dldF9maWx0ZXJfY29lZmZzXzY0cCgKIAkJCQlzY2xfZGF0YS0+dGFwcy52 X3RhcHMsIHNjbF9kYXRhLT5yYXRpb3MudmVydCk7CiAKIAkJZmlsdGVyX3VwZGF0ZWQgPSAoZmls dGVyX2ggJiYgKGZpbHRlcl9oICE9IGRwcC0+ZmlsdGVyX2gpKQogCQkJCXx8IChmaWx0ZXJfdiAm JiAoZmlsdGVyX3YgIT0gZHBwLT5maWx0ZXJfdikpOwogCiAJCWlmIChjaHJvbWFfY29lZl9tb2Rl KSB7Ci0JCQlmaWx0ZXJfaF9jID0gZ2V0X2ZpbHRlcl9jb2VmZnNfNjRwKAorCQkJZmlsdGVyX2hf YyA9IGRwcDFfZHNjbF9nZXRfZmlsdGVyX2NvZWZmc182NHAoCiAJCQkJCXNjbF9kYXRhLT50YXBz LmhfdGFwc19jLCBzY2xfZGF0YS0+cmF0aW9zLmhvcnpfYyk7Ci0JCQlmaWx0ZXJfdl9jID0gZ2V0 X2ZpbHRlcl9jb2VmZnNfNjRwKAorCQkJZmlsdGVyX3ZfYyA9IGRwcDFfZHNjbF9nZXRfZmlsdGVy X2NvZWZmc182NHAoCiAJCQkJCXNjbF9kYXRhLT50YXBzLnZfdGFwc19jLCBzY2xfZGF0YS0+cmF0 aW9zLnZlcnRfYyk7CiAJCQlmaWx0ZXJfdXBkYXRlZCA9IGZpbHRlcl91cGRhdGVkIHx8IChmaWx0 ZXJfaF9jICYmIChmaWx0ZXJfaF9jICE9IGRwcC0+ZmlsdGVyX2hfYykpCiAJCQkJCQkJfHwgKGZp bHRlcl92X2MgJiYgKGZpbHRlcl92X2MgIT0gZHBwLT5maWx0ZXJfdl9jKSk7CkBAIC0zNDYsMjUg KzM0NiwyNSBAQCBzdGF0aWMgdm9pZCBkcHBfc2V0X3NjbF9maWx0ZXIoCiAJCQl1aW50MzJfdCBz Y2xfbW9kZSA9IFJFR19SRUFEKFNDTF9NT0RFKTsKIAogCQkJaWYgKCFoXzJ0YXBfaGFyZGNvZGVf Y29lZl9lbiAmJiBmaWx0ZXJfaCkgewotCQkJCWRwcF9zZXRfc2NhbGVyX2ZpbHRlcigKKwkJCQlk cHAxX2RzY2xfc2V0X3NjYWxlcl9maWx0ZXIoCiAJCQkJCWRwcCwgc2NsX2RhdGEtPnRhcHMuaF90 YXBzLAogCQkJCQlTQ0xfQ09FRl9MVU1BX0hPUlpfRklMVEVSLCBmaWx0ZXJfaCk7CiAJCQl9CiAJ CQlkcHAtPmZpbHRlcl9oID0gZmlsdGVyX2g7CiAJCQlpZiAoIXZfMnRhcF9oYXJkY29kZV9jb2Vm X2VuICYmIGZpbHRlcl92KSB7Ci0JCQkJZHBwX3NldF9zY2FsZXJfZmlsdGVyKAorCQkJCWRwcDFf ZHNjbF9zZXRfc2NhbGVyX2ZpbHRlcigKIAkJCQkJZHBwLCBzY2xfZGF0YS0+dGFwcy52X3RhcHMs CiAJCQkJCVNDTF9DT0VGX0xVTUFfVkVSVF9GSUxURVIsIGZpbHRlcl92KTsKIAkJCX0KIAkJCWRw cC0+ZmlsdGVyX3YgPSBmaWx0ZXJfdjsKIAkJCWlmIChjaHJvbWFfY29lZl9tb2RlKSB7CiAJCQkJ aWYgKCFoXzJ0YXBfaGFyZGNvZGVfY29lZl9lbiAmJiBmaWx0ZXJfaF9jKSB7Ci0JCQkJCWRwcF9z ZXRfc2NhbGVyX2ZpbHRlcigKKwkJCQkJZHBwMV9kc2NsX3NldF9zY2FsZXJfZmlsdGVyKAogCQkJ CQkJZHBwLCBzY2xfZGF0YS0+dGFwcy5oX3RhcHNfYywKIAkJCQkJCVNDTF9DT0VGX0NIUk9NQV9I T1JaX0ZJTFRFUiwgZmlsdGVyX2hfYyk7CiAJCQkJfQogCQkJCWlmICghdl8ydGFwX2hhcmRjb2Rl X2NvZWZfZW4gJiYgZmlsdGVyX3ZfYykgewotCQkJCQlkcHBfc2V0X3NjYWxlcl9maWx0ZXIoCisJ CQkJCWRwcDFfZHNjbF9zZXRfc2NhbGVyX2ZpbHRlcigKIAkJCQkJCWRwcCwgc2NsX2RhdGEtPnRh cHMudl90YXBzX2MsCiAJCQkJCQlTQ0xfQ09FRl9DSFJPTUFfVkVSVF9GSUxURVIsIGZpbHRlcl92 X2MpOwogCQkJCX0KQEAgLTM4NCw3ICszODQsNyBAQCBzdGF0aWMgdm9pZCBkcHBfc2V0X3NjbF9m aWx0ZXIoCiAJfQogfQogCi1zdGF0aWMgaW50IGdldF9sYl9kZXB0aF9icGMoZW51bSBsYl9waXhl bF9kZXB0aCBkZXB0aCkKK3N0YXRpYyBpbnQgZHBwMV9kc2NsX2dldF9sYl9kZXB0aF9icGMoZW51 bSBsYl9waXhlbF9kZXB0aCBkZXB0aCkKIHsKIAlpZiAoZGVwdGggPT0gTEJfUElYRUxfREVQVEhf MzBCUFApCiAJCXJldHVybiAxMDsKQEAgLTQwMCw3ICs0MDAsNyBAQCBzdGF0aWMgaW50IGdldF9s Yl9kZXB0aF9icGMoZW51bSBsYl9waXhlbF9kZXB0aCBkZXB0aCkKIAl9CiB9CiAKLXZvaWQgZHNj bDFfY2FsY19sYl9udW1fcGFydGl0aW9ucygKK3ZvaWQgZHBwMV9kc2NsX2NhbGNfbGJfbnVtX3Bh cnRpdGlvbnMoCiAJCWNvbnN0IHN0cnVjdCBzY2FsZXJfZGF0YSAqc2NsX2RhdGEsCiAJCWVudW0g bGJfbWVtb3J5X2NvbmZpZyBsYl9jb25maWcsCiAJCWludCAqbnVtX3BhcnRfeSwKQEAgLTQxMCw3 ICs0MTAsNyBAQCB2b2lkIGRzY2wxX2NhbGNfbGJfbnVtX3BhcnRpdGlvbnMoCiAJCQlzY2xfZGF0 YS0+dmlld3BvcnQud2lkdGggOiBzY2xfZGF0YS0+cmVjb3V0LndpZHRoOwogCWludCBsaW5lX3Np emVfYyA9IHNjbF9kYXRhLT52aWV3cG9ydF9jLndpZHRoIDwgc2NsX2RhdGEtPnJlY291dC53aWR0 aCA/CiAJCQlzY2xfZGF0YS0+dmlld3BvcnRfYy53aWR0aCA6IHNjbF9kYXRhLT5yZWNvdXQud2lk dGg7Ci0JaW50IGxiX2JwYyA9IGdldF9sYl9kZXB0aF9icGMoc2NsX2RhdGEtPmxiX3BhcmFtcy5k ZXB0aCk7CisJaW50IGxiX2JwYyA9IGRwcDFfZHNjbF9nZXRfbGJfZGVwdGhfYnBjKHNjbF9kYXRh LT5sYl9wYXJhbXMuZGVwdGgpOwogCWludCBtZW1vcnlfbGluZV9zaXplX3kgPSAobGluZV9zaXpl ICogbGJfYnBjICsgNzEpIC8gNzI7IC8qICs3MSB0byBjZWlsICovCiAJaW50IG1lbW9yeV9saW5l X3NpemVfYyA9IChsaW5lX3NpemVfYyAqIGxiX2JwYyArIDcxKSAvIDcyOyAvKiArNzEgdG8gY2Vp bCAqLwogCWludCBtZW1vcnlfbGluZV9zaXplX2EgPSAobGluZV9zaXplICsgNSkgLyA2OyAvKiAr NSB0byBjZWlsICovCkBAIC00NDksNyArNDQ5LDcgQEAgdm9pZCBkc2NsMV9jYWxjX2xiX251bV9w YXJ0aXRpb25zKAogCiB9CiAKLWJvb2wgaXNfbGJfY29uZl92YWxpZChpbnQgY2VpbF92cmF0aW8s IGludCBudW1fcGFydGl0aW9ucywgaW50IHZ0YXBzKQorYm9vbCBkcHAxX2RzY2xfaXNfbGJfY29u Zl92YWxpZChpbnQgY2VpbF92cmF0aW8sIGludCBudW1fcGFydGl0aW9ucywgaW50IHZ0YXBzKQog ewogCWlmIChjZWlsX3ZyYXRpbyA+IDIpCiAJCXJldHVybiB2dGFwcyA8PSAobnVtX3BhcnRpdGlv bnMgLSBjZWlsX3ZyYXRpbyArIDIpOwpAQCAtNDU4LDcgKzQ1OCw3IEBAIGJvb2wgaXNfbGJfY29u Zl92YWxpZChpbnQgY2VpbF92cmF0aW8sIGludCBudW1fcGFydGl0aW9ucywgaW50IHZ0YXBzKQog fQogCiAvKmZpbmQgZmlyc3QgbWF0Y2ggY29uZmlndXJhdGlvbiB3aGljaCBtZWV0cyB0aGUgbWlu IHJlcXVpcmVkIGxiIHNpemUqLwotc3RhdGljIGVudW0gbGJfbWVtb3J5X2NvbmZpZyBmaW5kX2xi X21lbW9yeV9jb25maWcoc3RydWN0IGRjbjEwX2RwcCAqZHBwLAorc3RhdGljIGVudW0gbGJfbWVt b3J5X2NvbmZpZyBkcHAxX2RzY2xfZmluZF9sYl9tZW1vcnlfY29uZmlnKHN0cnVjdCBkY24xMF9k cHAgKmRwcCwKIAkJY29uc3Qgc3RydWN0IHNjYWxlcl9kYXRhICpzY2xfZGF0YSkKIHsKIAlpbnQg bnVtX3BhcnRfeSwgbnVtX3BhcnRfYzsKQEAgLTQ3NCwxNSArNDc0LDE1IEBAIHN0YXRpYyBlbnVt IGxiX21lbW9yeV9jb25maWcgZmluZF9sYl9tZW1vcnlfY29uZmlnKHN0cnVjdCBkY24xMF9kcHAg KmRwcCwKIAlkcHAtPmJhc2UuY2Fwcy0+ZHNjbF9jYWxjX2xiX251bV9wYXJ0aXRpb25zKAogCQkJ c2NsX2RhdGEsIExCX01FTU9SWV9DT05GSUdfMSwgJm51bV9wYXJ0X3ksICZudW1fcGFydF9jKTsK IAotCWlmIChpc19sYl9jb25mX3ZhbGlkKGNlaWxfdnJhdGlvLCBudW1fcGFydF95LCB2dGFwcykK LQkJCSYmIGlzX2xiX2NvbmZfdmFsaWQoY2VpbF92cmF0aW9fYywgbnVtX3BhcnRfYywgdnRhcHNf YykpCisJaWYgKGRwcDFfZHNjbF9pc19sYl9jb25mX3ZhbGlkKGNlaWxfdnJhdGlvLCBudW1fcGFy dF95LCB2dGFwcykKKwkJCSYmIGRwcDFfZHNjbF9pc19sYl9jb25mX3ZhbGlkKGNlaWxfdnJhdGlv X2MsIG51bV9wYXJ0X2MsIHZ0YXBzX2MpKQogCQlyZXR1cm4gTEJfTUVNT1JZX0NPTkZJR18xOwog CiAJZHBwLT5iYXNlLmNhcHMtPmRzY2xfY2FsY19sYl9udW1fcGFydGl0aW9ucygKIAkJCXNjbF9k YXRhLCBMQl9NRU1PUllfQ09ORklHXzIsICZudW1fcGFydF95LCAmbnVtX3BhcnRfYyk7CiAKLQlp ZiAoaXNfbGJfY29uZl92YWxpZChjZWlsX3ZyYXRpbywgbnVtX3BhcnRfeSwgdnRhcHMpCi0JCQkm JiBpc19sYl9jb25mX3ZhbGlkKGNlaWxfdnJhdGlvX2MsIG51bV9wYXJ0X2MsIHZ0YXBzX2MpKQor CWlmIChkcHAxX2RzY2xfaXNfbGJfY29uZl92YWxpZChjZWlsX3ZyYXRpbywgbnVtX3BhcnRfeSwg dnRhcHMpCisJCQkmJiBkcHAxX2RzY2xfaXNfbGJfY29uZl92YWxpZChjZWlsX3ZyYXRpb19jLCBu dW1fcGFydF9jLCB2dGFwc19jKSkKIAkJcmV0dXJuIExCX01FTU9SWV9DT05GSUdfMjsKIAogCWlm IChzY2xfZGF0YS0+Zm9ybWF0ID09IFBJWEVMX0ZPUk1BVF80MjBCUFA4CkBAIC00OTAsOCArNDkw LDggQEAgc3RhdGljIGVudW0gbGJfbWVtb3J5X2NvbmZpZyBmaW5kX2xiX21lbW9yeV9jb25maWco c3RydWN0IGRjbjEwX2RwcCAqZHBwLAogCQlkcHAtPmJhc2UuY2Fwcy0+ZHNjbF9jYWxjX2xiX251 bV9wYXJ0aXRpb25zKAogCQkJCXNjbF9kYXRhLCBMQl9NRU1PUllfQ09ORklHXzMsICZudW1fcGFy dF95LCAmbnVtX3BhcnRfYyk7CiAKLQkJaWYgKGlzX2xiX2NvbmZfdmFsaWQoY2VpbF92cmF0aW8s IG51bV9wYXJ0X3ksIHZ0YXBzKQotCQkJCSYmIGlzX2xiX2NvbmZfdmFsaWQoY2VpbF92cmF0aW9f YywgbnVtX3BhcnRfYywgdnRhcHNfYykpCisJCWlmIChkcHAxX2RzY2xfaXNfbGJfY29uZl92YWxp ZChjZWlsX3ZyYXRpbywgbnVtX3BhcnRfeSwgdnRhcHMpCisJCQkJJiYgZHBwMV9kc2NsX2lzX2xi X2NvbmZfdmFsaWQoY2VpbF92cmF0aW9fYywgbnVtX3BhcnRfYywgdnRhcHNfYykpCiAJCQlyZXR1 cm4gTEJfTUVNT1JZX0NPTkZJR18zOwogCX0KIApAQCAtNDk5LDM0ICs0OTksMzQgQEAgc3RhdGlj IGVudW0gbGJfbWVtb3J5X2NvbmZpZyBmaW5kX2xiX21lbW9yeV9jb25maWcoc3RydWN0IGRjbjEw X2RwcCAqZHBwLAogCQkJc2NsX2RhdGEsIExCX01FTU9SWV9DT05GSUdfMCwgJm51bV9wYXJ0X3ks ICZudW1fcGFydF9jKTsKIAogCS8qRW5zdXJlIHdlIGNhbiBzdXBwb3J0IHRoZSByZXF1ZXN0ZWQg bnVtYmVyIG9mIHZ0YXBzKi8KLQlBU1NFUlQoaXNfbGJfY29uZl92YWxpZChjZWlsX3ZyYXRpbywg bnVtX3BhcnRfeSwgdnRhcHMpCi0JCQkmJiBpc19sYl9jb25mX3ZhbGlkKGNlaWxfdnJhdGlvX2Ms IG51bV9wYXJ0X2MsIHZ0YXBzX2MpKTsKKwlBU1NFUlQoZHBwMV9kc2NsX2lzX2xiX2NvbmZfdmFs aWQoY2VpbF92cmF0aW8sIG51bV9wYXJ0X3ksIHZ0YXBzKQorCQkJJiYgZHBwMV9kc2NsX2lzX2xi X2NvbmZfdmFsaWQoY2VpbF92cmF0aW9fYywgbnVtX3BhcnRfYywgdnRhcHNfYykpOwogCiAJcmV0 dXJuIExCX01FTU9SWV9DT05GSUdfMDsKIH0KIAotdm9pZCBkcHBfc2V0X3NjYWxlcl9hdXRvX3Nj YWxlKAordm9pZCBkcHAxX2RzY2xfc2V0X3NjYWxlcl9hdXRvX3NjYWxlKAogCXN0cnVjdCBkcHAg KmRwcF9iYXNlLAogCWNvbnN0IHN0cnVjdCBzY2FsZXJfZGF0YSAqc2NsX2RhdGEpCiB7CiAJZW51 bSBsYl9tZW1vcnlfY29uZmlnIGxiX2NvbmZpZzsKIAlzdHJ1Y3QgZGNuMTBfZHBwICpkcHAgPSBU T19EQ04xMF9EUFAoZHBwX2Jhc2UpOwotCWVudW0gZHNjbF9tb2RlX3NlbCBkc2NsX21vZGUgPSBn ZXRfZHNjbF9tb2RlKAorCWVudW0gZHNjbF9tb2RlX3NlbCBkc2NsX21vZGUgPSBkcHAxX2RzY2xf Z2V0X2RzY2xfbW9kZSgKIAkJCWRwcF9iYXNlLCBzY2xfZGF0YSwgZHBwX2Jhc2UtPmN0eC0+ZGMt PmRlYnVnLmFsd2F5c19zY2FsZSk7CiAJYm9vbCB5Y2JjciA9IHNjbF9kYXRhLT5mb3JtYXQgPj0g UElYRUxfRk9STUFUX1ZJREVPX0JFR0lOCiAJCQkJJiYgc2NsX2RhdGEtPmZvcm1hdCA8PSBQSVhF TF9GT1JNQVRfVklERU9fRU5EOwogCi0JZHBwX3NldF9vdmVyc2NhbihkcHAsIHNjbF9kYXRhKTsK KwlkcHAxX2RzY2xfc2V0X292ZXJzY2FuKGRwcCwgc2NsX2RhdGEpOwogCi0JZHBwX3NldF9vdGdf YmxhbmsoZHBwLCBzY2xfZGF0YSk7CisJZHBwMV9kc2NsX3NldF9vdGdfYmxhbmsoZHBwLCBzY2xf ZGF0YSk7CiAKIAlSRUdfVVBEQVRFKFNDTF9NT0RFLCBEU0NMX01PREUsIGRzY2xfbW9kZSk7CiAK IAlpZiAoZHNjbF9tb2RlID09IERTQ0xfTU9ERV9EU0NMX0JZUEFTUykKIAkJcmV0dXJuOwogCi0J bGJfY29uZmlnID0gIGZpbmRfbGJfbWVtb3J5X2NvbmZpZyhkcHAsIHNjbF9kYXRhKTsKLQlkcHBf c2V0X2xiKGRwcCwgJnNjbF9kYXRhLT5sYl9wYXJhbXMsIGxiX2NvbmZpZyk7CisJbGJfY29uZmln ID0gIGRwcDFfZHNjbF9maW5kX2xiX21lbW9yeV9jb25maWcoZHBwLCBzY2xfZGF0YSk7CisJZHBw MV9kc2NsX3NldF9sYihkcHAsICZzY2xfZGF0YS0+bGJfcGFyYW1zLCBsYl9jb25maWcpOwogCiAJ aWYgKGRzY2xfbW9kZSA9PSBEU0NMX01PREVfU0NBTElOR180NDRfQllQQVNTKQogCQlyZXR1cm47 CkBAIC01NTQsMTEgKzU1NCwxMSBAQCB2b2lkIGRwcF9zZXRfc2NhbGVyX2F1dG9fc2NhbGUoCiAJ CVNDTF9WX05VTV9UQVBTX0MsIHNjbF9kYXRhLT50YXBzLnZfdGFwc19jIC0gMSwKIAkJU0NMX0hf TlVNX1RBUFNfQywgc2NsX2RhdGEtPnRhcHMuaF90YXBzX2MgLSAxKTsKIAotCWRwcF9zZXRfc2Ns X2ZpbHRlcihkcHAsIHNjbF9kYXRhLCB5Y2Jjcik7CisJZHBwMV9kc2NsX3NldF9zY2xfZmlsdGVy KGRwcCwgc2NsX2RhdGEsIHljYmNyKTsKIH0KIAogCi1zdGF0aWMgdm9pZCBkcHBfc2V0X21hbnVh bF9yYXRpb19pbml0KAorc3RhdGljIHZvaWQgZHBwMV9kc2NsX3NldF9tYW51YWxfcmF0aW9faW5p dCgKIAkJc3RydWN0IGRjbjEwX2RwcCAqZHBwLCBjb25zdCBzdHJ1Y3Qgc2NhbGVyX2RhdGEgKmRh dGEpCiB7CiAJdWludDMyX3QgaW5pdF9mcmFjID0gMDsKQEAgLTYxOCw3ICs2MTgsNyBAQCBzdGF0 aWMgdm9pZCBkcHBfc2V0X21hbnVhbF9yYXRpb19pbml0KAogCiAKIAotc3RhdGljIHZvaWQgZHBw X3NldF9yZWNvdXQoCitzdGF0aWMgdm9pZCBkcHAxX2RzY2xfc2V0X3JlY291dCgKIAkJCXN0cnVj dCBkY24xMF9kcHAgKmRwcCwgY29uc3Qgc3RydWN0IHJlY3QgKnJlY291dCkKIHsKIAlSRUdfU0VU XzIoUkVDT1VUX1NUQVJULCAwLApAQCAtNjQzLDEzICs2NDMsMTMgQEAgdm9pZCBkcHAxX2RzY2xf c2V0X3NjYWxlcl9tYW51YWxfc2NhbGUoCiB7CiAJZW51bSBsYl9tZW1vcnlfY29uZmlnIGxiX2Nv bmZpZzsKIAlzdHJ1Y3QgZGNuMTBfZHBwICpkcHAgPSBUT19EQ04xMF9EUFAoZHBwX2Jhc2UpOwot CWVudW0gZHNjbF9tb2RlX3NlbCBkc2NsX21vZGUgPSBnZXRfZHNjbF9tb2RlKAorCWVudW0gZHNj bF9tb2RlX3NlbCBkc2NsX21vZGUgPSBkcHAxX2RzY2xfZ2V0X2RzY2xfbW9kZSgKIAkJCWRwcF9i YXNlLCBzY2xfZGF0YSwgZHBwX2Jhc2UtPmN0eC0+ZGMtPmRlYnVnLmFsd2F5c19zY2FsZSk7CiAJ Ym9vbCB5Y2JjciA9IHNjbF9kYXRhLT5mb3JtYXQgPj0gUElYRUxfRk9STUFUX1ZJREVPX0JFR0lO CiAJCQkJJiYgc2NsX2RhdGEtPmZvcm1hdCA8PSBQSVhFTF9GT1JNQVRfVklERU9fRU5EOwogCiAJ LyogUmVjb3V0ICovCi0JZHBwX3NldF9yZWNvdXQoZHBwLCAmc2NsX2RhdGEtPnJlY291dCk7CisJ ZHBwMV9kc2NsX3NldF9yZWNvdXQoZHBwLCAmc2NsX2RhdGEtPnJlY291dCk7CiAKIAkvKiBNUEMg U2l6ZSAqLwogCVJFR19TRVRfMihNUENfU0laRSwgMCwKQEAgLTY2NSw4ICs2NjUsOCBAQCB2b2lk IGRwcDFfZHNjbF9zZXRfc2NhbGVyX21hbnVhbF9zY2FsZSgKIAkJcmV0dXJuOwogCiAJLyogTEIg Ki8KLQlsYl9jb25maWcgPSAgZmluZF9sYl9tZW1vcnlfY29uZmlnKGRwcCwgc2NsX2RhdGEpOwot CWRwcF9zZXRfbGIoZHBwLCAmc2NsX2RhdGEtPmxiX3BhcmFtcywgbGJfY29uZmlnKTsKKwlsYl9j b25maWcgPSAgZHBwMV9kc2NsX2ZpbmRfbGJfbWVtb3J5X2NvbmZpZyhkcHAsIHNjbF9kYXRhKTsK KwlkcHAxX2RzY2xfc2V0X2xiKGRwcCwgJnNjbF9kYXRhLT5sYl9wYXJhbXMsIGxiX2NvbmZpZyk7 CiAKIAlpZiAoZHNjbF9tb2RlID09IERTQ0xfTU9ERV9TQ0FMSU5HXzQ0NF9CWVBBU1MpCiAJCXJl dHVybjsKQEAgLTY4OSw3ICs2ODksNyBAQCB2b2lkIGRwcDFfZHNjbF9zZXRfc2NhbGVyX21hbnVh bF9zY2FsZSgKIAkJCQlTQ0xfQkxBQ0tfT0ZGU0VUX0NCQ1IsIEJMQUNLX09GRlNFVF9SR0JfWSk7 CiAKIAkvKiBNYW51YWxseSBjYWxjdWxhdGUgc2NhbGUgcmF0aW8gYW5kIGluaXQgdmFsdWVzICov Ci0JZHBwX3NldF9tYW51YWxfcmF0aW9faW5pdChkcHAsIHNjbF9kYXRhKTsKKwlkcHAxX2RzY2xf c2V0X21hbnVhbF9yYXRpb19pbml0KGRwcCwgc2NsX2RhdGEpOwogCiAJLyogSFRhcHMvVlRhcHMg Ki8KIAlSRUdfU0VUXzQoU0NMX1RBUF9DT05UUk9MLCAwLApAQCAtNjk4LDUgKzY5OCw1IEBAIHZv aWQgZHBwMV9kc2NsX3NldF9zY2FsZXJfbWFudWFsX3NjYWxlKAogCQlTQ0xfVl9OVU1fVEFQU19D LCBzY2xfZGF0YS0+dGFwcy52X3RhcHNfYyAtIDEsCiAJCVNDTF9IX05VTV9UQVBTX0MsIHNjbF9k YXRhLT50YXBzLmhfdGFwc19jIC0gMSk7CiAKLQlkcHBfc2V0X3NjbF9maWx0ZXIoZHBwLCBzY2xf ZGF0YSwgeWNiY3IpOworCWRwcDFfZHNjbF9zZXRfc2NsX2ZpbHRlcihkcHAsIHNjbF9kYXRhLCB5 Y2Jjcik7CiB9Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1k LWdmeAo=