From: Keith Packard Subject: [PATCH 10/21] vulkan: Add VK_EXT_display_surface_counter [v3] Date: Tue, 13 Feb 2018 16:31:23 -0800 Message-ID: <20180214003134.1552-11-keithp@keithp.com> References: <20180214003134.1552-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180214003134.1552-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: mesa-dev@lists.freedesktop.org Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBleHRlbnNpb24gaXMgcmVxdWlyZWQgdG8gc3VwcG9ydCBFWFRfZGlzcGxheV9jb250cm9s IGFzIGl0IG9mZmVycwphIHdheSB0byBxdWVyeSB3aGV0aGVyIHRoZSB2YmxhbmsgY291bnRlciBp cyBzdXBwb3J0ZWQuCgp2MjogVGhhbmtzIHRvIGtpc2FrCgogICAgRml4IHNwZWxsaW5nIG9mIFZr U3VyZmFjZUNhcGFiaWxpdGllczJFWFQgaW4gd3NpX2NvbW1vbl93YXlsYW5kLmMsCiAgICBpdCB3 YXMgdXNpbmcgZXh0IGluc3RlYWQgb2YgRVhULgoKICAgIEZpeCBzcGVsbGluZyBvZiBWS19TVFJV Q1RVUkVfVFlQRV9TVVJGQUNFX0NBUEFCSUxJVElFU18yX0VYVAoKdjM6IEZpeCB3YXlsYW5kIFdT SSwgcmVndWxhcml6ZSBzcGVsbGluZwoKICAgIE1pc3NwZWxsZWQgJ3N1cmZhY2UnIGluIGdldF9j YXBhYmlsaXRpZXMyZXh0CiAgICBSZW1vdmUgZXh0cmEgXyBmcm9tIGdldF9jYXBhYmlsaXRpZXNf MmV4dCBpbiBhIGNvdXBsZSBvZiBwbGFjZXMKClNpZ25lZC1vZmYtYnk6IEtlaXRoIFBhY2thcmQg PGtlaXRocEBrZWl0aHAuY29tPgotLS0KIHNyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uYyAgICAg ICAgIHwgMTEgKysrKysrKysrKysKIHNyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uaCAgICAgICAg IHwgIDUgKysrKysKIHNyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fZGlzcGxheS5jIHwgMjcgKysr KysrKysrKysrKysrKysrKysrKysrKysrCiBzcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX3ByaXZh dGUuaCB8ICAyICsrCiBzcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX3dheWxhbmQuYyB8IDI3ICsr KysrKysrKysrKysrKysrKysrKysrKysrKwogc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl94MTEu YyAgICAgfCAyNyArKysrKysrKysrKysrKysrKysrKysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwg OTkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb24u YyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uYwppbmRleCBjMGEyODVlNTgxNC4uMDJhYmM5 ZWY3ZmIgMTAwNjQ0Ci0tLSBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uYworKysgYi9zcmMv dnVsa2FuL3dzaS93c2lfY29tbW9uLmMKQEAgLTU3OSw2ICs1NzksMTcgQEAgd3NpX2NvbW1vbl9n ZXRfc3VyZmFjZV9jYXBhYmlsaXRpZXMyKHN0cnVjdCB3c2lfZGV2aWNlICp3c2lfZGV2aWNlLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwU3VyZmFjZUNhcGFiaWxpdGllcyk7 CiB9CiAKK1ZrUmVzdWx0Cit3c2lfY29tbW9uX2dldF9zdXJmYWNlX2NhcGFiaWxpdGllczJleHQo c3RydWN0IHdzaV9kZXZpY2UgKndzaV9kZXZpY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgVmtTdXJmYWNlS0hSIF9zdXJmYWNlLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFZrU3VyZmFjZUNhcGFiaWxpdGllczJFWFQgKnBTdXJmYWNl Q2FwYWJpbGl0aWVzKQoreworICAgSUNEX0ZST01fSEFORExFKFZrSWNkU3VyZmFjZUJhc2UsIHN1 cmZhY2UsIF9zdXJmYWNlKTsKKyAgIHN0cnVjdCB3c2lfaW50ZXJmYWNlICppZmFjZSA9IHdzaV9k ZXZpY2UtPndzaVtzdXJmYWNlLT5wbGF0Zm9ybV07CisKKyAgIHJldHVybiBpZmFjZS0+Z2V0X2Nh cGFiaWxpdGllczJleHQoc3VyZmFjZSwgcFN1cmZhY2VDYXBhYmlsaXRpZXMpOworfQorCiBWa1Jl c3VsdAogd3NpX2NvbW1vbl9nZXRfc3VyZmFjZV9mb3JtYXRzKHN0cnVjdCB3c2lfZGV2aWNlICp3 c2lfZGV2aWNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrU3VyZmFjZUtIUiBf c3VyZmFjZSwKZGlmZiAtLWdpdCBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uaCBiL3NyYy92 dWxrYW4vd3NpL3dzaV9jb21tb24uaAppbmRleCAxY2I2YWFlYmNhMC4uMTI0ZDA5NjE3MGEgMTAw NjQ0Ci0tLSBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb24uaAorKysgYi9zcmMvdnVsa2FuL3dz aS93c2lfY29tbW9uLmgKQEAgLTE1NSw2ICsxNTUsMTEgQEAgd3NpX2NvbW1vbl9nZXRfc3VyZmFj ZV9wcmVzZW50X21vZGVzKHN0cnVjdCB3c2lfZGV2aWNlICp3c2lfZGV2aWNlLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90ICpwUHJlc2VudE1vZGVDb3VudCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBWa1ByZXNlbnRNb2RlS0hSICpw UHJlc2VudE1vZGVzKTsKIAorVmtSZXN1bHQKK3dzaV9jb21tb25fZ2V0X3N1cmZhY2VfY2FwYWJp bGl0aWVzMmV4dChzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpX2RldmljZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBWa1N1cmZhY2VLSFIgc3VyZmFjZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBWa1N1cmZhY2VDYXBhYmlsaXRpZXMyRVhU ICpwU3VyZmFjZUNhcGFiaWxpdGllcyk7CisKIFZrUmVzdWx0CiB3c2lfY29tbW9uX2dldF9pbWFn ZXMoVmtTd2FwY2hhaW5LSFIgX3N3YXBjaGFpbiwKICAgICAgICAgICAgICAgICAgICAgICB1aW50 MzJfdCAqcFN3YXBjaGFpbkltYWdlQ291bnQsCmRpZmYgLS1naXQgYS9zcmMvdnVsa2FuL3dzaS93 c2lfY29tbW9uX2Rpc3BsYXkuYyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fZGlzcGxheS5j CmluZGV4IDI5ZDY0YjIxYWZmLi5lNjM3MDBlMmU2NSAxMDA2NDQKLS0tIGEvc3JjL3Z1bGthbi93 c2kvd3NpX2NvbW1vbl9kaXNwbGF5LmMKKysrIGIvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl9k aXNwbGF5LmMKQEAgLTY1NSw2ICs2NTUsMzIgQEAgd3NpX2Rpc3BsYXlfc3VyZmFjZV9nZXRfY2Fw YWJpbGl0aWVzMihWa0ljZFN1cmZhY2VCYXNlICppY2Rfc3VyZmFjZSwKICAgIHJldHVybiB3c2lf ZGlzcGxheV9zdXJmYWNlX2dldF9jYXBhYmlsaXRpZXMoaWNkX3N1cmZhY2UsICZjYXBzLT5zdXJm YWNlQ2FwYWJpbGl0aWVzKTsKIH0KIAorc3RhdGljIFZrUmVzdWx0Cit3c2lfZGlzcGxheV9zdXJm YWNlX2dldF9jYXBhYmlsaXRpZXMyZXh0KFZrSWNkU3VyZmFjZUJhc2UgKmljZF9zdXJmYWNlLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtTdXJmYWNlQ2FwYWJp bGl0aWVzMkVYVCAqY2FwcykKK3sKKyAgIFZrU3VyZmFjZUNhcGFiaWxpdGllc0tIUiAgICAga2hy X2NhcHM7CisgICBWa1Jlc3VsdCAgICAgICAgICAgICAgICAgICAgIHJldDsKKworICAgYXNzZXJ0 KGNhcHMtPnNUeXBlID09IFZLX1NUUlVDVFVSRV9UWVBFX1NVUkZBQ0VfQ0FQQUJJTElUSUVTXzJf RVhUKTsKKyAgIHJldCA9IHdzaV9kaXNwbGF5X3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllcyhpY2Rf c3VyZmFjZSwgJmtocl9jYXBzKTsKKyAgIGlmIChyZXQpCisgICAgICByZXR1cm4gcmV0OworCisg ICBjYXBzLT5taW5JbWFnZUNvdW50ID0ga2hyX2NhcHMubWluSW1hZ2VDb3VudDsKKyAgIGNhcHMt Pm1heEltYWdlQ291bnQgPSBraHJfY2Fwcy5tYXhJbWFnZUNvdW50OworICAgY2Fwcy0+Y3VycmVu dEV4dGVudCA9IGtocl9jYXBzLmN1cnJlbnRFeHRlbnQ7CisgICBjYXBzLT5taW5JbWFnZUV4dGVu dCA9IGtocl9jYXBzLm1pbkltYWdlRXh0ZW50OworICAgY2Fwcy0+bWF4SW1hZ2VFeHRlbnQgPSBr aHJfY2Fwcy5tYXhJbWFnZUV4dGVudDsKKyAgIGNhcHMtPm1heEltYWdlQXJyYXlMYXllcnMgPSBr aHJfY2Fwcy5tYXhJbWFnZUFycmF5TGF5ZXJzOworICAgY2Fwcy0+c3VwcG9ydGVkVHJhbnNmb3Jt cyA9IGtocl9jYXBzLnN1cHBvcnRlZFRyYW5zZm9ybXM7CisgICBjYXBzLT5jdXJyZW50VHJhbnNm b3JtID0ga2hyX2NhcHMuY3VycmVudFRyYW5zZm9ybTsKKyAgIGNhcHMtPnN1cHBvcnRlZENvbXBv c2l0ZUFscGhhID0ga2hyX2NhcHMuc3VwcG9ydGVkQ29tcG9zaXRlQWxwaGE7CisgICBjYXBzLT5z dXBwb3J0ZWRVc2FnZUZsYWdzID0ga2hyX2NhcHMuc3VwcG9ydGVkVXNhZ2VGbGFnczsKKyAgIGNh cHMtPnN1cHBvcnRlZFN1cmZhY2VDb3VudGVycyA9IDA7CisgICByZXR1cm4gcmV0OworfQorCiBz dGF0aWMgY29uc3QgVmtGb3JtYXQgYXZhaWxhYmxlX3N1cmZhY2VfZm9ybWF0c1tdID0gewogICAg VktfRk9STUFUX0I4RzhSOEE4X1NSR0IsCiAgICBWS19GT1JNQVRfQjhHOFI4QThfVU5PUk0sCkBA IC0xMzIzLDYgKzEzNDksNyBAQCB3c2lfZGlzcGxheV9pbml0X3dzaShzdHJ1Y3Qgd3NpX2Rldmlj ZSAqd3NpX2RldmljZSwKICAgIHdzaS0+YmFzZS5nZXRfc3VwcG9ydCA9IHdzaV9kaXNwbGF5X3N1 cmZhY2VfZ2V0X3N1cHBvcnQ7CiAgICB3c2ktPmJhc2UuZ2V0X2NhcGFiaWxpdGllcyA9IHdzaV9k aXNwbGF5X3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllczsKICAgIHdzaS0+YmFzZS5nZXRfY2FwYWJp bGl0aWVzMiA9IHdzaV9kaXNwbGF5X3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllczI7CisgICB3c2kt PmJhc2UuZ2V0X2NhcGFiaWxpdGllczJleHQgPSB3c2lfZGlzcGxheV9zdXJmYWNlX2dldF9jYXBh YmlsaXRpZXMyZXh0OwogICAgd3NpLT5iYXNlLmdldF9mb3JtYXRzID0gd3NpX2Rpc3BsYXlfc3Vy ZmFjZV9nZXRfZm9ybWF0czsKICAgIHdzaS0+YmFzZS5nZXRfZm9ybWF0czIgPSB3c2lfZGlzcGxh eV9zdXJmYWNlX2dldF9mb3JtYXRzMjsKICAgIHdzaS0+YmFzZS5nZXRfcHJlc2VudF9tb2RlcyA9 IHdzaV9kaXNwbGF5X3N1cmZhY2VfZ2V0X3ByZXNlbnRfbW9kZXM7CmRpZmYgLS1naXQgYS9zcmMv dnVsa2FuL3dzaS93c2lfY29tbW9uX3ByaXZhdGUuaCBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21t b25fcHJpdmF0ZS5oCmluZGV4IGQzOGQyZWZhMTE2Li4wZDkwMjg0NjIzOCAxMDA2NDQKLS0tIGEv c3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl9wcml2YXRlLmgKKysrIGIvc3JjL3Z1bGthbi93c2kv d3NpX2NvbW1vbl9wcml2YXRlLmgKQEAgLTEwMyw2ICsxMDMsOCBAQCBzdHJ1Y3Qgd3NpX2ludGVy ZmFjZSB7CiAgICBWa1Jlc3VsdCAoKmdldF9jYXBhYmlsaXRpZXMyKShWa0ljZFN1cmZhY2VCYXNl ICpzdXJmYWNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgdm9pZCAq aW5mb19uZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtTdXJmYWNlQ2Fw YWJpbGl0aWVzMktIUiogcFN1cmZhY2VDYXBhYmlsaXRpZXMpOworICAgVmtSZXN1bHQgKCpnZXRf Y2FwYWJpbGl0aWVzMmV4dCkoVmtJY2RTdXJmYWNlQmFzZSAqc3VyZmFjZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFZrU3VyZmFjZUNhcGFiaWxpdGllczJFWFQqIHBTdXJm YWNlQ2FwYWJpbGl0aWVzKTsKICAgIFZrUmVzdWx0ICgqZ2V0X2Zvcm1hdHMpKFZrSWNkU3VyZmFj ZUJhc2UgKnN1cmZhY2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3Qgd3NpX2Rl dmljZSAqd3NpX2RldmljZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90KiBw U3VyZmFjZUZvcm1hdENvdW50LApkaWZmIC0tZ2l0IGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1v bl93YXlsYW5kLmMgYi9zcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX3dheWxhbmQuYwppbmRleCBi ZTc2MzViYmY4NC4uNTRiOTQ0OWFiOGMgMTAwNjQ0Ci0tLSBhL3NyYy92dWxrYW4vd3NpL3dzaV9j b21tb25fd2F5bGFuZC5jCisrKyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fd2F5bGFuZC5j CkBAIC00NTcsNiArNDU3LDMyIEBAIHdzaV93bF9zdXJmYWNlX2dldF9jYXBhYmlsaXRpZXMyKFZr SWNkU3VyZmFjZUJhc2UgKnN1cmZhY2UsCiAgICByZXR1cm4gd3NpX3dsX3N1cmZhY2VfZ2V0X2Nh cGFiaWxpdGllcyhzdXJmYWNlLCAmY2Fwcy0+c3VyZmFjZUNhcGFiaWxpdGllcyk7CiB9CiAKK3N0 YXRpYyBWa1Jlc3VsdAord3NpX3dsX3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllczJleHQoVmtJY2RT dXJmYWNlQmFzZSAqc3VyZmFjZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFZrU3VyZmFjZUNhcGFiaWxpdGllczJFWFQqIGNhcHMpCit7CisgICBWa1N1cmZhY2VDYXBhYmls aXRpZXNLSFIgICAgIGtocl9jYXBzOworICAgVmtSZXN1bHQgICAgICAgICAgICAgICAgICAgICBy ZXQ7CisKKyAgIGFzc2VydChjYXBzLT5zVHlwZSA9PSBWS19TVFJVQ1RVUkVfVFlQRV9TVVJGQUNF X0NBUEFCSUxJVElFU18yX0VYVCk7CisgICByZXQgPSB3c2lfd2xfc3VyZmFjZV9nZXRfY2FwYWJp bGl0aWVzKHN1cmZhY2UsICZraHJfY2Fwcyk7CisgICBpZiAocmV0KQorICAgICAgcmV0dXJuIHJl dDsKKworICAgY2Fwcy0+bWluSW1hZ2VDb3VudCA9IGtocl9jYXBzLm1pbkltYWdlQ291bnQ7Cisg ICBjYXBzLT5tYXhJbWFnZUNvdW50ID0ga2hyX2NhcHMubWF4SW1hZ2VDb3VudDsKKyAgIGNhcHMt PmN1cnJlbnRFeHRlbnQgPSBraHJfY2Fwcy5jdXJyZW50RXh0ZW50OworICAgY2Fwcy0+bWluSW1h Z2VFeHRlbnQgPSBraHJfY2Fwcy5taW5JbWFnZUV4dGVudDsKKyAgIGNhcHMtPm1heEltYWdlRXh0 ZW50ID0ga2hyX2NhcHMubWF4SW1hZ2VFeHRlbnQ7CisgICBjYXBzLT5tYXhJbWFnZUFycmF5TGF5 ZXJzID0ga2hyX2NhcHMubWF4SW1hZ2VBcnJheUxheWVyczsKKyAgIGNhcHMtPnN1cHBvcnRlZFRy YW5zZm9ybXMgPSBraHJfY2Fwcy5zdXBwb3J0ZWRUcmFuc2Zvcm1zOworICAgY2Fwcy0+Y3VycmVu dFRyYW5zZm9ybSA9IGtocl9jYXBzLmN1cnJlbnRUcmFuc2Zvcm07CisgICBjYXBzLT5zdXBwb3J0 ZWRDb21wb3NpdGVBbHBoYSA9IGtocl9jYXBzLnN1cHBvcnRlZENvbXBvc2l0ZUFscGhhOworICAg Y2Fwcy0+c3VwcG9ydGVkVXNhZ2VGbGFncyA9IGtocl9jYXBzLnN1cHBvcnRlZFVzYWdlRmxhZ3M7 CisgICBjYXBzLT5zdXBwb3J0ZWRTdXJmYWNlQ291bnRlcnMgPSAwOworICAgcmV0dXJuIHJldDsK K30KKwogc3RhdGljIFZrUmVzdWx0CiB3c2lfd2xfc3VyZmFjZV9nZXRfZm9ybWF0cyhWa0ljZFN1 cmZhY2VCYXNlICppY2Rfc3VyZmFjZSwKIAkJCSAgIHN0cnVjdCB3c2lfZGV2aWNlICp3c2lfZGV2 aWNlLApAQCAtODkxLDYgKzkxNyw3IEBAIHdzaV93bF9pbml0X3dzaShzdHJ1Y3Qgd3NpX2Rldmlj ZSAqd3NpX2RldmljZSwKICAgIHdzaS0+YmFzZS5nZXRfc3VwcG9ydCA9IHdzaV93bF9zdXJmYWNl X2dldF9zdXBwb3J0OwogICAgd3NpLT5iYXNlLmdldF9jYXBhYmlsaXRpZXMgPSB3c2lfd2xfc3Vy ZmFjZV9nZXRfY2FwYWJpbGl0aWVzOwogICAgd3NpLT5iYXNlLmdldF9jYXBhYmlsaXRpZXMyID0g d3NpX3dsX3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllczI7CisgICB3c2ktPmJhc2UuZ2V0X2NhcGFi aWxpdGllczJleHQgPSB3c2lfd2xfc3VyZmFjZV9nZXRfY2FwYWJpbGl0aWVzMmV4dDsKICAgIHdz aS0+YmFzZS5nZXRfZm9ybWF0cyA9IHdzaV93bF9zdXJmYWNlX2dldF9mb3JtYXRzOwogICAgd3Np LT5iYXNlLmdldF9mb3JtYXRzMiA9IHdzaV93bF9zdXJmYWNlX2dldF9mb3JtYXRzMjsKICAgIHdz aS0+YmFzZS5nZXRfcHJlc2VudF9tb2RlcyA9IHdzaV93bF9zdXJmYWNlX2dldF9wcmVzZW50X21v ZGVzOwpkaWZmIC0tZ2l0IGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl94MTEuYyBiL3NyYy92 dWxrYW4vd3NpL3dzaV9jb21tb25feDExLmMKaW5kZXggYzI5ZTBhMmQzMGQuLjcxNDUyMzY3OGQ0 IDEwMDY0NAotLS0gYS9zcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX3gxMS5jCisrKyBiL3NyYy92 dWxrYW4vd3NpL3dzaV9jb21tb25feDExLmMKQEAgLTUxNiw2ICs1MTYsMzIgQEAgeDExX3N1cmZh Y2VfZ2V0X2NhcGFiaWxpdGllczIoVmtJY2RTdXJmYWNlQmFzZSAqaWNkX3N1cmZhY2UsCiAgICBy ZXR1cm4geDExX3N1cmZhY2VfZ2V0X2NhcGFiaWxpdGllcyhpY2Rfc3VyZmFjZSwgJmNhcHMtPnN1 cmZhY2VDYXBhYmlsaXRpZXMpOwogfQogCitzdGF0aWMgVmtSZXN1bHQKK3gxMV9zdXJmYWNlX2dl dF9jYXBhYmlsaXRpZXMyZXh0KFZrSWNkU3VyZmFjZUJhc2UgKmljZF9zdXJmYWNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtTdXJmYWNlQ2FwYWJpbGl0aWVzMkVYVCAqY2Fw cykKK3sKKyAgIFZrU3VyZmFjZUNhcGFiaWxpdGllc0tIUiAgICAga2hyX2NhcHM7CisgICBWa1Jl c3VsdCAgICAgICAgICAgICAgICAgICAgIHJldDsKKworICAgYXNzZXJ0KGNhcHMtPnNUeXBlID09 IFZLX1NUUlVDVFVSRV9UWVBFX1NVUkZBQ0VfQ0FQQUJJTElUSUVTXzJfRVhUKTsKKyAgIHJldCA9 IHgxMV9zdXJmYWNlX2dldF9jYXBhYmlsaXRpZXMoaWNkX3N1cmZhY2UsICZraHJfY2Fwcyk7Cisg ICBpZiAocmV0KQorICAgICAgcmV0dXJuIHJldDsKKworICAgY2Fwcy0+bWluSW1hZ2VDb3VudCA9 IGtocl9jYXBzLm1pbkltYWdlQ291bnQ7CisgICBjYXBzLT5tYXhJbWFnZUNvdW50ID0ga2hyX2Nh cHMubWF4SW1hZ2VDb3VudDsKKyAgIGNhcHMtPmN1cnJlbnRFeHRlbnQgPSBraHJfY2Fwcy5jdXJy ZW50RXh0ZW50OworICAgY2Fwcy0+bWluSW1hZ2VFeHRlbnQgPSBraHJfY2Fwcy5taW5JbWFnZUV4 dGVudDsKKyAgIGNhcHMtPm1heEltYWdlRXh0ZW50ID0ga2hyX2NhcHMubWF4SW1hZ2VFeHRlbnQ7 CisgICBjYXBzLT5tYXhJbWFnZUFycmF5TGF5ZXJzID0ga2hyX2NhcHMubWF4SW1hZ2VBcnJheUxh eWVyczsKKyAgIGNhcHMtPnN1cHBvcnRlZFRyYW5zZm9ybXMgPSBraHJfY2Fwcy5zdXBwb3J0ZWRU cmFuc2Zvcm1zOworICAgY2Fwcy0+Y3VycmVudFRyYW5zZm9ybSA9IGtocl9jYXBzLmN1cnJlbnRU cmFuc2Zvcm07CisgICBjYXBzLT5zdXBwb3J0ZWRDb21wb3NpdGVBbHBoYSA9IGtocl9jYXBzLnN1 cHBvcnRlZENvbXBvc2l0ZUFscGhhOworICAgY2Fwcy0+c3VwcG9ydGVkVXNhZ2VGbGFncyA9IGto cl9jYXBzLnN1cHBvcnRlZFVzYWdlRmxhZ3M7CisgICBjYXBzLT5zdXBwb3J0ZWRTdXJmYWNlQ291 bnRlcnMgPSAwOworICAgcmV0dXJuIHJldDsKK30KKwogc3RhdGljIFZrUmVzdWx0CiB4MTFfc3Vy ZmFjZV9nZXRfZm9ybWF0cyhWa0ljZFN1cmZhY2VCYXNlICpzdXJmYWNlLAogICAgICAgICAgICAg ICAgICAgICAgICAgc3RydWN0IHdzaV9kZXZpY2UgKndzaV9kZXZpY2UsCkBAIC0xMjA3LDYgKzEy MzMsNyBAQCB3c2lfeDExX2luaXRfd3NpKHN0cnVjdCB3c2lfZGV2aWNlICp3c2lfZGV2aWNlLAog ICAgd3NpLT5iYXNlLmdldF9zdXBwb3J0ID0geDExX3N1cmZhY2VfZ2V0X3N1cHBvcnQ7CiAgICB3 c2ktPmJhc2UuZ2V0X2NhcGFiaWxpdGllcyA9IHgxMV9zdXJmYWNlX2dldF9jYXBhYmlsaXRpZXM7 CiAgICB3c2ktPmJhc2UuZ2V0X2NhcGFiaWxpdGllczIgPSB4MTFfc3VyZmFjZV9nZXRfY2FwYWJp bGl0aWVzMjsKKyAgIHdzaS0+YmFzZS5nZXRfY2FwYWJpbGl0aWVzMmV4dCA9IHgxMV9zdXJmYWNl X2dldF9jYXBhYmlsaXRpZXMyZXh0OwogICAgd3NpLT5iYXNlLmdldF9mb3JtYXRzID0geDExX3N1 cmZhY2VfZ2V0X2Zvcm1hdHM7CiAgICB3c2ktPmJhc2UuZ2V0X2Zvcm1hdHMyID0geDExX3N1cmZh Y2VfZ2V0X2Zvcm1hdHMyOwogICAgd3NpLT5iYXNlLmdldF9wcmVzZW50X21vZGVzID0geDExX3N1 cmZhY2VfZ2V0X3ByZXNlbnRfbW9kZXM7Ci0tIAoyLjE1LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=