From: Mahesh Kumar Subject: [PATCH 5/6] drm/i915/skl+: Optimize WM calculation Date: Tue, 13 Jun 2017 11:34:49 +0530 Message-ID: <20170613060450.16094-6-mahesh1.kumar@intel.com> References: <20170613060450.16094-1-mahesh1.kumar@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 ESMTPS id 450766E240 for ; Tue, 13 Jun 2017 06:01:22 +0000 (UTC) In-Reply-To: <20170613060450.16094-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: paulo.r.zanoni@intel.com, maarten.lankhorst@intel.com List-Id: intel-gfx@lists.freedesktop.org UGxhbmUgY29uZmlndXJhdGlvbiBwYXJhbWV0ZXJzIGRvZXNuJ3QgY2hhbmdlIGZvciBlYWNoIFdN LWxldmVsCmNhbGN1bGF0aW9uLiBDdXJyZW50bHkgd2UgY29tcHV0ZSBzYW1lIHBhcmFtZXRlcnMg OCB0aW1lcyBmb3IgZWFjaAp3bS1sZXZlbC4KVGhpcyBwYXRjaCBvcHRpbWl6ZXMgaXQgYnkgY2Fs Y3VsYXRpbmcgdGhlc2UgcGFyYW1ldGVycyBpbiBiZWdpbm5pbmcKJiByZXVzZSBkdXJpbmcgZWFj aCBsZXZlbC13bSBjYWxjdWxhdGlvbi4KClNpZ25lZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFo ZXNoMS5rdW1hckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCB8ICAxMyArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTY5ICsrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTA3 IGluc2VydGlvbnMoKyksIDc1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IGRjNTZiNTBkNmEzNi4uNmY2NTE5MDE1N2M5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK QEAgLTE3NzcsNiArMTc3NywxOSBAQCBzdHJ1Y3Qgc2tsX3dtX2xldmVsIHsKIAl1aW50OF90IHBs YW5lX3Jlc19sOwogfTsKIAorLyogU3RvcmVzIHBsYW5lIHNwZWNpZmljIFdNIHBhcmFtZXRlcnMg Ki8KK3N0cnVjdCBza2xfd21fcGFyYW1zeworCWJvb2wgeF90aWxlZCwgeV90aWxlZDsKKwl1aW50 MzJfdCB3aWR0aDsKKwl1aW50OF90IGNwcDsKKwl1aW50MzJfdCBwbGFuZV9waXhlbF9yYXRlOwor CXVpbnQzMl90IHlfbWluX3NjYW5saW5lczsKKwl1aW50MzJfdCBwbGFuZV9ieXRlc19wZXJfbGlu ZTsKKwl1aW50X2ZpeGVkXzE2XzE2X3QgcGxhbmVfYmxvY2tzX3Blcl9saW5lOworCXVpbnRfZml4 ZWRfMTZfMTZfdCB5X3RpbGVfbWluaW11bTsKKwl1aW50MzJfdCBsaW5ldGltZV91czsKK307CisK IC8qCiAgKiBUaGlzIHN0cnVjdCBoZWxwcyB0cmFja2luZyB0aGUgc3RhdGUgbmVlZGVkIGZvciBy dW50aW1lIFBNLCB3aGljaCBwdXRzIHRoZQogICogZGV2aWNlIGluIFBDSSBEMyBzdGF0ZS4gTm90 aWNlIHRoYXQgd2hlbiB0aGlzIGhhcHBlbnMsIG5vdGhpbmcgb24gdGhlCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwppbmRleCAwNDM1ZTYyMzNlNzEuLjEwZWMyNjYwYWNkNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCkBAIC00NDIzLDEyMSArNDQyMywxMjkgQEAgc2tsX2FkanVzdGVkX3BsYW5lX3Bp eGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkJICAg IGRvd25zY2FsZV9hbW91bnQpOwogfQogCi1zdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dt KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQlzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqaW50ZWxfcHN0YXRlLAotCQkJCWludCBsZXZlbCwKLQkJCQl1aW50MTZfdCAqb3V0X2Jsb2Nr cywgLyogb3V0ICovCi0JCQkJdWludDhfdCAqb3V0X2xpbmVzIC8qIG91dCAqLykKK3N0YXRpYyBp bnQKK3NrbF9jb21wdXRlX3BsYW5lX3dtX3BhcmFtcyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK KwkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKKwkJ CSAgICBzdHJ1Y3Qgc2tsX3dtX3BhcmFtcyAqd3ApCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpw bGFuZSA9IHRvX2ludGVsX3BsYW5lKGludGVsX3BzdGF0ZS0+YmFzZS5wbGFuZSk7CiAJY29uc3Qg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gJmludGVsX3BzdGF0ZS0+YmFzZTsKIAlj b25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ZmI7Ci0JdWludDMyX3Qg bGF0ZW5jeSA9IGRldl9wcml2LT53bS5za2xfbGF0ZW5jeVtsZXZlbF07Ci0JdWludF9maXhlZF8x Nl8xNl90IG1ldGhvZDEsIG1ldGhvZDI7Ci0JdWludF9maXhlZF8xNl8xNl90IHBsYW5lX2Jsb2Nr c19wZXJfbGluZTsKLQl1aW50X2ZpeGVkXzE2XzE2X3Qgc2VsZWN0ZWRfcmVzdWx0OwogCXVpbnQz Ml90IGludGVybV9wYnBsOwotCXVpbnQzMl90IHBsYW5lX2J5dGVzX3Blcl9saW5lOwotCXVpbnQz Ml90IHJlc19ibG9ja3MsIHJlc19saW5lczsKLQl1aW50OF90IGNwcDsKLQl1aW50MzJfdCB3aWR0 aCA9IDA7Ci0JdWludDMyX3QgcGxhbmVfcGl4ZWxfcmF0ZTsKLQl1aW50X2ZpeGVkXzE2XzE2X3Qg eV90aWxlX21pbmltdW07Ci0JdWludDMyX3QgeV9taW5fc2NhbmxpbmVzOwogCXN0cnVjdCBpbnRl bF9hdG9taWNfc3RhdGUgKnN0YXRlID0KIAkJdG9faW50ZWxfYXRvbWljX3N0YXRlKGNzdGF0ZS0+ YmFzZS5zdGF0ZSk7CiAJYm9vbCBhcHBseV9tZW1vcnlfYndfd2EgPSBza2xfbmVlZHNfbWVtb3J5 X2J3X3dhKHN0YXRlKTsKLQlib29sIHlfdGlsZWQsIHhfdGlsZWQ7CiAKLQlpZiAobGF0ZW5jeSA9 PSAwIHx8Ci0JICAgICFpbnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwgaW50ZWxfcHN0YXRl KSkKKwlpZiAoIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3N0YXRlLCBpbnRlbF9wc3RhdGUpKQog CQlyZXR1cm4gMDsKIAotCXlfdGlsZWQgPSBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9E X1lfVElMRUQgfHwKLQkJICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVE OwotCXhfdGlsZWQgPSBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQ7Ci0K LQkvKiBEaXNwbGF5IFdBICMxMTQxOiBrYmwsY2ZsICovCi0JaWYgKChJU19LQUJZTEFLRShkZXZf cHJpdikgfHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpICYmCi0JICAgIGRldl9wcml2LT5pcGNf ZW5hYmxlZCkKLQkJbGF0ZW5jeSArPSA0OwotCi0JaWYgKGFwcGx5X21lbW9yeV9id193YSAmJiB4 X3RpbGVkKQotCQlsYXRlbmN5ICs9IDE1OworCXdwLT55X3RpbGVkID0gZmItPm1vZGlmaWVyID09 IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8CisJCSAgICAgIGZiLT5tb2RpZmllciA9PSBJOTE1 X0ZPUk1BVF9NT0RfWWZfVElMRUQ7CisJd3AtPnhfdGlsZWQgPSBmYi0+bW9kaWZpZXIgPT0gSTkx NV9GT1JNQVRfTU9EX1hfVElMRUQ7CiAKIAlpZiAocGxhbmUtPmlkID09IFBMQU5FX0NVUlNPUikg ewotCQl3aWR0aCA9IGludGVsX3BzdGF0ZS0+YmFzZS5jcnRjX3c7CisJCXdwLT53aWR0aCA9IGlu dGVsX3BzdGF0ZS0+YmFzZS5jcnRjX3c7CiAJfSBlbHNlIHsKIAkJLyoKIAkJICogU3JjIGNvb3Jk aW5hdGVzIGFyZSBhbHJlYWR5IHJvdGF0ZWQgYnkgMjcwIGRlZ3JlZXMgZm9yCiAJCSAqIHRoZSA5 MC8yNzAgZGVncmVlIHBsYW5lIHJvdGF0aW9uIGNhc2VzICh0byBtYXRjaCB0aGUKIAkJICogR1RU IG1hcHBpbmcpLCBoZW5jZSBubyBuZWVkIHRvIGFjY291bnQgZm9yIHJvdGF0aW9uIGhlcmUuCiAJ CSAqLwotCQl3aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZpbnRlbF9wc3RhdGUtPmJhc2Uuc3JjKSA+ PiAxNjsKKwkJd3AtPndpZHRoID0gZHJtX3JlY3Rfd2lkdGgoJmludGVsX3BzdGF0ZS0+YmFzZS5z cmMpID4+IDE2OwogCX0KIAotCWNwcCA9IChmYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJNX0ZPUk1B VF9OVjEyKSA/IGZiLT5mb3JtYXQtPmNwcFsxXSA6Ci0JCQkJCQkJZmItPmZvcm1hdC0+Y3BwWzBd OwotCXBsYW5lX3BpeGVsX3JhdGUgPSBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjc3Rh dGUsIGludGVsX3BzdGF0ZSk7CisJd3AtPmNwcCA9IChmYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJN X0ZPUk1BVF9OVjEyKSA/IGZiLT5mb3JtYXQtPmNwcFsxXSA6CisJCQkJCQkJICAgIGZiLT5mb3Jt YXQtPmNwcFswXTsKKwl3cC0+cGxhbmVfcGl4ZWxfcmF0ZSA9IHNrbF9hZGp1c3RlZF9wbGFuZV9w aXhlbF9yYXRlKGNzdGF0ZSwKKwkJCQkJCQkgICAgIGludGVsX3BzdGF0ZSk7CiAKIAlpZiAoZHJt X3JvdGF0aW9uXzkwX29yXzI3MChwc3RhdGUtPnJvdGF0aW9uKSkgewogCi0JCXN3aXRjaCAoY3Bw KSB7CisJCXN3aXRjaCAod3AtPmNwcCkgewogCQljYXNlIDE6Ci0JCQl5X21pbl9zY2FubGluZXMg PSAxNjsKKwkJCXdwLT55X21pbl9zY2FubGluZXMgPSAxNjsKIAkJCWJyZWFrOwogCQljYXNlIDI6 Ci0JCQl5X21pbl9zY2FubGluZXMgPSA4OworCQkJd3AtPnlfbWluX3NjYW5saW5lcyA9IDg7CiAJ CQlicmVhazsKIAkJY2FzZSA0OgotCQkJeV9taW5fc2NhbmxpbmVzID0gNDsKKwkJCXdwLT55X21p bl9zY2FubGluZXMgPSA0OwogCQkJYnJlYWs7CiAJCWRlZmF1bHQ6Ci0JCQlNSVNTSU5HX0NBU0Uo Y3BwKTsKKwkJCU1JU1NJTkdfQ0FTRSh3cC0+Y3BwKTsKIAkJCXJldHVybiAtRUlOVkFMOwogCQl9 CiAJfSBlbHNlIHsKLQkJeV9taW5fc2NhbmxpbmVzID0gNDsKKwkJd3AtPnlfbWluX3NjYW5saW5l cyA9IDQ7CiAJfQogCiAJaWYgKGFwcGx5X21lbW9yeV9id193YSkKLQkJeV9taW5fc2NhbmxpbmVz ICo9IDI7Ci0KLQlwbGFuZV9ieXRlc19wZXJfbGluZSA9IHdpZHRoICogY3BwOwotCWlmICh5X3Rp bGVkKSB7Ci0JCWludGVybV9wYnBsID0gRElWX1JPVU5EX1VQKHBsYW5lX2J5dGVzX3Blcl9saW5l ICoKLQkJCQkJICAgeV9taW5fc2NhbmxpbmVzLCA1MTIpOwotCQlwbGFuZV9ibG9ja3NfcGVyX2xp bmUgPSBkaXZfZml4ZWQxNihpbnRlcm1fcGJwbCwKLQkJCQkJCQl5X21pbl9zY2FubGluZXMpOwot CX0gZWxzZSBpZiAoeF90aWxlZCkgewotCQlpbnRlcm1fcGJwbCA9IERJVl9ST1VORF9VUChwbGFu ZV9ieXRlc19wZXJfbGluZSwgNTEyKTsKLQkJcGxhbmVfYmxvY2tzX3Blcl9saW5lID0gdTMyX3Rv X2ZpeGVkMTYoaW50ZXJtX3BicGwpOworCQl3cC0+eV9taW5fc2NhbmxpbmVzICo9IDI7CisKKwl3 cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUgPSB3cC0+d2lkdGggKiB3cC0+Y3BwOworCWlmICh3cC0+ eV90aWxlZCkgeworCQlpbnRlcm1fcGJwbCA9IERJVl9ST1VORF9VUCh3cC0+cGxhbmVfYnl0ZXNf cGVyX2xpbmUgKgorCQkJCQkgICB3cC0+eV9taW5fc2NhbmxpbmVzLCA1MTIpOworCQl3cC0+cGxh bmVfYmxvY2tzX3Blcl9saW5lID0gZGl2X2ZpeGVkMTYoaW50ZXJtX3BicGwsCisJCQkJCQkJd3At PnlfbWluX3NjYW5saW5lcyk7CisJfSBlbHNlIGlmICh3cC0+eF90aWxlZCkgeworCQlpbnRlcm1f cGJwbCA9IERJVl9ST1VORF9VUCh3cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMik7CisJCXdw LT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUgPSB1MzJfdG9fZml4ZWQxNihpbnRlcm1fcGJwbCk7CiAJ fSBlbHNlIHsKLQkJaW50ZXJtX3BicGwgPSBESVZfUk9VTkRfVVAocGxhbmVfYnl0ZXNfcGVyX2xp bmUsIDUxMikgKyAxOwotCQlwbGFuZV9ibG9ja3NfcGVyX2xpbmUgPSB1MzJfdG9fZml4ZWQxNihp bnRlcm1fcGJwbCk7CisJCWludGVybV9wYnBsID0gRElWX1JPVU5EX1VQKHdwLT5wbGFuZV9ieXRl c19wZXJfbGluZSwgNTEyKSArIDE7CisJCXdwLT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUgPSB1MzJf dG9fZml4ZWQxNihpbnRlcm1fcGJwbCk7CiAJfQogCi0JbWV0aG9kMSA9IHNrbF93bV9tZXRob2Qx KHBsYW5lX3BpeGVsX3JhdGUsIGNwcCwgbGF0ZW5jeSk7Ci0JbWV0aG9kMiA9IHNrbF93bV9tZXRo b2QyKHBsYW5lX3BpeGVsX3JhdGUsCisJd3AtPnlfdGlsZV9taW5pbXVtID0gbXVsX3UzMl9maXhl ZDE2KHdwLT55X21pbl9zY2FubGluZXMsCisJCQkJCSAgICAgd3AtPnBsYW5lX2Jsb2Nrc19wZXJf bGluZSk7CisJd3AtPmxpbmV0aW1lX3VzID0gZml4ZWQxNl90b191MzJfcm91bmRfdXAoCisJCQkJ CWludGVsX2dldF9saW5ldGltZV91cyhjc3RhdGUpKTsKKwlyZXR1cm4gMDsKK30KKworc3RhdGlj IGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCisJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCQljb25z dCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKKwkJCQlpbnQgbGV2ZWws CisJCQkJY29uc3Qgc3RydWN0IHNrbF93bV9wYXJhbXMgKndwLAorCQkJCXVpbnQxNl90ICpvdXRf YmxvY2tzLCAvKiBvdXQgKi8KKwkJCQl1aW50OF90ICpvdXRfbGluZXMgLyogb3V0ICovKQorewor CWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9ICZpbnRlbF9wc3RhdGUtPmJh c2U7CisJdWludDMyX3QgbGF0ZW5jeSA9IGRldl9wcml2LT53bS5za2xfbGF0ZW5jeVtsZXZlbF07 CisJdWludF9maXhlZF8xNl8xNl90IG1ldGhvZDEsIG1ldGhvZDI7CisJdWludF9maXhlZF8xNl8x Nl90IHNlbGVjdGVkX3Jlc3VsdDsKKwl1aW50MzJfdCByZXNfYmxvY2tzLCByZXNfbGluZXM7CisJ c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQorCQl0b19pbnRlbF9hdG9taWNfc3Rh dGUoY3N0YXRlLT5iYXNlLnN0YXRlKTsKKwlib29sIGFwcGx5X21lbW9yeV9id193YSA9IHNrbF9u ZWVkc19tZW1vcnlfYndfd2Eoc3RhdGUpOworCisJaWYgKGxhdGVuY3kgPT0gMCB8fAorCSAgICAh aW50ZWxfd21fcGxhbmVfdmlzaWJsZShjc3RhdGUsIGludGVsX3BzdGF0ZSkpCisJCXJldHVybiAw OworCisJLyogRGlzcGxheSBXQSAjMTE0MToga2JsLGNmbCAqLworCWlmICgoSVNfS0FCWUxBS0Uo ZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpKSAmJgorCSAgICBkZXZfcHJpdi0+ aXBjX2VuYWJsZWQpCisJCWxhdGVuY3kgKz0gNDsKKworCWlmIChhcHBseV9tZW1vcnlfYndfd2Eg JiYgd3AtPnhfdGlsZWQpCisJCWxhdGVuY3kgKz0gMTU7CisKKwltZXRob2QxID0gc2tsX3dtX21l dGhvZDEod3AtPnBsYW5lX3BpeGVsX3JhdGUsIHdwLT5jcHAsIGxhdGVuY3kpOworCW1ldGhvZDIg PSBza2xfd21fbWV0aG9kMih3cC0+cGxhbmVfcGl4ZWxfcmF0ZSwKIAkJCQkgY3N0YXRlLT5iYXNl LmFkanVzdGVkX21vZGUuY3J0Y19odG90YWwsCiAJCQkJIGxhdGVuY3ksCi0JCQkJIHBsYW5lX2Js b2Nrc19wZXJfbGluZSk7CisJCQkJIHdwLT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUpOwogCi0JeV90 aWxlX21pbmltdW0gPSBtdWxfdTMyX2ZpeGVkMTYoeV9taW5fc2NhbmxpbmVzLAotCQkJCQkgcGxh bmVfYmxvY2tzX3Blcl9saW5lKTsKLQotCWlmICh5X3RpbGVkKSB7Ci0JCXNlbGVjdGVkX3Jlc3Vs dCA9IG1heF9maXhlZDE2KG1ldGhvZDIsIHlfdGlsZV9taW5pbXVtKTsKKwlpZiAod3AtPnlfdGls ZWQpIHsKKwkJc2VsZWN0ZWRfcmVzdWx0ID0gbWF4X2ZpeGVkMTYobWV0aG9kMiwgd3AtPnlfdGls ZV9taW5pbXVtKTsKIAl9IGVsc2UgewotCQl1aW50MzJfdCBsaW5ldGltZV91czsKLQotCQlsaW5l dGltZV91cyA9IGZpeGVkMTZfdG9fdTMyX3JvdW5kX3VwKAotCQkJCWludGVsX2dldF9saW5ldGlt ZV91cyhjc3RhdGUpKTsKLQkJaWYgKChjcHAgKiBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5j cnRjX2h0b3RhbCAvIDUxMiA8IDEpICYmCi0JCSAgICAocGxhbmVfYnl0ZXNfcGVyX2xpbmUgLyA1 MTIgPCAxKSkKKwkJaWYgKCh3cC0+Y3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0 Y19odG90YWwgLyA1MTIgPCAxKQorCQkgICAgICYmICh3cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUg LyA1MTIgPCAxKSkKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDI7Ci0JCWVsc2UgaWYgKGxh dGVuY3kgPj0gbGluZXRpbWVfdXMpCisJCWVsc2UgaWYgKGxhdGVuY3kgPj0gd3AtPmxpbmV0aW1l X3VzKQogCQkJc2VsZWN0ZWRfcmVzdWx0ID0gbWluX2ZpeGVkMTYobWV0aG9kMSwgbWV0aG9kMik7 CiAJCWVsc2UKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDE7CkBAIC00NTQ1LDEyICs0NTUz LDEzIEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJcmVzX2Jsb2NrcyA9IGZpeGVkMTZfdG9fdTMyX3Jv dW5kX3VwKHNlbGVjdGVkX3Jlc3VsdCkgKyAxOwogCXJlc19saW5lcyA9IGRpdl9yb3VuZF91cF9m aXhlZDE2KHNlbGVjdGVkX3Jlc3VsdCwKLQkJCQkJIHBsYW5lX2Jsb2Nrc19wZXJfbGluZSk7CisJ CQkJCSB3cC0+cGxhbmVfYmxvY2tzX3Blcl9saW5lKTsKIAogCWlmIChsZXZlbCA+PSAxICYmIGxl dmVsIDw9IDcpIHsKLQkJaWYgKHlfdGlsZWQpIHsKLQkJCXJlc19ibG9ja3MgKz0gZml4ZWQxNl90 b191MzJfcm91bmRfdXAoeV90aWxlX21pbmltdW0pOwotCQkJcmVzX2xpbmVzICs9IHlfbWluX3Nj YW5saW5lczsKKwkJaWYgKHdwLT55X3RpbGVkKSB7CisJCQlyZXNfYmxvY2tzICs9IGZpeGVkMTZf dG9fdTMyX3JvdW5kX3VwKAorCQkJCQkJCXdwLT55X3RpbGVfbWluaW11bSk7CisJCQlyZXNfbGlu ZXMgKz0gd3AtPnlfbWluX3NjYW5saW5lczsKIAkJfSBlbHNlIHsKIAkJCXJlc19ibG9ja3MrKzsK IAkJfQpAQCAtNDU3NSw2ICs0NTg0LDcgQEAgc3RhdGljIGludAogc2tsX2NvbXB1dGVfd21fbGV2 ZWxzKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAgICAgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJICAgICAgY29uc3Qgc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCisJCSAgICAgIGNvbnN0IHN0cnVjdCBza2xfd21f cGFyYW1zICp3bV9wYXJhbXMsCiAJCSAgICAgIHN0cnVjdCBza2xfcGxhbmVfd20gKndtKQogewog CWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CkBAIC00 NTkwLDYgKzQ2MDAsNyBAQCBza2xfY29tcHV0ZV93bV9sZXZlbHMoY29uc3Qgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgICBjc3RhdGUsCiAJCQkJCSAgIGludGVsX3Bz dGF0ZSwKIAkJCQkJICAgbGV2ZWwsCisJCQkJCSAgIHdtX3BhcmFtcywKIAkJCQkJICAgJnJlc3Vs dC0+cGxhbmVfcmVzX2IsCiAJCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jlc19sKTsKIAkJaWYgKHJl dCkKQEAgLTQ2NTksMTAgKzQ2NzAsMTggQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9CiAJCQkJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwc3Rh dGUpOwogCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5p ZDsKKwkJc3RydWN0IHNrbF93bV9wYXJhbXMgd21fcGFyYW1zOwogCiAJCXdtID0gJnBpcGVfd20t PnBsYW5lc1twbGFuZV9pZF07CisJCW1lbXNldCgmd21fcGFyYW1zLCAwLCBzaXplb2Yoc3RydWN0 IHNrbF93bV9wYXJhbXMpKTsKKworCQlyZXQgPSBza2xfY29tcHV0ZV9wbGFuZV93bV9wYXJhbXMo ZGV2X3ByaXYsIGNzdGF0ZSwKKwkJCQkJCSAgaW50ZWxfcHN0YXRlLCAmd21fcGFyYW1zKTsKKwkJ aWYgKHJldCkKKwkJCXJldHVybiByZXQ7CiAKLQkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2ZWxz KGRldl9wcml2LCBjc3RhdGUsIGludGVsX3BzdGF0ZSwgd20pOworCQlyZXQgPSBza2xfY29tcHV0 ZV93bV9sZXZlbHMoZGV2X3ByaXYsIGNzdGF0ZSwgaW50ZWxfcHN0YXRlLAorCQkJCQkgICAgJndt X3BhcmFtcywgd20pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAkJc2tsX2NvbXB1dGVf dHJhbnNpdGlvbl93bShjc3RhdGUsICZ3bS0+dHJhbnNfd20pOwotLSAKMi4xMy4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK