From: Joonas Lahtinen Subject: [PATCH 1/2] drm/i915: Canonicalize stolen memory calculations Date: Fri, 22 Apr 2016 14:25:06 +0300 Message-ID: <1461324307-16019-2-git-send-email-joonas.lahtinen@linux.intel.com> References: <1461324307-16019-1-git-send-email-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id F152C6E7B0 for ; Fri, 22 Apr 2016 11:24:15 +0000 (UTC) In-Reply-To: <1461324307-16019-1-git-send-email-joonas.lahtinen@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel graphics driver community testing & development Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org TW92ZSB0aGUgYmV0dGVyIGNvbnN0cnVjdHMvY29tbWVudHMgZnJvbSBpOTE1X2dlbV9zdG9sZW4u YyB0bwplYXJseS1xdWlya3MuYyBhbmQgaW5jcmVhc2UgcmVhZGFiaWxpdHkgaW4gcHJlcGFyYXRp b24gb2Ygb25seQpoYXZpbmcgb25lIHNldCBvZiBmdW5jdGlvbnMuCgotIGludGVsX3N0b2xlbl9i YXNlIC0+IGdlbjNfc3RvbGVuX2Jhc2UKLSB1c2UgcGh5c19hZGRyX3QgaW5zdGVhZCBvZiB1MzIg Zm9yIGFkZHJlc3MgZm9yIGZ1dHVyZSBwcm9vZmluZwoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRl bC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t PgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4LmludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu Y29tPgotLS0KIGFyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYyAgICAgICAgIHwgMjM0ICsr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fc3RvbGVuLmMgfCAgIDQgKy0KIGluY2x1ZGUvZHJtL2k5MTVfZHJtLmggICAgICAgICAg ICAgICAgIHwgICAzICsKIDMgZmlsZXMgY2hhbmdlZCwgMTA5IGluc2VydGlvbnMoKyksIDEzMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvZWFybHktcXVpcmtzLmMg Yi9hcmNoL3g4Ni9rZXJuZWwvZWFybHktcXVpcmtzLmMKaW5kZXggYmNhMTRjOC4uZjE2OTQ3NSAx MDA2NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2Vhcmx5LXF1aXJrcy5jCisrKyBiL2FyY2gveDg2 L2tlcm5lbC9lYXJseS1xdWlya3MuYwpAQCAtMjIzLDM2ICsyMjMsMTkgQEAgc3RhdGljIHZvaWQg X19pbml0IGludGVsX3JlbWFwcGluZ19jaGVjayhpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMp CiAgKiBkZXNwaXRlIHRoZSBlZmZvcnRzIG9mIHRoZSAiUkFNIGJ1ZmZlciIgYXBwcm9hY2gsIHdo aWNoIHNpbXBseSByb3VuZHMKICAqIG1lbW9yeSBib3VuZGFyaWVzIHVwIHRvIDY0TSB0byB0cnkg dG8gY2F0Y2ggc3BhY2UgdGhhdCBtYXkgZGVjb2RlCiAgKiBhcyBSQU0gYW5kIHNvIGlzIG5vdCBz dWl0YWJsZSBmb3IgTU1JTy4KLSAqCi0gKiBBbmQgeWVzLCBzbyBmYXIgb24gY3VycmVudCBkZXZp Y2VzIHRoZSBiYXNlIGFkZHIgaXMgYWx3YXlzIHVuZGVyIDRHLgogICovCi1zdGF0aWMgdTMyIF9f aW5pdCBpbnRlbF9zdG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsIHNpemVf dCBzdG9sZW5fc2l6ZSkKLXsKLQl1MzIgYmFzZTsKLQotCS8qCi0JICogRm9yIHRoZSBQQ0kgSURz IGluIHRoaXMgcXVpcmssIHRoZSBzdG9sZW4gYmFzZSBpcyBhbHdheXMKLQkgKiBpbiAweDVjLCBh a2EgdGhlIEJEU00gcmVnaXN0ZXIgKHllcyB0aGF0J3MgcmVhbGx5IHdoYXQKLQkgKiBpdCdzIGNh bGxlZCkuCi0JICovCi0JYmFzZSA9IHJlYWRfcGNpX2NvbmZpZyhudW0sIHNsb3QsIGZ1bmMsIDB4 NWMpOwotCWJhc2UgJj0gfigoMTw8MjApIC0gMSk7Ci0KLQlyZXR1cm4gYmFzZTsKLX0KIAogI2Rl ZmluZSBLQih4KQkoKHgpICogMTAyNFVMKQogI2RlZmluZSBNQih4KQkoS0IgKEtCICh4KSkpCi0j ZGVmaW5lIEdCKHgpCShNQiAoS0IgKHgpKSkKIAogc3RhdGljIHNpemVfdCBfX2luaXQgaTgzMF90 c2VnX3NpemUodm9pZCkKIHsKLQl1OCB0bXAgPSByZWFkX3BjaV9jb25maWdfYnl0ZSgwLCAwLCAw LCBJODMwX0VTTVJBTUMpOworCXU4IGVzbXJhbWMgPSByZWFkX3BjaV9jb25maWdfYnl0ZSgwLCAw LCAwLCBJODMwX0VTTVJBTUMpOwogCi0JaWYgKCEodG1wICYgVFNFR19FTkFCTEUpKQorCWlmICgh KGVzbXJhbWMgJiBUU0VHX0VOQUJMRSkpCiAJCXJldHVybiAwOwogCi0JaWYgKHRtcCAmIEk4MzBf VFNFR19TSVpFXzFNKQorCWlmIChlc21yYW1jICYgSTgzMF9UU0VHX1NJWkVfMU0pCiAJCXJldHVy biBNQigxKTsKIAllbHNlCiAJCXJldHVybiBLQig1MTIpOwpAQCAtMjYwLDI3ICsyNDMsMjYgQEAg c3RhdGljIHNpemVfdCBfX2luaXQgaTgzMF90c2VnX3NpemUodm9pZCkKIAogc3RhdGljIHNpemVf dCBfX2luaXQgaTg0NV90c2VnX3NpemUodm9pZCkKIHsKLQl1OCB0bXAgPSByZWFkX3BjaV9jb25m aWdfYnl0ZSgwLCAwLCAwLCBJODQ1X0VTTVJBTUMpOworCXU4IGVzbXJhbWMgPSByZWFkX3BjaV9j b25maWdfYnl0ZSgwLCAwLCAwLCBJODQ1X0VTTVJBTUMpOworCXU4IHRzZWdfc2l6ZSA9IGVzbXJh bWMgJiBJODQ1X1RTRUdfU0laRV9NQVNLOwogCi0JaWYgKCEodG1wICYgVFNFR19FTkFCTEUpKQor CWlmICghKGVzbXJhbWMgJiBUU0VHX0VOQUJMRSkpCiAJCXJldHVybiAwOwogCi0Jc3dpdGNoICh0 bXAgJiBJODQ1X1RTRUdfU0laRV9NQVNLKSB7Ci0JY2FzZSBJODQ1X1RTRUdfU0laRV81MTJLOgot CQlyZXR1cm4gS0IoNTEyKTsKLQljYXNlIEk4NDVfVFNFR19TSVpFXzFNOgotCQlyZXR1cm4gTUIo MSk7CisJc3dpdGNoICh0c2VnX3NpemUpIHsKKwljYXNlIEk4NDVfVFNFR19TSVpFXzUxMks6CXJl dHVybiBLQig1MTIpOworCWNhc2UgSTg0NV9UU0VHX1NJWkVfMU06CQlyZXR1cm4gTUIoMSk7CiAJ ZGVmYXVsdDoKLQkJV0FSTl9PTigxKTsKLQkJcmV0dXJuIDA7CisJCVdBUk4oMSwgIlVua25vd24g cmVnaXN0ZXIgdmFsdWUhXG4iKTsKIAl9CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBzaXplX3Qg X19pbml0IGk4NXhfdHNlZ19zaXplKHZvaWQpCiB7Ci0JdTggdG1wID0gcmVhZF9wY2lfY29uZmln X2J5dGUoMCwgMCwgMCwgSTg1WF9FU01SQU1DKTsKKwl1OCBlc21yYW1jID0gcmVhZF9wY2lfY29u ZmlnX2J5dGUoMCwgMCwgMCwgSTg1WF9FU01SQU1DKTsKIAotCWlmICghKHRtcCAmIFRTRUdfRU5B QkxFKSkKKwlpZiAoIShlc21yYW1jICYgVFNFR19FTkFCTEUpKQogCQlyZXR1cm4gMDsKIAogCXJl dHVybiBNQigxKTsKQEAgLTMwMCwxNzQgKzI4MiwxNjYgQEAgc3RhdGljIHNpemVfdCBfX2luaXQg aTg1eF9tZW1fc2l6ZSh2b2lkKQogICogT24gODMwLzg0NS84NXggdGhlIHN0b2xlbiBtZW1vcnkg YmFzZSBpc24ndCBhdmFpbGFibGUgaW4gYW55CiAgKiByZWdpc3Rlci4gV2UgbmVlZCB0byBjYWxj dWxhdGUgaXQgYXMgVE9NLVRTRUdfU0laRS1zdG9sZW5fc2l6ZS4KICAqLwotc3RhdGljIHUzMiBf X2luaXQgaTgzMF9zdG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsIHNpemVf dCBzdG9sZW5fc2l6ZSkKK3N0YXRpYyBwaHlzX2FkZHJfdCBfX2luaXQgaTgzMF9zdG9sZW5fYmFz ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsCisJCQkJCSAgIHNpemVfdCBzdG9sZW5fc2l6 ZSkKIHsKLQlyZXR1cm4gaTgzMF9tZW1fc2l6ZSgpIC0gaTgzMF90c2VnX3NpemUoKSAtIHN0b2xl bl9zaXplOworCXJldHVybiAocGh5c19hZGRyX3QpaTgzMF9tZW1fc2l6ZSgpIC0gaTgzMF90c2Vn X3NpemUoKSAtIHN0b2xlbl9zaXplOwogfQogCi1zdGF0aWMgdTMyIF9faW5pdCBpODQ1X3N0b2xl bl9iYXNlKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywgc2l6ZV90IHN0b2xlbl9zaXplKQor c3RhdGljIHBoeXNfYWRkcl90IF9faW5pdCBpODQ1X3N0b2xlbl9iYXNlKGludCBudW0sIGludCBz bG90LCBpbnQgZnVuYywKKwkJCQkJICAgc2l6ZV90IHN0b2xlbl9zaXplKQogewotCXJldHVybiBp ODMwX21lbV9zaXplKCkgLSBpODQ1X3RzZWdfc2l6ZSgpIC0gc3RvbGVuX3NpemU7CisJcmV0dXJu IChwaHlzX2FkZHJfdClpODMwX21lbV9zaXplKCkgLSBpODQ1X3RzZWdfc2l6ZSgpIC0gc3RvbGVu X3NpemU7CiB9CiAKLXN0YXRpYyB1MzIgX19pbml0IGk4NXhfc3RvbGVuX2Jhc2UoaW50IG51bSwg aW50IHNsb3QsIGludCBmdW5jLCBzaXplX3Qgc3RvbGVuX3NpemUpCitzdGF0aWMgcGh5c19hZGRy X3QgX19pbml0IGk4NXhfc3RvbGVuX2Jhc2UoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAor CQkJCQkgICBzaXplX3Qgc3RvbGVuX3NpemUpCiB7Ci0JcmV0dXJuIGk4NXhfbWVtX3NpemUoKSAt IGk4NXhfdHNlZ19zaXplKCkgLSBzdG9sZW5fc2l6ZTsKKwlyZXR1cm4gKHBoeXNfYWRkcl90KWk4 NXhfbWVtX3NpemUoKSAtIGk4NXhfdHNlZ19zaXplKCkgLSBzdG9sZW5fc2l6ZTsKIH0KIAotc3Rh dGljIHUzMiBfX2luaXQgaTg2NV9zdG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1 bmMsIHNpemVfdCBzdG9sZW5fc2l6ZSkKK3N0YXRpYyBwaHlzX2FkZHJfdCBfX2luaXQgaTg2NV9z dG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsCisJCQkJCSAgIHNpemVfdCBz dG9sZW5fc2l6ZSkKIHsKKwl1MTYgdG91ZDsKKwogCS8qCiAJICogRklYTUUgaXMgdGhlIGdyYXBo aWNzIHN0b2xlbiBtZW1vcnkgcmVnaW9uCiAJICogYWx3YXlzIGF0IFRPVUQ/IEllLiBpcyBpdCBh bHdheXMgdGhlIGxhc3QKIAkgKiBvbmUgdG8gYmUgYWxsb2NhdGVkIGJ5IHRoZSBCSU9TPwogCSAq LwotCXJldHVybiByZWFkX3BjaV9jb25maWdfMTYoMCwgMCwgMCwgSTg2NV9UT1VEKSA8PCAxNjsK Kwl0b3VkID0gcmVhZF9wY2lfY29uZmlnXzE2KDAsIDAsIDAsIEk4NjVfVE9VRCk7CisKKwlyZXR1 cm4gKHBoeXNfYWRkcl90KXRvdWQgPDwgMTY7Cit9CisKK3N0YXRpYyBwaHlzX2FkZHJfdCBfX2lu aXQgZ2VuM19zdG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsCisJCQkJCSAg IHNpemVfdCBzdG9sZW5fc2l6ZSkKK3sKKwl1MzIgYnNtOworCisJLyogQWxtb3N0IHVuaXZlcnNh bGx5IHdlIGNhbiBmaW5kIHRoZSBHcmFwaGljcyBCYXNlIG9mIFN0b2xlbiBNZW1vcnkKKwkgKiBh dCByZWdpc3RlciBCU00gKDB4NWMpIGluIHRoZSBpZ2Z4IGNvbmZpZ3VyYXRpb24gc3BhY2UuIE9u IGEgZmV3CisJICogKGRlc2t0b3ApIG1hY2hpbmVzIHRoaXMgaXMgYWxzbyBtaXJyb3JlZCBpbiB0 aGUgYnJpZGdlIGRldmljZSBhdAorCSAqIGRpZmZlcmVudCBsb2NhdGlvbnMsIG9yIGluIHRoZSBN Q0hCQVIuCisJICovCisJYnNtID0gcmVhZF9wY2lfY29uZmlnKG51bSwgc2xvdCwgZnVuYywgSU5U RUxfQlNNKTsKKworCXJldHVybiAocGh5c19hZGRyX3QpYnNtICYgSU5URUxfQlNNX01BU0s7CiB9 CiAKIHN0YXRpYyBzaXplX3QgX19pbml0IGk4MzBfc3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNs b3QsIGludCBmdW5jKQogewotCXNpemVfdCBzdG9sZW5fc2l6ZTsKIAl1MTYgZ21jaF9jdHJsOwor CXUxNiBnbXM7CiAKIAlnbWNoX2N0cmwgPSByZWFkX3BjaV9jb25maWdfMTYoMCwgMCwgMCwgSTgz MF9HTUNIX0NUUkwpOwotCi0Jc3dpdGNoIChnbWNoX2N0cmwgJiBJODMwX0dNQ0hfR01TX01BU0sp IHsKLQljYXNlIEk4MzBfR01DSF9HTVNfU1RPTEVOXzUxMjoKLQkJc3RvbGVuX3NpemUgPSBLQig1 MTIpOwotCQlicmVhazsKLQljYXNlIEk4MzBfR01DSF9HTVNfU1RPTEVOXzEwMjQ6Ci0JCXN0b2xl bl9zaXplID0gTUIoMSk7Ci0JCWJyZWFrOwotCWNhc2UgSTgzMF9HTUNIX0dNU19TVE9MRU5fODE5 MjoKLQkJc3RvbGVuX3NpemUgPSBNQig4KTsKLQkJYnJlYWs7Ci0JY2FzZSBJODMwX0dNQ0hfR01T X0xPQ0FMOgotCQkvKiBsb2NhbCBtZW1vcnkgaXNuJ3QgcGFydCBvZiB0aGUgbm9ybWFsIGFkZHJl c3Mgc3BhY2UgKi8KLQkJc3RvbGVuX3NpemUgPSAwOwotCQlicmVhazsKKwlnbXMgPSBnbWNoX2N0 cmwgJiBJODMwX0dNQ0hfR01TX01BU0s7CisKKwlzd2l0Y2ggKGdtcykgeworCWNhc2UgSTgzMF9H TUNIX0dNU19TVE9MRU5fNTEyOglyZXR1cm4gS0IoNTEyKTsKKwljYXNlIEk4MzBfR01DSF9HTVNf U1RPTEVOXzEwMjQ6CXJldHVybiBNQigxKTsKKwljYXNlIEk4MzBfR01DSF9HTVNfU1RPTEVOXzgx OTI6CXJldHVybiBNQig4KTsKKwkvKiBsb2NhbCBtZW1vcnkgaXNuJ3QgcGFydCBvZiB0aGUgbm9y bWFsIGFkZHJlc3Mgc3BhY2UgKi8KKwljYXNlIEk4MzBfR01DSF9HTVNfTE9DQUw6CXJldHVybiAw OwogCWRlZmF1bHQ6Ci0JCXJldHVybiAwOworCQlXQVJOKDEsICJVbmtub3duIHJlZ2lzdGVyIHZh bHVlIVxuIik7CiAJfQogCi0JcmV0dXJuIHN0b2xlbl9zaXplOworCXJldHVybiAwOwogfQogCiBz dGF0aWMgc2l6ZV90IF9faW5pdCBnZW4zX3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBp bnQgZnVuYykKIHsKLQlzaXplX3Qgc3RvbGVuX3NpemU7CiAJdTE2IGdtY2hfY3RybDsKKwl1MTYg Z21zOwogCiAJZ21jaF9jdHJsID0gcmVhZF9wY2lfY29uZmlnXzE2KDAsIDAsIDAsIEk4MzBfR01D SF9DVFJMKTsKLQotCXN3aXRjaCAoZ21jaF9jdHJsICYgSTg1NV9HTUNIX0dNU19NQVNLKSB7Ci0J Y2FzZSBJODU1X0dNQ0hfR01TX1NUT0xFTl8xTToKLQkJc3RvbGVuX3NpemUgPSBNQigxKTsKLQkJ YnJlYWs7Ci0JY2FzZSBJODU1X0dNQ0hfR01TX1NUT0xFTl80TToKLQkJc3RvbGVuX3NpemUgPSBN Qig0KTsKLQkJYnJlYWs7Ci0JY2FzZSBJODU1X0dNQ0hfR01TX1NUT0xFTl84TToKLQkJc3RvbGVu X3NpemUgPSBNQig4KTsKLQkJYnJlYWs7Ci0JY2FzZSBJODU1X0dNQ0hfR01TX1NUT0xFTl8xNk06 Ci0JCXN0b2xlbl9zaXplID0gTUIoMTYpOwotCQlicmVhazsKLQljYXNlIEk4NTVfR01DSF9HTVNf U1RPTEVOXzMyTToKLQkJc3RvbGVuX3NpemUgPSBNQigzMik7Ci0JCWJyZWFrOwotCWNhc2UgSTkx NV9HTUNIX0dNU19TVE9MRU5fNDhNOgotCQlzdG9sZW5fc2l6ZSA9IE1CKDQ4KTsKLQkJYnJlYWs7 Ci0JY2FzZSBJOTE1X0dNQ0hfR01TX1NUT0xFTl82NE06Ci0JCXN0b2xlbl9zaXplID0gTUIoNjQp OwotCQlicmVhazsKLQljYXNlIEczM19HTUNIX0dNU19TVE9MRU5fMTI4TToKLQkJc3RvbGVuX3Np emUgPSBNQigxMjgpOwotCQlicmVhazsKLQljYXNlIEczM19HTUNIX0dNU19TVE9MRU5fMjU2TToK LQkJc3RvbGVuX3NpemUgPSBNQigyNTYpOwotCQlicmVhazsKLQljYXNlIElOVEVMX0dNQ0hfR01T X1NUT0xFTl85Nk06Ci0JCXN0b2xlbl9zaXplID0gTUIoOTYpOwotCQlicmVhazsKLQljYXNlIElO VEVMX0dNQ0hfR01TX1NUT0xFTl8xNjBNOgotCQlzdG9sZW5fc2l6ZSA9IE1CKDE2MCk7Ci0JCWJy ZWFrOwotCWNhc2UgSU5URUxfR01DSF9HTVNfU1RPTEVOXzIyNE06Ci0JCXN0b2xlbl9zaXplID0g TUIoMjI0KTsKLQkJYnJlYWs7Ci0JY2FzZSBJTlRFTF9HTUNIX0dNU19TVE9MRU5fMzUyTToKLQkJ c3RvbGVuX3NpemUgPSBNQigzNTIpOwotCQlicmVhazsKKwlnbXMgPSBnbWNoX2N0cmwgJiBJODU1 X0dNQ0hfR01TX01BU0s7CisKKwlzd2l0Y2ggKGdtcykgeworCWNhc2UgSTg1NV9HTUNIX0dNU19T VE9MRU5fMU06CXJldHVybiBNQigxKTsKKwljYXNlIEk4NTVfR01DSF9HTVNfU1RPTEVOXzRNOgly ZXR1cm4gTUIoNCk7CisJY2FzZSBJODU1X0dNQ0hfR01TX1NUT0xFTl84TToJcmV0dXJuIE1CKDgp OworCWNhc2UgSTg1NV9HTUNIX0dNU19TVE9MRU5fMTZNOglyZXR1cm4gTUIoMTYpOworCWNhc2Ug STg1NV9HTUNIX0dNU19TVE9MRU5fMzJNOglyZXR1cm4gTUIoMzIpOworCWNhc2UgSTkxNV9HTUNI X0dNU19TVE9MRU5fNDhNOglyZXR1cm4gTUIoNDgpOworCWNhc2UgSTkxNV9HTUNIX0dNU19TVE9M RU5fNjRNOglyZXR1cm4gTUIoNjQpOworCWNhc2UgRzMzX0dNQ0hfR01TX1NUT0xFTl8xMjhNOgly ZXR1cm4gTUIoMTI4KTsKKwljYXNlIEczM19HTUNIX0dNU19TVE9MRU5fMjU2TToJcmV0dXJuIE1C KDI1Nik7CisJY2FzZSBJTlRFTF9HTUNIX0dNU19TVE9MRU5fOTZNOglyZXR1cm4gTUIoOTYpOwor CWNhc2UgSU5URUxfR01DSF9HTVNfU1RPTEVOXzE2ME06cmV0dXJuIE1CKDE2MCk7CisJY2FzZSBJ TlRFTF9HTUNIX0dNU19TVE9MRU5fMjI0TTpyZXR1cm4gTUIoMjI0KTsKKwljYXNlIElOVEVMX0dN Q0hfR01TX1NUT0xFTl8zNTJNOnJldHVybiBNQigzNTIpOwogCWRlZmF1bHQ6Ci0JCXN0b2xlbl9z aXplID0gMDsKLQkJYnJlYWs7CisJCVdBUk4oMSwgIlVua25vd24gcmVnaXN0ZXIgdmFsdWUhXG4i KTsKIAl9CiAKLQlyZXR1cm4gc3RvbGVuX3NpemU7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBz aXplX3QgX19pbml0IGdlbjZfc3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5j KQogewogCXUxNiBnbWNoX2N0cmw7CisJdTE2IGdtczsKIAogCWdtY2hfY3RybCA9IHJlYWRfcGNp X2NvbmZpZ18xNihudW0sIHNsb3QsIGZ1bmMsIFNOQl9HTUNIX0NUUkwpOwotCWdtY2hfY3RybCA+ Pj0gU05CX0dNQ0hfR01TX1NISUZUOwotCWdtY2hfY3RybCAmPSBTTkJfR01DSF9HTVNfTUFTSzsK KwlnbXMgPSAoZ21jaF9jdHJsID4+IFNOQl9HTUNIX0dNU19TSElGVCkgJiBTTkJfR01DSF9HTVNf TUFTSzsKIAotCXJldHVybiBnbWNoX2N0cmwgPDwgMjU7IC8qIDMyIE1CIHVuaXRzICovCisJcmV0 dXJuIChzaXplX3QpZ21zICogTUIoMzIpOwogfQogCiBzdGF0aWMgc2l6ZV90IF9faW5pdCBnZW44 X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsKIAl1MTYgZ21jaF9j dHJsOworCXUxNiBnbXM7CiAKIAlnbWNoX2N0cmwgPSByZWFkX3BjaV9jb25maWdfMTYobnVtLCBz bG90LCBmdW5jLCBTTkJfR01DSF9DVFJMKTsKLQlnbWNoX2N0cmwgPj49IEJEV19HTUNIX0dNU19T SElGVDsKLQlnbWNoX2N0cmwgJj0gQkRXX0dNQ0hfR01TX01BU0s7Ci0JcmV0dXJuIGdtY2hfY3Ry bCA8PCAyNTsgLyogMzIgTUIgdW5pdHMgKi8KKwlnbXMgPSAoZ21jaF9jdHJsID4+IEJEV19HTUNI X0dNU19TSElGVCkgJiBCRFdfR01DSF9HTVNfTUFTSzsKKworCXJldHVybiAoc2l6ZV90KWdtcyAq IE1CKDMyKTsKIH0KIAogc3RhdGljIHNpemVfdCBfX2luaXQgY2h2X3N0b2xlbl9zaXplKGludCBu dW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsKIAl1MTYgZ21jaF9jdHJsOworCXUxNiBnbXM7CiAK IAlnbWNoX2N0cmwgPSByZWFkX3BjaV9jb25maWdfMTYobnVtLCBzbG90LCBmdW5jLCBTTkJfR01D SF9DVFJMKTsKLQlnbWNoX2N0cmwgPj49IFNOQl9HTUNIX0dNU19TSElGVDsKLQlnbWNoX2N0cmwg Jj0gU05CX0dNQ0hfR01TX01BU0s7CisJZ21zID0gKGdtY2hfY3RybCA+PiBTTkJfR01DSF9HTVNf U0hJRlQpICYgU05CX0dNQ0hfR01TX01BU0s7CiAKIAkvKgogCSAqIDB4MCAgdG8gMHgxMDogMzJN QiBpbmNyZW1lbnRzIHN0YXJ0aW5nIGF0IDBNQgogCSAqIDB4MTEgdG8gMHgxNjogNE1CIGluY3Jl bWVudHMgc3RhcnRpbmcgYXQgOE1CCiAJICogMHgxNyB0byAweDFkOiA0TUIgaW5jcmVtZW50cyBz dGFydCBhdCAzNk1CCiAJICovCi0JaWYgKGdtY2hfY3RybCA8IDB4MTEpCi0JCXJldHVybiBnbWNo X2N0cmwgPDwgMjU7Ci0JZWxzZSBpZiAoZ21jaF9jdHJsIDwgMHgxNykKLQkJcmV0dXJuIChnbWNo X2N0cmwgLSAweDExICsgMikgPDwgMjI7CisJaWYgKGdtcyA8IDB4MTEpCisJCXJldHVybiAoc2l6 ZV90KWdtcyAqIE1CKDMyKTsKKwllbHNlIGlmIChnbXMgPCAweDE3KQorCQlyZXR1cm4gKHNpemVf dCkoZ21zIC0gMHgxMSArIDIpICogTUIoNCk7CiAJZWxzZQotCQlyZXR1cm4gKGdtY2hfY3RybCAt IDB4MTcgKyA5KSA8PCAyMjsKKwkJcmV0dXJuIChzaXplX3QpKGdtcyAtIDB4MTcgKyA5KSAqIE1C KDQpOwogfQogCiBzdHJ1Y3QgaW50ZWxfc3RvbGVuX2Z1bmNzIHsKIAlzaXplX3QgKCpzaXplKShp bnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpOwotCXUzMiAoKmJhc2UpKGludCBudW0sIGludCBz bG90LCBpbnQgZnVuYywgc2l6ZV90IHNpemUpOworCXBoeXNfYWRkcl90ICgqYmFzZSkoaW50IG51 bSwgaW50IHNsb3QsIGludCBmdW5jLCBzaXplX3Qgc2l6ZSk7CiB9OwogCiBzdGF0aWMgc2l6ZV90 IF9faW5pdCBnZW45X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsK IAl1MTYgZ21jaF9jdHJsOworCXUxNiBnbXM7CiAKIAlnbWNoX2N0cmwgPSByZWFkX3BjaV9jb25m aWdfMTYobnVtLCBzbG90LCBmdW5jLCBTTkJfR01DSF9DVFJMKTsKLQlnbWNoX2N0cmwgPj49IEJE V19HTUNIX0dNU19TSElGVDsKLQlnbWNoX2N0cmwgJj0gQkRXX0dNQ0hfR01TX01BU0s7CisJZ21z ID0gKGdtY2hfY3RybCA+PiBCRFdfR01DSF9HTVNfU0hJRlQpICYgQkRXX0dNQ0hfR01TX01BU0s7 CiAKLQlpZiAoZ21jaF9jdHJsIDwgMHhmMCkKLQkJcmV0dXJuIGdtY2hfY3RybCA8PCAyNTsgLyog MzIgTUIgdW5pdHMgKi8KKwkvKiAweDAgIHRvIDB4ZWY6IDMyTUIgaW5jcmVtZW50cyBzdGFydGlu ZyBhdCAwTUIgKi8KKwkvKiAweGYwIHRvIDB4ZmU6IDRNQiBpbmNyZW1lbnRzIHN0YXJ0aW5nIGF0 IDRNQiAqLworCWlmIChnbXMgPCAweGYwKQorCQlyZXR1cm4gKHNpemVfdClnbXMgKiBNQigzMik7 CiAJZWxzZQotCQkvKiA0TUIgaW5jcmVtZW50cyBzdGFydGluZyBhdCAweGYwIGZvciA0TUIgKi8K LQkJcmV0dXJuIChnbWNoX2N0cmwgLSAweGYwICsgMSkgPDwgMjI7CisJCXJldHVybiAoc2l6ZV90 KShnbXMgLSAweGYwICsgMSkgKiBNQig0KTsKIH0KIAogdHlwZWRlZiBzaXplX3QgKCpzdG9sZW5f c2l6ZV9mbikoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKTsKQEAgLTQ5MywyNyArNDY3LDI3 IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfc3RvbGVuX2Z1bmNzIGk4NjVfc3RvbGVuX2Z1 bmNzIF9faW5pdGNvbnN0ID0gewogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9zdG9s ZW5fZnVuY3MgZ2VuM19zdG9sZW5fZnVuY3MgX19pbml0Y29uc3QgPSB7Ci0JLmJhc2UgPSBpbnRl bF9zdG9sZW5fYmFzZSwKKwkuYmFzZSA9IGdlbjNfc3RvbGVuX2Jhc2UsCiAJLnNpemUgPSBnZW4z X3N0b2xlbl9zaXplLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9zdG9sZW5fZnVu Y3MgZ2VuNl9zdG9sZW5fZnVuY3MgX19pbml0Y29uc3QgPSB7Ci0JLmJhc2UgPSBpbnRlbF9zdG9s ZW5fYmFzZSwKKwkuYmFzZSA9IGdlbjNfc3RvbGVuX2Jhc2UsCiAJLnNpemUgPSBnZW42X3N0b2xl bl9zaXplLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9zdG9sZW5fZnVuY3MgZ2Vu OF9zdG9sZW5fZnVuY3MgX19pbml0Y29uc3QgPSB7Ci0JLmJhc2UgPSBpbnRlbF9zdG9sZW5fYmFz ZSwKKwkuYmFzZSA9IGdlbjNfc3RvbGVuX2Jhc2UsCiAJLnNpemUgPSBnZW44X3N0b2xlbl9zaXpl LAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9zdG9sZW5fZnVuY3MgZ2VuOV9zdG9s ZW5fZnVuY3MgX19pbml0Y29uc3QgPSB7Ci0JLmJhc2UgPSBpbnRlbF9zdG9sZW5fYmFzZSwKKwku YmFzZSA9IGdlbjNfc3RvbGVuX2Jhc2UsCiAJLnNpemUgPSBnZW45X3N0b2xlbl9zaXplLAogfTsK IAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9zdG9sZW5fZnVuY3MgY2h2X3N0b2xlbl9mdW5j cyBfX2luaXRjb25zdCA9IHsKLQkuYmFzZSA9IGludGVsX3N0b2xlbl9iYXNlLAorCS5iYXNlID0g Z2VuM19zdG9sZW5fYmFzZSwKIAkuc2l6ZSA9IGNodl9zdG9sZW5fc2l6ZSwKIH07CiAKQEAgLTU1 NCw3ICs1MjgsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuKGlu dCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsKIAlzaXplX3Qgc2l6ZTsKIAlpbnQgaTsKLQl1 MzIgc3RhcnQ7CisJcGh5c19hZGRyX3Qgc3RhcnQ7CiAJdTE2IGRldmljZSwgc3VidmVuZG9yLCBz dWJkZXZpY2U7CiAKIAlkZXZpY2UgPSByZWFkX3BjaV9jb25maWdfMTYobnVtLCBzbG90LCBmdW5j LCBQQ0lfREVWSUNFX0lEKTsKQEAgLTU2OSw4ICs1NDMsOCBAQCBzdGF0aWMgdm9pZCBfX2luaXQg aW50ZWxfZ3JhcGhpY3Nfc3RvbGVuKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIAkJCXNp emUgPSBzdG9sZW5fZnVuY3MtPnNpemUobnVtLCBzbG90LCBmdW5jKTsKIAkJCXN0YXJ0ID0gc3Rv bGVuX2Z1bmNzLT5iYXNlKG51bSwgc2xvdCwgZnVuYywgc2l6ZSk7CiAJCQlpZiAoc2l6ZSAmJiBz dGFydCkgewotCQkJCXByaW50ayhLRVJOX0lORk8gIlJlc2VydmluZyBJbnRlbCBncmFwaGljcyBz dG9sZW4gbWVtb3J5IGF0IDB4JXgtMHgleFxuIiwKLQkJCQkgICAgICAgc3RhcnQsIHN0YXJ0ICsg KHUzMilzaXplIC0gMSk7CisJCQkJcHJpbnRrKEtFUk5fSU5GTyAiUmVzZXJ2aW5nIEludGVsIGdy YXBoaWNzIHN0b2xlbiBtZW1vcnkgYXQgMHglbGx4LTB4JWxseFxuIiwKKwkJCQkgICAgICAgc3Rh cnQsIHN0YXJ0ICsgc2l6ZSAtIDEpOwogCQkJCS8qIE1hcmsgdGhpcyBzcGFjZSBhcyByZXNlcnZl ZCAqLwogCQkJCWU4MjBfYWRkX3JlZ2lvbihzdGFydCwgc2l6ZSwgRTgyMF9SRVNFUlZFRCk7CiAJ CQkJc2FuaXRpemVfZTgyMF9tYXAoZTgyMC5tYXAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3N0b2xlbi5jCmluZGV4IGI3Y2U5NjMuLjY4ZmRlOGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3N0b2xlbi5jCkBAIC0xMDksOSArMTA5LDkgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcg aTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPj0gMykgewogCQl1MzIgYnNtOwogCi0JCXBjaV9yZWFkX2NvbmZp Z19kd29yZChkZXYtPnBkZXYsIEJTTSwgJmJzbSk7CisJCXBjaV9yZWFkX2NvbmZpZ19kd29yZChk ZXYtPnBkZXYsIElOVEVMX0JTTSwgJmJzbSk7CiAKLQkJYmFzZSA9IGJzbSAmIEJTTV9NQVNLOwor CQliYXNlID0gYnNtICYgSU5URUxfQlNNX01BU0s7CiAJfSBlbHNlIGlmIChJU19JODY1RyhkZXYp KSB7CiAJCXUxNiB0b3VkID0gMDsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vaTkxNV9kcm0u aCBiL2luY2x1ZGUvZHJtL2k5MTVfZHJtLmgKaW5kZXggNTk1Zjg1Yy4uYjE3NTVmOCAxMDA2NDQK LS0tIGEvaW5jbHVkZS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL2RybS9pOTE1X2RybS5o CkBAIC05Miw0ICs5Miw3IEBAIGV4dGVybiBib29sIGk5MTVfZ3B1X3R1cmJvX2Rpc2FibGUodm9p ZCk7CiAjZGVmaW5lICAgIEk4NDVfVFNFR19TSVpFXzUxMksJKDIgPDwgMSkKICNkZWZpbmUgICAg STg0NV9UU0VHX1NJWkVfMU0JKDMgPDwgMSkKIAorI2RlZmluZSBJTlRFTF9CU00gMHg1YworI2Rl ZmluZSAgIElOVEVMX0JTTV9NQVNLICgweEZGRkYgPDwgMjApCisKICNlbmRpZgkJCQkvKiBfSTkx NV9EUk1fSF8gKi8KLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK