From: Subject: [PATCH 02/10] drm/amd/display: Refactor SDR cursor boosting in HDR mode Date: Thu, 12 Jul 2018 14:17:32 -0400 Message-ID: <1531419460-2912-3-git-send-email-sunpeng.li@amd.com> References: <1531419460-2912-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: <1531419460-2912-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: Krunoslav Kovac RnJvbTogS3J1bm9zbGF2IEtvdmFjIDxLcnVub3NsYXYuS292YWNAYW1kLmNvbT4KCltXaHldCkN1 cnNvciBib29zdGluZyBpcyBkb25lIHZpYSBDTlZDX0NVUiByZWdpc3RlciB3aGljaCBpcyBEUFAs IG5vdCBIVUJQClByZXZpb3VzIGNvbW1pdCB3YXMgaW1wbGVtZW50aW5nIGl0IGluIEhVQlAgZnVu Y3Rpb25zLAphbmQgYWxzbyBicmVha2luZyBkaWFncyB0ZXN0cy4KCltIb3ddCjEuIFVuZG8gb3Jp Z2luYWwgY29tbWl0IGFzIHdlbGwgYXMgRXJpYydzIGRpYWdzIHRlc3QgZml4LCBhbG1vc3QgY29t cGxldGVseQoyLiBNb3ZlIHByb2dyYW1taW5nIHRvIERQUCBhbmQgY2FsbCB2aWEgbmV3IGRjX3N0 cmVhbSBmdW5jdGlvbgozLiBBbHNvIHJlbW92aW5nIGN1cl9yb21fZW4gZnJvbSBkcHBfY3Vyc29y X2F0dHJpYnV0ZXMgYW5kIHByb2dyYW1taW5nCmFzIHBhcnQgb2Ygbm9ybWFsIGN1cnNvciBhdHRy aWJ1dGVzIGFzIGl0IGRlcGVuZHMgb24gY3Vyc29yIGNvbG9yIGZvcm1hdAoKQ2hhbmdlLUlkOiBJ M2JiNjJlOGYwZDY3ZjMxNGM3OTE3NmFmNWVjMDY3Y2M4ZGUzNWIzZQpTaWduZWQtb2ZmLWJ5OiBL cnVub3NsYXYgS292YWMgPEtydW5vc2xhdi5Lb3ZhY0BhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9u eSBDaGVuZyA8VG9ueS5DaGVuZ0BhbWQuY29tPgpBY2tlZC1ieTogTGVvIExpIDxzdW5wZW5nLmxp QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3Ry ZWFtLmMgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNfaHdfdHlw ZXMuaCAgICAgICB8ICA1ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY19z dHJlYW0uaCAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y24xMC9kY24xMF9kcHAuYyAgIHwgMTMgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjbjEwL2RjbjEwX2RwcC5oICAgfCAxNCArKysrKysrKy0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHVicC5jICB8IDE1IC0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHVicC5oICB8IDEy ICsrKy0tLS0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9od19zZXF1ZW5j ZXIuYyAgfCAzMCArKysrKysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2h3L2RwcC5oICAgICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2luYy9od19zZXF1ZW5jZXIuaCAgfCAgMSArCiAxMCBmaWxlcyBjaGFuZ2Vk LCA3MCBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19zdHJlYW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5jCmluZGV4IDAyMjNmNDguLjQ3MTczMzAg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVh bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N0cmVhbS5j CkBAIC0yMTQsNiArMjE0LDcgQEAgYm9vbCBkY19zdHJlYW1fc2V0X2N1cnNvcl9hdHRyaWJ1dGVz KAogCQl9CiAKIAkJY29yZV9kYy0+aHdzcy5zZXRfY3Vyc29yX2F0dHJpYnV0ZShwaXBlX2N0eCk7 CisJCWNvcmVfZGMtPmh3c3Muc2V0X2N1cnNvcl9zZHJfd2hpdGVfbGV2ZWwocGlwZV9jdHgpOwog CX0KIAogCWlmIChwaXBlX3RvX3Byb2dyYW0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNfaHdfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY19od190eXBlcy5oCmluZGV4IGUxYzBhZjcuLmU5YzFlYzUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY19od190eXBlcy5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY19od190eXBlcy5oCkBAIC01MDAsNiArNTAwLDExIEBA IHN0cnVjdCBkY19jdXJzb3JfYXR0cmlidXRlcyB7CiAJdW5pb24gZGNfY3Vyc29yX2F0dHJpYnV0 ZV9mbGFncyBhdHRyaWJ1dGVfZmxhZ3M7CiB9OwogCitzdHJ1Y3QgZHBwX2N1cnNvcl9hdHRyaWJ1 dGVzIHsKKwlpbnQgYmlhczsKKwlpbnQgc2NhbGU7Cit9OworCiAvKiBPUFAgKi8KIAogZW51bSBk Y19jb2xvcl9zcGFjZSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNfc3RyZWFtLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNfc3RyZWFt LmgKaW5kZXggNTMyYjJhZi4uNzkwYmViNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjX3N0cmVhbS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY19zdHJlYW0uaApAQCAtMTA3LDYgKzEwNyw3IEBAIHN0cnVjdCBkY19zdHJlYW1fc3Rh dGUgewogCiAJc3RydWN0IGRjX2N1cnNvcl9hdHRyaWJ1dGVzIGN1cnNvcl9hdHRyaWJ1dGVzOwog CXN0cnVjdCBkY19jdXJzb3JfcG9zaXRpb24gY3Vyc29yX3Bvc2l0aW9uOworCXVpbnQzMl90IHNk cl93aGl0ZV9sZXZlbDsgLy8gZm9yIGJvb3N0aW5nIChTRFIpIGN1cnNvciBpbiBIRFIgbW9kZQog CiAJLyogZnJvbSBzdHJlYW0gc3RydWN0ICovCiAJc3RydWN0IGtyZWYgcmVmY291bnQ7CkBAIC0y NjcsNiArMjY4LDcgQEAgYm9vbCBkY19zdHJlYW1fc2V0X2N1cnNvcl9wb3NpdGlvbigKIAlzdHJ1 Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0sCiAJY29uc3Qgc3RydWN0IGRjX2N1cnNvcl9wb3Np dGlvbiAqcG9zaXRpb24pOwogCisKIGJvb2wgZGNfc3RyZWFtX2FkanVzdF92bWluX3ZtYXgoc3Ry dWN0IGRjICpkYywKIAkJCQlzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpzdHJlYW0sCiAJCQkJc3Ry dWN0IGRjX2NydGNfdGltaW5nX2FkanVzdCAqYWRqdXN0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9kcHAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9kcHAuYwppbmRleCBhNTU4ZWZhLi5iZjhiNjhm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBf ZHBwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2Rw cC5jCkBAIC00NTksNiArNDU5LDE4IEBAIHZvaWQgZHBwMV9zZXRfY3Vyc29yX3Bvc2l0aW9uKAog CiB9CiAKK3ZvaWQgZHBwMV9jbnZfc2V0X29wdGlvbmFsX2N1cnNvcl9hdHRyaWJ1dGVzKAorCQlz dHJ1Y3QgZHBwICpkcHBfYmFzZSwKKwkJc3RydWN0IGRwcF9jdXJzb3JfYXR0cmlidXRlcyAqYXR0 cikKK3sKKwlzdHJ1Y3QgZGNuMTBfZHBwICpkcHAgPSBUT19EQ04xMF9EUFAoZHBwX2Jhc2UpOwor CisJaWYgKGF0dHIpIHsKKwkJUkVHX1VQREFURShDVVJTT1IwX0ZQX1NDQUxFX0JJQVMsICBDVVIw X0ZQX0JJQVMsICBhdHRyLT5iaWFzKTsKKwkJUkVHX1VQREFURShDVVJTT1IwX0ZQX1NDQUxFX0JJ QVMsICBDVVIwX0ZQX1NDQUxFLCBhdHRyLT5zY2FsZSk7CisJfQorfQorCiB2b2lkIGRwcDFfZHBw Y2xrX2NvbnRyb2woCiAJCXN0cnVjdCBkcHAgKmRwcF9iYXNlLAogCQlib29sIGRwcGNsa19kaXYs CkBAIC00OTksNiArNTExLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcHBfZnVuY3MgZGNuMTBf ZHBwX2Z1bmNzID0gewogCQkuZHBwX2Z1bGxfYnlwYXNzCQk9IGRwcDFfZnVsbF9ieXBhc3MsCiAJ CS5zZXRfY3Vyc29yX2F0dHJpYnV0ZXMgPSBkcHAxX3NldF9jdXJzb3JfYXR0cmlidXRlcywKIAkJ LnNldF9jdXJzb3JfcG9zaXRpb24gPSBkcHAxX3NldF9jdXJzb3JfcG9zaXRpb24sCisJCS5zZXRf b3B0aW9uYWxfY3Vyc29yX2F0dHJpYnV0ZXMgPSBkcHAxX2Nudl9zZXRfb3B0aW9uYWxfY3Vyc29y X2F0dHJpYnV0ZXMsCiAJCS5kcHBfZHBwY2xrX2NvbnRyb2wgPSBkcHAxX2RwcGNsa19jb250cm9s LAogCQkuZHBwX3NldF9oZHJfbXVsdGlwbGllciA9IGRwcDFfc2V0X2hkcl9tdWx0aXBsaWVyLAog fTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24x MF9kcHAuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9kcHAu aAppbmRleCBlODYyY2FmLi5lMjg4OWU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfZHBwLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjbjEwL2RjbjEwX2RwcC5oCkBAIC0xMTksNiArMTE5LDcgQEAKIAlTUkkoQ1VS U09SMF9DT05UUk9MLCBDTlZDX0NVUiwgaWQpLCBcCiAJU1JJKENVUlNPUjBfQ09MT1IwLCBDTlZD X0NVUiwgaWQpLCBcCiAJU1JJKENVUlNPUjBfQ09MT1IxLCBDTlZDX0NVUiwgaWQpLCBcCisJU1JJ KENVUlNPUjBfRlBfU0NBTEVfQklBUywgQ05WQ19DVVIsIGlkKSwgXAogCVNSSShEUFBfQ09OVFJP TCwgRFBQX1RPUCwgaWQpLCBcCiAJU1JJKENNX0hEUl9NVUxUX0NPRUYsIENNLCBpZCkKIApAQCAt MzI0LDYgKzMyNSw4IEBACiAJVEZfU0YoQ05WQ19DVVIwX0NVUlNPUjBfQ09OVFJPTCwgQ1VSMF9F TkFCTEUsIG1hc2tfc2gpLCBcCiAJVEZfU0YoQ05WQ19DVVIwX0NVUlNPUjBfQ09MT1IwLCBDVVIw X0NPTE9SMCwgbWFza19zaCksIFwKIAlURl9TRihDTlZDX0NVUjBfQ1VSU09SMF9DT0xPUjEsIENV UjBfQ09MT1IxLCBtYXNrX3NoKSwgXAorCVRGX1NGKENOVkNfQ1VSMF9DVVJTT1IwX0ZQX1NDQUxF X0JJQVMsIENVUjBfRlBfQklBUywgbWFza19zaCksIFwKKwlURl9TRihDTlZDX0NVUjBfQ1VSU09S MF9GUF9TQ0FMRV9CSUFTLCBDVVIwX0ZQX1NDQUxFLCBtYXNrX3NoKSwgXAogCVRGX1NGKERQUF9U T1AwX0RQUF9DT05UUk9MLCBEUFBfQ0xPQ0tfRU5BQkxFLCBtYXNrX3NoKSwgXAogCVRGX1NGKENN MF9DTV9IRFJfTVVMVF9DT0VGLCBDTV9IRFJfTVVMVF9DT0VGLCBtYXNrX3NoKQogCkBAIC0xMDc2 LDcgKzEwNzksOSBAQAogCXR5cGUgQ1VSMF9DT0xPUjE7IFwKIAl0eXBlIERQUENMS19SQVRFX0NP TlRST0w7IFwKIAl0eXBlIERQUF9DTE9DS19FTkFCTEU7IFwKLQl0eXBlIENNX0hEUl9NVUxUX0NP RUY7CisJdHlwZSBDTV9IRFJfTVVMVF9DT0VGOyBcCisJdHlwZSBDVVIwX0ZQX0JJQVM7IFwKKwl0 eXBlIENVUjBfRlBfU0NBTEU7CiAKIHN0cnVjdCBkY25fZHBwX3NoaWZ0IHsKIAlURl9SRUdfRklF TERfTElTVCh1aW50OF90KQpAQCAtMTMyOSw3ICsxMzM0LDggQEAgc3RydWN0IGRjbl9kcHBfbWFz ayB7CiAJdWludDMyX3QgQ1VSU09SMF9DT0xPUjA7IFwKIAl1aW50MzJfdCBDVVJTT1IwX0NPTE9S MTsgXAogCXVpbnQzMl90IERQUF9DT05UUk9MOyBcCi0JdWludDMyX3QgQ01fSERSX01VTFRfQ09F RjsKKwl1aW50MzJfdCBDTV9IRFJfTVVMVF9DT0VGOyBcCisJdWludDMyX3QgQ1VSU09SMF9GUF9T Q0FMRV9CSUFTOwogCiBzdHJ1Y3QgZGNuX2RwcF9yZWdpc3RlcnMgewogCURQUF9DT01NT05fUkVH X1ZBUklBQkxFX0xJU1QKQEAgLTEzNzAsNiArMTM3NiwxMCBAQCB2b2lkIGRwcDFfc2V0X2N1cnNv cl9wb3NpdGlvbigKIAkJY29uc3Qgc3RydWN0IGRjX2N1cnNvcl9taV9wYXJhbSAqcGFyYW0sCiAJ CXVpbnQzMl90IHdpZHRoKTsKIAordm9pZCBkcHAxX2Nudl9zZXRfb3B0aW9uYWxfY3Vyc29yX2F0 dHJpYnV0ZXMoCisJCQlzdHJ1Y3QgZHBwICpkcHBfYmFzZSwKKwkJCXN0cnVjdCBkcHBfY3Vyc29y X2F0dHJpYnV0ZXMgKmF0dHIpOworCiBib29sIGRwcDFfZHNjbF9pc19sYl9jb25mX3ZhbGlkKAog CQlpbnQgY2VpbF92cmF0aW8sCiAJCWludCBudW1fcGFydGl0aW9ucywKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9odWJwLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHVicC5jCmluZGV4IDI0MjFmMTcu LjgzM2Q1MmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24x MC9kY24xMF9odWJwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEw L2RjbjEwX2h1YnAuYwpAQCAtMjcsNyArMjcsNiBAQAogI2luY2x1ZGUgInJlZ19oZWxwZXIuaCIK ICNpbmNsdWRlICJiYXNpY3MvY29udmVyc2lvbi5oIgogI2luY2x1ZGUgImRjbjEwX2h1YnAuaCIK LSNpbmNsdWRlICJjdXN0b21fZmxvYXQuaCIKIAogI2RlZmluZSBSRUcocmVnKVwKIAlodWJwMS0+ aHVicF9yZWdzLT5yZWcKQEAgLTEwNTMsMTggKzEwNTIsNiBAQCB2b2lkIGh1YnAxX2N1cnNvcl9z ZXRfYXR0cmlidXRlcygKIAllbnVtIGN1cnNvcl9waXRjaCBod19waXRjaCA9IGh1YnAxX2dldF9j dXJzb3JfcGl0Y2goYXR0ci0+cGl0Y2gpOwogCWVudW0gY3Vyc29yX2xpbmVzX3Blcl9jaHVuayBs cGMgPSBodWJwMV9nZXRfbGluZXNfcGVyX2NodW5rKAogCQkJYXR0ci0+d2lkdGgsIGF0dHItPmNv bG9yX2Zvcm1hdCk7Ci0Jc3RydWN0IGZpeGVkMzFfMzIgbXVsdGlwbGllcjsKLQl1aW50MzJfdCBo d19tdWx0ID0gMHgzYzAwOyAvLyAxLjAgZGVmYXVsdCBtdWx0aXBsaWVyCi0Jc3RydWN0IGN1c3Rv bV9mbG9hdF9mb3JtYXQgZm10OwotCi0JZm10LmV4cG9uZW50YV9iaXRzID0gNTsKLQlmbXQubWFu dGlzc2FfYml0cyA9IDEwOwotCWZtdC5zaWduID0gdHJ1ZTsKLQotCWlmIChhdHRyLT5zZHJfd2hp dGVfbGV2ZWwgPiA4MCkgewotCQltdWx0aXBsaWVyID0gZGNfZml4cHRfZnJvbV9mcmFjdGlvbihh dHRyLT5zZHJfd2hpdGVfbGV2ZWwsIDgwKTsKLQkJY29udmVydF90b19jdXN0b21fZmxvYXRfZm9y bWF0KG11bHRpcGxpZXIsICZmbXQsICZod19tdWx0KTsKLQl9CiAKIAlodWJwLT5jdXJzX2F0dHIg PSAqYXR0cjsKIApAQCAtMTA4Nyw4ICsxMDc0LDYgQEAgdm9pZCBodWJwMV9jdXJzb3Jfc2V0X2F0 dHJpYnV0ZXMoCiAJCQlDVVJTT1IwX0RTVF9ZX09GRlNFVCwgMCwKIAkJCSAvKiB1c2VkIHRvIHNo aWZ0IHRoZSBjdXJzb3IgY2h1bmsgcmVxdWVzdCBkZWFkbGluZSAqLwogCQkJQ1VSU09SMF9DSFVO S19IRExfQURKVVNULCAzKTsKLQotCVJFR19VUERBVEUoQ1VSU09SMF9GUF9TQ0FMRV9CSUFTLCBD VVIwX0ZQX1NDQUxFLCBod19tdWx0KTsKIH0KIAogdm9pZCBodWJwMV9jdXJzb3Jfc2V0X3Bvc2l0 aW9uKApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2Rj bjEwX2h1YnAuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9o dWJwLmgKaW5kZXggMWFiYjM2OS4uMjBmM2MyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h1YnAuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHVicC5oCkBAIC0xMzMsOCArMTMzLDcgQEAKIAlT UkkoQ1VSU09SX0NPTlRST0wsIENVUlNPUiwgaWQpLCBcCiAJU1JJKENVUlNPUl9QT1NJVElPTiwg Q1VSU09SLCBpZCksIFwKIAlTUkkoQ1VSU09SX0hPVF9TUE9ULCBDVVJTT1IsIGlkKSwgXAotCVNS SShDVVJTT1JfRFNUX09GRlNFVCwgQ1VSU09SLCBpZCksIFwKLQlTUkkoQ1VSU09SMF9GUF9TQ0FM RV9CSUFTLCBDTlZDX0NVUiwgaWQpCisJU1JJKENVUlNPUl9EU1RfT0ZGU0VULCBDVVJTT1IsIGlk KQogCiAjZGVmaW5lIEhVQlBfQ09NTU9OX1JFR19WQVJJQUJMRV9MSVNUIFwKIAl1aW50MzJfdCBE Q0hVQlBfQ05UTDsgXApAQCAtMjQyLDggKzI0MSw3IEBACiAJdWludDMyX3QgQ1VSU09SX1BPU0lU SU9OOyBcCiAJdWludDMyX3QgQ1VSU09SX0hPVF9TUE9UOyBcCiAJdWludDMyX3QgQ1VSU09SX0RT VF9PRkZTRVQ7IFwKLQl1aW50MzJfdCBIVUJQX0NMS19DTlRMOyBcCi0JdWludDMyX3QgQ1VSU09S MF9GUF9TQ0FMRV9CSUFTCisJdWludDMyX3QgSFVCUF9DTEtfQ05UTAogCiAjZGVmaW5lIEhVQlBf U0YocmVnX25hbWUsIGZpZWxkX25hbWUsIHBvc3RfZml4KVwKIAkuZmllbGRfbmFtZSA9IHJlZ19u YW1lICMjIF9fICMjIGZpZWxkX25hbWUgIyMgcG9zdF9maXgKQEAgLTQyOCw4ICs0MjYsNyBAQAog CUhVQlBfU0YoQ1VSU09SMF9DVVJTT1JfUE9TSVRJT04sIENVUlNPUl9ZX1BPU0lUSU9OLCBtYXNr X3NoKSwgXAogCUhVQlBfU0YoQ1VSU09SMF9DVVJTT1JfSE9UX1NQT1QsIENVUlNPUl9IT1RfU1BP VF9YLCBtYXNrX3NoKSwgXAogCUhVQlBfU0YoQ1VSU09SMF9DVVJTT1JfSE9UX1NQT1QsIENVUlNP Ul9IT1RfU1BPVF9ZLCBtYXNrX3NoKSwgXAotCUhVQlBfU0YoQ1VSU09SMF9DVVJTT1JfRFNUX09G RlNFVCwgQ1VSU09SX0RTVF9YX09GRlNFVCwgbWFza19zaCksIFwKLQlIVUJQX1NGKENOVkNfQ1VS MF9DVVJTT1IwX0ZQX1NDQUxFX0JJQVMsIENVUjBfRlBfU0NBTEUsIG1hc2tfc2gpCisJSFVCUF9T RihDVVJTT1IwX0NVUlNPUl9EU1RfT0ZGU0VULCBDVVJTT1JfRFNUX1hfT0ZGU0VULCBtYXNrX3No KQogCiAjZGVmaW5lIERDTl9IVUJQX1JFR19GSUVMRF9MSVNUKHR5cGUpIFwKIAl0eXBlIEhVQlBf QkxBTktfRU47XApAQCAtNjIyLDggKzYxOSw3IEBACiAJdHlwZSBDVVJTT1JfSE9UX1NQT1RfWDsg XAogCXR5cGUgQ1VSU09SX0hPVF9TUE9UX1k7IFwKIAl0eXBlIENVUlNPUl9EU1RfWF9PRkZTRVQ7 IFwKLQl0eXBlIE9VVFBVVF9GUDsgXAotCXR5cGUgQ1VSMF9GUF9TQ0FMRQorCXR5cGUgT1VUUFVU X0ZQCiAKIHN0cnVjdCBkY25fbWlfcmVnaXN0ZXJzIHsKIAlIVUJQX0NPTU1PTl9SRUdfVkFSSUFC TEVfTElTVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24x MC9kY24xMF9od19zZXF1ZW5jZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y24xMC9kY24xMF9od19zZXF1ZW5jZXIuYwppbmRleCA1Yjk5YTgzLi40Nzk1OTc0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVu Y2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3 X3NlcXVlbmNlci5jCkBAIC0yNTc4LDYgKzI1NzgsMzMgQEAgc3RhdGljIHZvaWQgZGNuMTBfc2V0 X2N1cnNvcl9hdHRyaWJ1dGUoc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCkKIAkJcGlwZV9jdHgt PnBsYW5lX3Jlcy5kcHAsIGF0dHJpYnV0ZXMtPmNvbG9yX2Zvcm1hdCk7CiB9CiAKK3N0YXRpYyB2 b2lkIGRjbjEwX3NldF9jdXJzb3Jfc2RyX3doaXRlX2xldmVsKHN0cnVjdCBwaXBlX2N0eCAqcGlw ZV9jdHgpCit7CisJdWludDMyX3Qgc2RyX3doaXRlX2xldmVsID0gcGlwZV9jdHgtPnN0cmVhbS0+ Y3Vyc29yX2F0dHJpYnV0ZXMuc2RyX3doaXRlX2xldmVsOworCXN0cnVjdCBmaXhlZDMxXzMyIG11 bHRpcGxpZXI7CisJc3RydWN0IGRwcF9jdXJzb3JfYXR0cmlidXRlcyBvcHRfYXR0ciA9IHsgMCB9 OworCXVpbnQzMl90IGh3X3NjYWxlID0gMHgzYzAwOyAvLyAxLjAgZGVmYXVsdCBtdWx0aXBsaWVy CisJc3RydWN0IGN1c3RvbV9mbG9hdF9mb3JtYXQgZm10OworCisJaWYgKCFwaXBlX2N0eC0+cGxh bmVfcmVzLmRwcC0+ZnVuY3MtPnNldF9vcHRpb25hbF9jdXJzb3JfYXR0cmlidXRlcykKKwkJcmV0 dXJuOworCisJZm10LmV4cG9uZW50YV9iaXRzID0gNTsKKwlmbXQubWFudGlzc2FfYml0cyA9IDEw OworCWZtdC5zaWduID0gdHJ1ZTsKKworCWlmIChzZHJfd2hpdGVfbGV2ZWwgPiA4MCkgeworCQlt dWx0aXBsaWVyID0gZGNfZml4cHRfZnJvbV9mcmFjdGlvbihzZHJfd2hpdGVfbGV2ZWwsIDgwKTsK KwkJY29udmVydF90b19jdXN0b21fZmxvYXRfZm9ybWF0KG11bHRpcGxpZXIsICZmbXQsICZod19z Y2FsZSk7CisJfQorCisJb3B0X2F0dHIuc2NhbGUgPSBod19zY2FsZTsKKwlvcHRfYXR0ci5iaWFz ID0gMDsKKworCXBpcGVfY3R4LT5wbGFuZV9yZXMuZHBwLT5mdW5jcy0+c2V0X29wdGlvbmFsX2N1 cnNvcl9hdHRyaWJ1dGVzKAorCQkJcGlwZV9jdHgtPnBsYW5lX3Jlcy5kcHAsICZvcHRfYXR0cik7 Cit9CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaHdfc2VxdWVuY2VyX2Z1bmNzIGRjbjEwX2Z1bmNz ID0gewogCS5wcm9ncmFtX2dhbXV0X3JlbWFwID0gcHJvZ3JhbV9nYW11dF9yZW1hcCwKIAkucHJv Z3JhbV9jc2NfbWF0cml4ID0gcHJvZ3JhbV9jc2NfbWF0cml4LApAQCAtMjYyNSw3ICsyNjUyLDgg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBod19zZXF1ZW5jZXJfZnVuY3MgZGNuMTBfZnVuY3MgPSB7 CiAJLmVkcF9wb3dlcl9jb250cm9sID0gaHdzc19lZHBfcG93ZXJfY29udHJvbCwKIAkuZWRwX3dh aXRfZm9yX2hwZF9yZWFkeSA9IGh3c3NfZWRwX3dhaXRfZm9yX2hwZF9yZWFkeSwKIAkuc2V0X2N1 cnNvcl9wb3NpdGlvbiA9IGRjbjEwX3NldF9jdXJzb3JfcG9zaXRpb24sCi0JLnNldF9jdXJzb3Jf YXR0cmlidXRlID0gZGNuMTBfc2V0X2N1cnNvcl9hdHRyaWJ1dGUKKwkuc2V0X2N1cnNvcl9hdHRy aWJ1dGUgPSBkY24xMF9zZXRfY3Vyc29yX2F0dHJpYnV0ZSwKKwkuc2V0X2N1cnNvcl9zZHJfd2hp dGVfbGV2ZWwgPSBkY24xMF9zZXRfY3Vyc29yX3Nkcl93aGl0ZV9sZXZlbAogfTsKIAogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L2RwcC5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9ody9kcHAuaAppbmRleCA1ODI0NThmLi43 NGFkOTRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3 L2RwcC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvZHBwLmgK QEAgLTE1MSw2ICsxNTEsOSBAQCBzdHJ1Y3QgZHBwX2Z1bmNzIHsKIAl2b2lkICgqZHBwX3NldF9o ZHJfbXVsdGlwbGllcikoCiAJCQlzdHJ1Y3QgZHBwICpkcHBfYmFzZSwKIAkJCXVpbnQzMl90IG11 bHRpcGxpZXIpOworCXZvaWQgKCpzZXRfb3B0aW9uYWxfY3Vyc29yX2F0dHJpYnV0ZXMpKAorCQkJ c3RydWN0IGRwcCAqZHBwX2Jhc2UsCisJCQlzdHJ1Y3QgZHBwX2N1cnNvcl9hdHRyaWJ1dGVzICph dHRyKTsKIAogCXZvaWQgKCpkcHBfZHBwY2xrX2NvbnRyb2wpKAogCQkJc3RydWN0IGRwcCAqZHBw X2Jhc2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3 X3NlcXVlbmNlci5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9od19zZXF1 ZW5jZXIuaAppbmRleCBjMjI3N2QxLi5hMTRjZTRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3X3NlcXVlbmNlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9pbmMvaHdfc2VxdWVuY2VyLmgKQEAgLTIyMyw2ICsyMjMsNyBAQCBz dHJ1Y3QgaHdfc2VxdWVuY2VyX2Z1bmNzIHsKIAogCXZvaWQgKCpzZXRfY3Vyc29yX3Bvc2l0aW9u KShzdHJ1Y3QgcGlwZV9jdHggKnBpcGUpOwogCXZvaWQgKCpzZXRfY3Vyc29yX2F0dHJpYnV0ZSko c3RydWN0IHBpcGVfY3R4ICpwaXBlKTsKKwl2b2lkICgqc2V0X2N1cnNvcl9zZHJfd2hpdGVfbGV2 ZWwpKHN0cnVjdCBwaXBlX2N0eCAqcGlwZSk7CiAKIH07CiAKLS0gCjIuNy40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK