From: Mahesh Kumar Subject: [PATCH 2/8] drm/i915/skl+: Optimize WM calculation Date: Thu, 17 Aug 2017 19:15:23 +0530 Message-ID: <20170817134529.2839-3-mahesh1.kumar@intel.com> References: <20170817134529.2839-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id E41456E359 for ; Thu, 17 Aug 2017 13:41:01 +0000 (UTC) In-Reply-To: <20170817134529.2839-1-mahesh1.kumar@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-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com, paulo.r.zanoni@intel.com, maarten.lankhorst@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClBsYW5lIGNv bmZpZ3VyYXRpb24gcGFyYW1ldGVycyBkb2Vzbid0IGNoYW5nZSBmb3IgZWFjaCBXTS1sZXZlbApj YWxjdWxhdGlvbi4gQ3VycmVudGx5IHdlIGNvbXB1dGUgc2FtZSBwYXJhbWV0ZXJzIDggdGltZXMg Zm9yIGVhY2gKd20tbGV2ZWwuClRoaXMgcGF0Y2ggb3B0aW1pemVzIGl0IGJ5IGNhbGN1bGF0aW5n IHRoZXNlIHBhcmFtZXRlcnMgaW4gYmVnaW5uaW5nCiYgcmV1c2UgZHVyaW5nIGVhY2ggbGV2ZWwt d20gY2FsY3VsYXRpb24uCgpDaGFuZ2VzIHNpbmNlIFYxOgogLSByZWJhc2Ugb24gdG9wIG9mIFJv ZHJpZ28ncyBzZXJpZXMgZm9yIENOTAoKU2lnbmVkLW9mZi1ieTogTWFoZXNoIEt1bWFyIDxtYWhl c2gxLmt1bWFyQGludGVsLmNvbT4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3Jz dCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggfCAgMTQgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIHwgMTkwICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTE5IGluc2VydGlvbnMoKyksIDg1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IGZhNTg1OGRhMmNhMC4uMzIwZGE4NzVkN2UwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTE4MTEsNiArMTgxMSwyMCBAQCBzdHJ1Y3Qgc2tsX3dtX2xldmVs IHsKIAl1aW50OF90IHBsYW5lX3Jlc19sOwogfTsKIAorLyogU3RvcmVzIHBsYW5lIHNwZWNpZmlj IFdNIHBhcmFtZXRlcnMgKi8KK3N0cnVjdCBza2xfd21fcGFyYW1zIHsKKwlib29sIHhfdGlsZWQs IHlfdGlsZWQ7CisJYm9vbCByY19zdXJmYWNlOworCXVpbnQzMl90IHdpZHRoOworCXVpbnQ4X3Qg Y3BwOworCXVpbnQzMl90IHBsYW5lX3BpeGVsX3JhdGU7CisJdWludDMyX3QgeV9taW5fc2Nhbmxp bmVzOworCXVpbnQzMl90IHBsYW5lX2J5dGVzX3Blcl9saW5lOworCXVpbnRfZml4ZWRfMTZfMTZf dCBwbGFuZV9ibG9ja3NfcGVyX2xpbmU7CisJdWludF9maXhlZF8xNl8xNl90IHlfdGlsZV9taW5p bXVtOworCXVpbnQzMl90IGxpbmV0aW1lX3VzOworfTsKKwogLyoKICAqIFRoaXMgc3RydWN0IGhl bHBzIHRyYWNraW5nIHRoZSBzdGF0ZSBuZWVkZWQgZm9yIHJ1bnRpbWUgUE0sIHdoaWNoIHB1dHMg dGhlCiAgKiBkZXZpY2UgaW4gUENJIEQzIHN0YXRlLiBOb3RpY2UgdGhhdCB3aGVuIHRoaXMgaGFw cGVucywgbm90aGluZyBvbiB0aGUKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGVkNjYyOTM3 ZWMzYy4uNDdjMDFkYTJlMTA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTQzNzAsMTM0 ICs0MzcwLDE0NiBAQCBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJCQkgICAgZG93bnNjYWxlX2Ftb3VudCk7CiB9 CiAKLXN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUs Ci0JCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCi0JCQkJ dWludDE2X3QgZGRiX2FsbG9jYXRpb24sCi0JCQkJaW50IGxldmVsLAotCQkJCXVpbnQxNl90ICpv dXRfYmxvY2tzLCAvKiBvdXQgKi8KLQkJCQl1aW50OF90ICpvdXRfbGluZXMsIC8qIG91dCAqLwot CQkJCWJvb2wgKmVuYWJsZWQgLyogb3V0ICovKQorc3RhdGljIGludAorc2tsX2NvbXB1dGVfcGxh bmVfd21fcGFyYW1zKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJ CSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJICAgIGNvbnN0IHN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAorCQkJICAgIHN0cnVjdCBza2xfd21f cGFyYW1zICp3cCkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxh bmUoaW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5lKTsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOwogCWNvbnN0IHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiID0gcHN0YXRlLT5mYjsKLQl1aW50MzJfdCBsYXRlbmN5ID0gZGV2X3ByaXYt PndtLnNrbF9sYXRlbmN5W2xldmVsXTsKLQl1aW50X2ZpeGVkXzE2XzE2X3QgbWV0aG9kMSwgbWV0 aG9kMjsKLQl1aW50X2ZpeGVkXzE2XzE2X3QgcGxhbmVfYmxvY2tzX3Blcl9saW5lOwotCXVpbnRf Zml4ZWRfMTZfMTZfdCBzZWxlY3RlZF9yZXN1bHQ7CiAJdWludDMyX3QgaW50ZXJtX3BicGw7Ci0J dWludDMyX3QgcGxhbmVfYnl0ZXNfcGVyX2xpbmU7Ci0JdWludDMyX3QgcmVzX2Jsb2NrcywgcmVz X2xpbmVzOwotCXVpbnQ4X3QgY3BwOwotCXVpbnQzMl90IHdpZHRoID0gMDsKLQl1aW50MzJfdCBw bGFuZV9waXhlbF9yYXRlOwotCXVpbnRfZml4ZWRfMTZfMTZfdCB5X3RpbGVfbWluaW11bTsKLQl1 aW50MzJfdCB5X21pbl9zY2FubGluZXM7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3Rh dGUgPQogCQl0b19pbnRlbF9hdG9taWNfc3RhdGUoY3N0YXRlLT5iYXNlLnN0YXRlKTsKIAlib29s IGFwcGx5X21lbW9yeV9id193YSA9IHNrbF9uZWVkc19tZW1vcnlfYndfd2Eoc3RhdGUpOwotCWJv b2wgeV90aWxlZCwgeF90aWxlZDsKIAotCWlmIChsYXRlbmN5ID09IDAgfHwKLQkgICAgIWludGVs X3dtX3BsYW5lX3Zpc2libGUoY3N0YXRlLCBpbnRlbF9wc3RhdGUpKSB7Ci0JCSplbmFibGVkID0g ZmFsc2U7CisJaWYgKCFpbnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwgaW50ZWxfcHN0YXRl KSkKIAkJcmV0dXJuIDA7Ci0JfQogCi0JeV90aWxlZCA9IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZP Uk1BVF9NT0RfWV9USUxFRCB8fAotCQkgIGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0Rf WWZfVElMRUQgfHwKLQkJICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRURf Q0NTIHx8Ci0JCSAgZmItPm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1M7 Ci0JeF90aWxlZCA9IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDsKLQot CS8qIERpc3BsYXkgV0EgIzExNDE6IGtibCxjZmwgKi8KLQlpZiAoKElTX0tBQllMQUtFKGRldl9w cml2KSB8fCBJU19DT0ZGRUVMQUtFKGRldl9wcml2KSkgJiYKLQkgICAgZGV2X3ByaXYtPmlwY19l bmFibGVkKQotCQlsYXRlbmN5ICs9IDQ7Ci0KLQlpZiAoYXBwbHlfbWVtb3J5X2J3X3dhICYmIHhf dGlsZWQpCi0JCWxhdGVuY3kgKz0gMTU7CisJd3AtPnlfdGlsZWQgPSBmYi0+bW9kaWZpZXIgPT0g STkxNV9GT1JNQVRfTU9EX1lfVElMRUQgfHwKKwkJICAgICAgZmItPm1vZGlmaWVyID09IEk5MTVf Rk9STUFUX01PRF9ZZl9USUxFRCB8fAorCQkgICAgICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JN QVRfTU9EX1lfVElMRURfQ0NTIHx8CisJCSAgICAgIGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1B VF9NT0RfWWZfVElMRURfQ0NTOworCXdwLT54X3RpbGVkID0gZmItPm1vZGlmaWVyID09IEk5MTVf Rk9STUFUX01PRF9YX1RJTEVEOworCXdwLT5yY19zdXJmYWNlID0gZmItPm1vZGlmaWVyID09IEk5 MTVfRk9STUFUX01PRF9ZX1RJTEVEX0NDUyB8fAorCQkJIGZiLT5tb2RpZmllciA9PSBJOTE1X0ZP Uk1BVF9NT0RfWWZfVElMRURfQ0NTOwogCiAJaWYgKHBsYW5lLT5pZCA9PSBQTEFORV9DVVJTT1Ip IHsKLQkJd2lkdGggPSBpbnRlbF9wc3RhdGUtPmJhc2UuY3J0Y193OworCQl3cC0+d2lkdGggPSBp bnRlbF9wc3RhdGUtPmJhc2UuY3J0Y193OwogCX0gZWxzZSB7CiAJCS8qCiAJCSAqIFNyYyBjb29y ZGluYXRlcyBhcmUgYWxyZWFkeSByb3RhdGVkIGJ5IDI3MCBkZWdyZWVzIGZvcgogCQkgKiB0aGUg OTAvMjcwIGRlZ3JlZSBwbGFuZSByb3RhdGlvbiBjYXNlcyAodG8gbWF0Y2ggdGhlCiAJCSAqIEdU VCBtYXBwaW5nKSwgaGVuY2Ugbm8gbmVlZCB0byBhY2NvdW50IGZvciByb3RhdGlvbiBoZXJlLgog CQkgKi8KLQkJd2lkdGggPSBkcm1fcmVjdF93aWR0aCgmaW50ZWxfcHN0YXRlLT5iYXNlLnNyYykg Pj4gMTY7CisJCXdwLT53aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZpbnRlbF9wc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAl9CiAKLQljcHAgPSAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JN QVRfTlYxMikgPyBmYi0+Zm9ybWF0LT5jcHBbMV0gOgotCQkJCQkJCWZiLT5mb3JtYXQtPmNwcFsw XTsKLQlwbGFuZV9waXhlbF9yYXRlID0gc2tsX2FkanVzdGVkX3BsYW5lX3BpeGVsX3JhdGUoY3N0 YXRlLCBpbnRlbF9wc3RhdGUpOworCXdwLT5jcHAgPSAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERS TV9GT1JNQVRfTlYxMikgPyBmYi0+Zm9ybWF0LT5jcHBbMV0gOgorCQkJCQkJCSAgICBmYi0+Zm9y bWF0LT5jcHBbMF07CisJd3AtPnBsYW5lX3BpeGVsX3JhdGUgPSBza2xfYWRqdXN0ZWRfcGxhbmVf cGl4ZWxfcmF0ZShjc3RhdGUsCisJCQkJCQkJICAgICBpbnRlbF9wc3RhdGUpOwogCiAJaWYgKGRy bV9yb3RhdGlvbl85MF9vcl8yNzAocHN0YXRlLT5yb3RhdGlvbikpIHsKIAotCQlzd2l0Y2ggKGNw cCkgeworCQlzd2l0Y2ggKHdwLT5jcHApIHsKIAkJY2FzZSAxOgotCQkJeV9taW5fc2NhbmxpbmVz ID0gMTY7CisJCQl3cC0+eV9taW5fc2NhbmxpbmVzID0gMTY7CiAJCQlicmVhazsKIAkJY2FzZSAy OgotCQkJeV9taW5fc2NhbmxpbmVzID0gODsKKwkJCXdwLT55X21pbl9zY2FubGluZXMgPSA4Owog CQkJYnJlYWs7CiAJCWNhc2UgNDoKLQkJCXlfbWluX3NjYW5saW5lcyA9IDQ7CisJCQl3cC0+eV9t aW5fc2NhbmxpbmVzID0gNDsKIAkJCWJyZWFrOwogCQlkZWZhdWx0OgotCQkJTUlTU0lOR19DQVNF KGNwcCk7CisJCQlNSVNTSU5HX0NBU0Uod3AtPmNwcCk7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJ fQogCX0gZWxzZSB7Ci0JCXlfbWluX3NjYW5saW5lcyA9IDQ7CisJCXdwLT55X21pbl9zY2FubGlu ZXMgPSA0OwogCX0KIAogCWlmIChhcHBseV9tZW1vcnlfYndfd2EpCi0JCXlfbWluX3NjYW5saW5l cyAqPSAyOworCQl3cC0+eV9taW5fc2NhbmxpbmVzICo9IDI7CiAKLQlwbGFuZV9ieXRlc19wZXJf bGluZSA9IHdpZHRoICogY3BwOwotCWlmICh5X3RpbGVkKSB7Ci0JCWludGVybV9wYnBsID0gRElW X1JPVU5EX1VQKHBsYW5lX2J5dGVzX3Blcl9saW5lICoKLQkJCQkJICAgeV9taW5fc2NhbmxpbmVz LCA1MTIpOworCXdwLT5wbGFuZV9ieXRlc19wZXJfbGluZSA9IHdwLT53aWR0aCAqIHdwLT5jcHA7 CisJaWYgKHdwLT55X3RpbGVkKSB7CisJCWludGVybV9wYnBsID0gRElWX1JPVU5EX1VQKHdwLT5w bGFuZV9ieXRlc19wZXJfbGluZSAqCisJCQkJCSAgIHdwLT55X21pbl9zY2FubGluZXMsIDUxMik7 CiAKIAkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTApCiAJCQlpbnRlcm1fcGJwbCsrOwog Ci0JCXBsYW5lX2Jsb2Nrc19wZXJfbGluZSA9IGRpdl9maXhlZDE2KGludGVybV9wYnBsLAotCQkJ CQkJCXlfbWluX3NjYW5saW5lcyk7Ci0JfSBlbHNlIGlmICh4X3RpbGVkICYmIElOVEVMX0dFTihk ZXZfcHJpdikgPT0gOSkgewotCQlpbnRlcm1fcGJwbCA9IERJVl9ST1VORF9VUChwbGFuZV9ieXRl c19wZXJfbGluZSwgNTEyKTsKLQkJcGxhbmVfYmxvY2tzX3Blcl9saW5lID0gdTMyX3RvX2ZpeGVk MTYoaW50ZXJtX3BicGwpOworCQl3cC0+cGxhbmVfYmxvY2tzX3Blcl9saW5lID0gZGl2X2ZpeGVk MTYoaW50ZXJtX3BicGwsCisJCQkJCQkJd3AtPnlfbWluX3NjYW5saW5lcyk7CisJfSBlbHNlIGlm ICh3cC0+eF90aWxlZCAmJiBJU19HRU45KGRldl9wcml2KSkgeworCQlpbnRlcm1fcGJwbCA9IERJ Vl9ST1VORF9VUCh3cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMik7CisJCXdwLT5wbGFuZV9i bG9ja3NfcGVyX2xpbmUgPSB1MzJfdG9fZml4ZWQxNihpbnRlcm1fcGJwbCk7CiAJfSBlbHNlIHsK LQkJaW50ZXJtX3BicGwgPSBESVZfUk9VTkRfVVAocGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMikg KyAxOwotCQlwbGFuZV9ibG9ja3NfcGVyX2xpbmUgPSB1MzJfdG9fZml4ZWQxNihpbnRlcm1fcGJw bCk7CisJCWludGVybV9wYnBsID0gRElWX1JPVU5EX1VQKHdwLT5wbGFuZV9ieXRlc19wZXJfbGlu ZSwgNTEyKSArIDE7CisJCXdwLT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUgPSB1MzJfdG9fZml4ZWQx NihpbnRlcm1fcGJwbCk7CiAJfQogCi0JbWV0aG9kMSA9IHNrbF93bV9tZXRob2QxKGRldl9wcml2 LCBwbGFuZV9waXhlbF9yYXRlLCBjcHAsIGxhdGVuY3kpOwotCW1ldGhvZDIgPSBza2xfd21fbWV0 aG9kMihwbGFuZV9waXhlbF9yYXRlLAorCXdwLT55X3RpbGVfbWluaW11bSA9IG11bF91MzJfZml4 ZWQxNih3cC0+eV9taW5fc2NhbmxpbmVzLAorCQkJCQkgICAgIHdwLT5wbGFuZV9ibG9ja3NfcGVy X2xpbmUpOworCXdwLT5saW5ldGltZV91cyA9IGZpeGVkMTZfdG9fdTMyX3JvdW5kX3VwKAorCQkJ CQlpbnRlbF9nZXRfbGluZXRpbWVfdXMoY3N0YXRlKSk7CisKKwlyZXR1cm4gMDsKK30KKworc3Rh dGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCQlj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKKwkJCQl1aW50MTZf dCBkZGJfYWxsb2NhdGlvbiwKKwkJCQlpbnQgbGV2ZWwsCisJCQkJY29uc3Qgc3RydWN0IHNrbF93 bV9wYXJhbXMgKndwLAorCQkJCXVpbnQxNl90ICpvdXRfYmxvY2tzLCAvKiBvdXQgKi8KKwkJCQl1 aW50OF90ICpvdXRfbGluZXMsIC8qIG91dCAqLworCQkJCWJvb2wgKmVuYWJsZWQgLyogb3V0ICov KQoreworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9ICZpbnRlbF9wc3Rh dGUtPmJhc2U7CisJdWludDMyX3QgbGF0ZW5jeSA9IGRldl9wcml2LT53bS5za2xfbGF0ZW5jeVts ZXZlbF07CisJdWludF9maXhlZF8xNl8xNl90IG1ldGhvZDEsIG1ldGhvZDI7CisJdWludF9maXhl ZF8xNl8xNl90IHNlbGVjdGVkX3Jlc3VsdDsKKwl1aW50MzJfdCByZXNfYmxvY2tzLCByZXNfbGlu ZXM7CisJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQorCQl0b19pbnRlbF9hdG9t aWNfc3RhdGUoY3N0YXRlLT5iYXNlLnN0YXRlKTsKKwlib29sIGFwcGx5X21lbW9yeV9id193YSA9 IHNrbF9uZWVkc19tZW1vcnlfYndfd2Eoc3RhdGUpOworCisJaWYgKGxhdGVuY3kgPT0gMCB8fAor CSAgICAhaW50ZWxfd21fcGxhbmVfdmlzaWJsZShjc3RhdGUsIGludGVsX3BzdGF0ZSkpIHsKKwkJ KmVuYWJsZWQgPSBmYWxzZTsKKwkJcmV0dXJuIDA7CisJfQorCisJLyogRGlzcGxheSBXQSAjMTE0 MToga2JsLGNmbCAqLworCWlmICgoSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxB S0UoZGV2X3ByaXYpKSAmJgorCSAgICBkZXZfcHJpdi0+aXBjX2VuYWJsZWQpCisJCWxhdGVuY3kg Kz0gNDsKKworCWlmIChhcHBseV9tZW1vcnlfYndfd2EgJiYgd3AtPnhfdGlsZWQpCisJCWxhdGVu Y3kgKz0gMTU7CisKKwltZXRob2QxID0gc2tsX3dtX21ldGhvZDEoZGV2X3ByaXYsIHdwLT5wbGFu ZV9waXhlbF9yYXRlLAorCQkJCSB3cC0+Y3BwLCBsYXRlbmN5KTsKKwltZXRob2QyID0gc2tsX3dt X21ldGhvZDIod3AtPnBsYW5lX3BpeGVsX3JhdGUsCiAJCQkJIGNzdGF0ZS0+YmFzZS5hZGp1c3Rl ZF9tb2RlLmNydGNfaHRvdGFsLAogCQkJCSBsYXRlbmN5LAotCQkJCSBwbGFuZV9ibG9ja3NfcGVy X2xpbmUpOwotCi0JeV90aWxlX21pbmltdW0gPSBtdWxfdTMyX2ZpeGVkMTYoeV9taW5fc2Nhbmxp bmVzLAotCQkJCQkgcGxhbmVfYmxvY2tzX3Blcl9saW5lKTsKKwkJCQkgd3AtPnBsYW5lX2Jsb2Nr c19wZXJfbGluZSk7CiAKLQlpZiAoeV90aWxlZCkgewotCQlzZWxlY3RlZF9yZXN1bHQgPSBtYXhf Zml4ZWQxNihtZXRob2QyLCB5X3RpbGVfbWluaW11bSk7CisJaWYgKHdwLT55X3RpbGVkKSB7CisJ CXNlbGVjdGVkX3Jlc3VsdCA9IG1heF9maXhlZDE2KG1ldGhvZDIsIHdwLT55X3RpbGVfbWluaW11 bSk7CiAJfSBlbHNlIHsKLQkJdWludDMyX3QgbGluZXRpbWVfdXM7Ci0KLQkJbGluZXRpbWVfdXMg PSBmaXhlZDE2X3RvX3UzMl9yb3VuZF91cCgKLQkJCQlpbnRlbF9nZXRfbGluZXRpbWVfdXMoY3N0 YXRlKSk7Ci0JCWlmICgoY3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90 YWwgLyA1MTIgPCAxKSAmJgotCQkgICAgKHBsYW5lX2J5dGVzX3Blcl9saW5lIC8gNTEyIDwgMSkp CisJCWlmICgod3AtPmNwcCAqIGNzdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFs IC8KKwkJICAgICA1MTIgPCAxKSAmJiAod3AtPnBsYW5lX2J5dGVzX3Blcl9saW5lIC8gNTEyIDwg MSkpCiAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtZXRob2QyOwogCQllbHNlIGlmIChkZGJfYWxsb2Nh dGlvbiA+PQotCQkJIGZpeGVkMTZfdG9fdTMyX3JvdW5kX3VwKHBsYW5lX2Jsb2Nrc19wZXJfbGlu ZSkpCisJCQkgZml4ZWQxNl90b191MzJfcm91bmRfdXAod3AtPnBsYW5lX2Jsb2Nrc19wZXJfbGlu ZSkpCiAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtaW5fZml4ZWQxNihtZXRob2QxLCBtZXRob2QyKTsK LQkJZWxzZSBpZiAobGF0ZW5jeSA+PSBsaW5ldGltZV91cykKKwkJZWxzZSBpZiAobGF0ZW5jeSA+ PSB3cC0+bGluZXRpbWVfdXMpCiAJCQlzZWxlY3RlZF9yZXN1bHQgPSBtaW5fZml4ZWQxNihtZXRo b2QxLCBtZXRob2QyKTsKIAkJZWxzZQogCQkJc2VsZWN0ZWRfcmVzdWx0ID0gbWV0aG9kMTsKQEAg LTQ1MDUsMTkgKzQ1MTcsMTggQEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25z dCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlyZXNfYmxvY2tzID0gZml4 ZWQxNl90b191MzJfcm91bmRfdXAoc2VsZWN0ZWRfcmVzdWx0KSArIDE7CiAJcmVzX2xpbmVzID0g ZGl2X3JvdW5kX3VwX2ZpeGVkMTYoc2VsZWN0ZWRfcmVzdWx0LAotCQkJCQkgcGxhbmVfYmxvY2tz X3Blcl9saW5lKTsKKwkJCQkJIHdwLT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUpOwogCiAJLyogRGlz cGxheSBXQSAjMTEyNTogc2tsLGJ4dCxrYmwsZ2xrICovCi0JaWYgKGxldmVsID09IDAgJiYKLQkg ICAgKGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRF9DQ1MgfHwKLQkgICAg IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRURfQ0NTKSkKLQkJcmVzX2Js b2NrcyArPSBmaXhlZDE2X3RvX3UzMl9yb3VuZF91cCh5X3RpbGVfbWluaW11bSk7CisJaWYgKGxl dmVsID09IDAgJiYgd3AtPnJjX3N1cmZhY2UpCisJCXJlc19ibG9ja3MgKz0gZml4ZWQxNl90b191 MzJfcm91bmRfdXAod3AtPnlfdGlsZV9taW5pbXVtKTsKIAogCS8qIERpc3BsYXkgV0EgIzExMjY6 IHNrbCxieHQsa2JsLGdsayAqLwogCWlmIChsZXZlbCA+PSAxICYmIGxldmVsIDw9IDcpIHsKLQkJ aWYgKHlfdGlsZWQpIHsKLQkJCXJlc19ibG9ja3MgKz0gZml4ZWQxNl90b191MzJfcm91bmRfdXAo eV90aWxlX21pbmltdW0pOwotCQkJcmVzX2xpbmVzICs9IHlfbWluX3NjYW5saW5lczsKKwkJaWYg KHdwLT55X3RpbGVkKSB7CisJCQlyZXNfYmxvY2tzICs9IGZpeGVkMTZfdG9fdTMyX3JvdW5kX3Vw KAorCQkJCQkJCXdwLT55X3RpbGVfbWluaW11bSk7CisJCQlyZXNfbGluZXMgKz0gd3AtPnlfbWlu X3NjYW5saW5lczsKIAkJfSBlbHNlIHsKIAkJCXJlc19ibG9ja3MrKzsKIAkJfQpAQCAtNDU1NSw2 ICs0NTY2LDcgQEAgc2tsX2NvbXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRi LAogCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkgICAgICBjb25z dCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKKwkJICAgICAgY29uc3Qg c3RydWN0IHNrbF93bV9wYXJhbXMgKndtX3BhcmFtcywKIAkJICAgICAgc3RydWN0IHNrbF9wbGFu ZV93bSAqd20pCiB7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsKQEAgLTQ1NzgsNiArNDU5MCw3IEBAIHNrbF9jb21wdXRl X3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJ CSAgIGludGVsX3BzdGF0ZSwKIAkJCQkJICAgZGRiX2Jsb2NrcywKIAkJCQkJICAgbGV2ZWwsCisJ CQkJCSAgIHdtX3BhcmFtcywKIAkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2IsCiAJCQkJCSAg ICZyZXN1bHQtPnBsYW5lX3Jlc19sLAogCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9lbik7CkBAIC00 NjQyLDExICs0NjU1LDE4IEBAIHN0YXRpYyBpbnQgc2tsX2J1aWxkX3BpcGVfd20oc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICppbnRlbF9wc3RhdGUgPQogCQkJCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocHN0YXRlKTsKIAkJ ZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7CisJCXN0 cnVjdCBza2xfd21fcGFyYW1zIHdtX3BhcmFtczsKIAogCQl3bSA9ICZwaXBlX3dtLT5wbGFuZXNb cGxhbmVfaWRdOworCQltZW1zZXQoJndtX3BhcmFtcywgMCwgc2l6ZW9mKHN0cnVjdCBza2xfd21f cGFyYW1zKSk7CisKKwkJcmV0ID0gc2tsX2NvbXB1dGVfcGxhbmVfd21fcGFyYW1zKGRldl9wcml2 LCBjc3RhdGUsCisJCQkJCQkgIGludGVsX3BzdGF0ZSwgJndtX3BhcmFtcyk7CisJCWlmIChyZXQp CisJCQlyZXR1cm4gcmV0OwogCiAJCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVscyhkZXZfcHJp diwgZGRiLCBjc3RhdGUsCi0JCQkJCSAgICBpbnRlbF9wc3RhdGUsIHdtKTsKKwkJCQkJICAgIGlu dGVsX3BzdGF0ZSwgJndtX3BhcmFtcywgd20pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IAkJc2tsX2NvbXB1dGVfdHJhbnNpdGlvbl93bShjc3RhdGUsICZ3bS0+dHJhbnNfd20pOwotLSAK Mi4xMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK