From: Mahesh Kumar Subject: [PATCH 07/11] drm/i915/skl+: Optimize WM calculation Date: Wed, 5 Jul 2017 20:01:50 +0530 Message-ID: <20170705143154.32132-8-mahesh1.kumar@intel.com> References: <20170705143154.32132-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 A50F76E456 for ; Wed, 5 Jul 2017 14:30:48 +0000 (UTC) In-Reply-To: <20170705143154.32132-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 RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClBsYW5lIGNv bmZpZ3VyYXRpb24gcGFyYW1ldGVycyBkb2Vzbid0IGNoYW5nZSBmb3IgZWFjaCBXTS1sZXZlbApj YWxjdWxhdGlvbi4gQ3VycmVudGx5IHdlIGNvbXB1dGUgc2FtZSBwYXJhbWV0ZXJzIDggdGltZXMg Zm9yIGVhY2gKd20tbGV2ZWwuClRoaXMgcGF0Y2ggb3B0aW1pemVzIGl0IGJ5IGNhbGN1bGF0aW5n IHRoZXNlIHBhcmFtZXRlcnMgaW4gYmVnaW5uaW5nCiYgcmV1c2UgZHVyaW5nIGVhY2ggbGV2ZWwt d20gY2FsY3VsYXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBNYWhlc2ggS3VtYXIgPG1haGVzaDEua3Vt YXJAaW50ZWwuY29tPgpBY2tlZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IHwgIDEzICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDE3OSArKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDExMSBp bnNlcnRpb25zKCspLCA4MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRl eCBiNDcxNmNlMzJjYTIuLmQyNDc1N2YxYThkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0xNzkwLDYgKzE3OTAsMTkgQEAgc3RydWN0IHNrbF93bV9sZXZlbCB7CiAJdWludDhfdCBwbGFu ZV9yZXNfbDsKIH07CiAKKy8qIFN0b3JlcyBwbGFuZSBzcGVjaWZpYyBXTSBwYXJhbWV0ZXJzICov CitzdHJ1Y3Qgc2tsX3dtX3BhcmFtc3sKKwlib29sIHhfdGlsZWQsIHlfdGlsZWQ7CisJdWludDMy X3Qgd2lkdGg7CisJdWludDhfdCBjcHA7CisJdWludDMyX3QgcGxhbmVfcGl4ZWxfcmF0ZTsKKwl1 aW50MzJfdCB5X21pbl9zY2FubGluZXM7CisJdWludDMyX3QgcGxhbmVfYnl0ZXNfcGVyX2xpbmU7 CisJdWludF9maXhlZF8xNl8xNl90IHBsYW5lX2Jsb2Nrc19wZXJfbGluZTsKKwl1aW50X2ZpeGVk XzE2XzE2X3QgeV90aWxlX21pbmltdW07CisJdWludDMyX3QgbGluZXRpbWVfdXM7Cit9OworCiAv KgogICogVGhpcyBzdHJ1Y3QgaGVscHMgdHJhY2tpbmcgdGhlIHN0YXRlIG5lZWRlZCBmb3IgcnVu dGltZSBQTSwgd2hpY2ggcHV0cyB0aGUKICAqIGRldmljZSBpbiBQQ0kgRDMgc3RhdGUuIE5vdGlj ZSB0aGF0IHdoZW4gdGhpcyBoYXBwZW5zLCBub3RoaW5nIG9uIHRoZQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggOTc1MzIxMGQ3OWFlLi44YTY0YjNhODEyMmMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtNDM0MSwxMjggKzQzNDEsMTM1IEBAIHNrbF9hZGp1c3RlZF9wbGFuZV9waXhl bF9yYXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkJCSAgICBk b3duc2NhbGVfYW1vdW50KTsKIH0KIAotc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSwKLQkJCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KmludGVsX3BzdGF0ZSwKLQkJCQl1aW50MTZfdCBkZGJfYWxsb2NhdGlvbiwKLQkJCQlpbnQgbGV2 ZWwsCi0JCQkJdWludDE2X3QgKm91dF9ibG9ja3MsIC8qIG91dCAqLwotCQkJCXVpbnQ4X3QgKm91 dF9saW5lcywgLyogb3V0ICovCi0JCQkJYm9vbCAqZW5hYmxlZCAvKiBvdXQgKi8pCitzdGF0aWMg aW50Citza2xfY29tcHV0ZV9wbGFuZV93bV9wYXJhbXMoY29uc3Qgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkJICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUs CisJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCisJ CQkgICAgc3RydWN0IHNrbF93bV9wYXJhbXMgKndwKQogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAq cGxhbmUgPSB0b19pbnRlbF9wbGFuZShpbnRlbF9wc3RhdGUtPmJhc2UucGxhbmUpOwogCWNvbnN0 IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9ICZpbnRlbF9wc3RhdGUtPmJhc2U7CiAJ Y29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwc3RhdGUtPmZiOwotCXVpbnQzMl90 IGxhdGVuY3kgPSBkZXZfcHJpdi0+d20uc2tsX2xhdGVuY3lbbGV2ZWxdOwotCXVpbnRfZml4ZWRf MTZfMTZfdCBtZXRob2QxLCBtZXRob2QyOwotCXVpbnRfZml4ZWRfMTZfMTZfdCBwbGFuZV9ibG9j a3NfcGVyX2xpbmU7Ci0JdWludF9maXhlZF8xNl8xNl90IHNlbGVjdGVkX3Jlc3VsdDsKIAl1aW50 MzJfdCBpbnRlcm1fcGJwbDsKLQl1aW50MzJfdCBwbGFuZV9ieXRlc19wZXJfbGluZTsKLQl1aW50 MzJfdCByZXNfYmxvY2tzLCByZXNfbGluZXM7Ci0JdWludDhfdCBjcHA7Ci0JdWludDMyX3Qgd2lk dGggPSAwOwotCXVpbnQzMl90IHBsYW5lX3BpeGVsX3JhdGU7Ci0JdWludF9maXhlZF8xNl8xNl90 IHlfdGlsZV9taW5pbXVtOwotCXVpbnQzMl90IHlfbWluX3NjYW5saW5lczsKIAlzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSA9CiAJCXRvX2ludGVsX2F0b21pY19zdGF0ZShjc3RhdGUt PmJhc2Uuc3RhdGUpOwogCWJvb2wgYXBwbHlfbWVtb3J5X2J3X3dhID0gc2tsX25lZWRzX21lbW9y eV9id193YShzdGF0ZSk7Ci0JYm9vbCB5X3RpbGVkLCB4X3RpbGVkOwogCi0JaWYgKGxhdGVuY3kg PT0gMCB8fAotCSAgICAhaW50ZWxfd21fcGxhbmVfdmlzaWJsZShjc3RhdGUsIGludGVsX3BzdGF0 ZSkpIHsKLQkJKmVuYWJsZWQgPSBmYWxzZTsKKwlpZiAoIWludGVsX3dtX3BsYW5lX3Zpc2libGUo Y3N0YXRlLCBpbnRlbF9wc3RhdGUpKQogCQlyZXR1cm4gMDsKLQl9CiAKLQl5X3RpbGVkID0gZmIt Pm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8Ci0JCSAgZmItPm1vZGlmaWVy ID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRDsKLQl4X3RpbGVkID0gZmItPm1vZGlmaWVyID09 IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOwotCi0JLyogRGlzcGxheSBXQSAjMTE0MToga2JsLGNm bCAqLwotCWlmICgoSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3By aXYpKSAmJgotCSAgICBkZXZfcHJpdi0+aXBjX2VuYWJsZWQpCi0JCWxhdGVuY3kgKz0gNDsKLQot CWlmIChhcHBseV9tZW1vcnlfYndfd2EgJiYgeF90aWxlZCkKLQkJbGF0ZW5jeSArPSAxNTsKKwl3 cC0+eV90aWxlZCA9IGZiLT5tb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAor CQkgICAgICBmYi0+bW9kaWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOworCXdwLT54 X3RpbGVkID0gZmItPm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOwogCiAJaWYg KHBsYW5lLT5pZCA9PSBQTEFORV9DVVJTT1IpIHsKLQkJd2lkdGggPSBpbnRlbF9wc3RhdGUtPmJh c2UuY3J0Y193OworCQl3cC0+d2lkdGggPSBpbnRlbF9wc3RhdGUtPmJhc2UuY3J0Y193OwogCX0g ZWxzZSB7CiAJCS8qCiAJCSAqIFNyYyBjb29yZGluYXRlcyBhcmUgYWxyZWFkeSByb3RhdGVkIGJ5 IDI3MCBkZWdyZWVzIGZvcgogCQkgKiB0aGUgOTAvMjcwIGRlZ3JlZSBwbGFuZSByb3RhdGlvbiBj YXNlcyAodG8gbWF0Y2ggdGhlCiAJCSAqIEdUVCBtYXBwaW5nKSwgaGVuY2Ugbm8gbmVlZCB0byBh Y2NvdW50IGZvciByb3RhdGlvbiBoZXJlLgogCQkgKi8KLQkJd2lkdGggPSBkcm1fcmVjdF93aWR0 aCgmaW50ZWxfcHN0YXRlLT5iYXNlLnNyYykgPj4gMTY7CisJCXdwLT53aWR0aCA9IGRybV9yZWN0 X3dpZHRoKCZpbnRlbF9wc3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKIAl9CiAKLQljcHAgPSAoZmIt PmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgPyBmYi0+Zm9ybWF0LT5jcHBbMV0g OgotCQkJCQkJCWZiLT5mb3JtYXQtPmNwcFswXTsKLQlwbGFuZV9waXhlbF9yYXRlID0gc2tsX2Fk anVzdGVkX3BsYW5lX3BpeGVsX3JhdGUoY3N0YXRlLCBpbnRlbF9wc3RhdGUpOworCXdwLT5jcHAg PSAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgPyBmYi0+Zm9ybWF0LT5j cHBbMV0gOgorCQkJCQkJCSAgICBmYi0+Zm9ybWF0LT5jcHBbMF07CisJd3AtPnBsYW5lX3BpeGVs X3JhdGUgPSBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjc3RhdGUsCisJCQkJCQkJICAg ICBpbnRlbF9wc3RhdGUpOwogCiAJaWYgKGRybV9yb3RhdGlvbl85MF9vcl8yNzAocHN0YXRlLT5y b3RhdGlvbikpIHsKLQotCQlzd2l0Y2ggKGNwcCkgeworCQlzd2l0Y2ggKHdwLT5jcHApIHsKIAkJ Y2FzZSAxOgotCQkJeV9taW5fc2NhbmxpbmVzID0gMTY7CisJCQl3cC0+eV9taW5fc2NhbmxpbmVz ID0gMTY7CiAJCQlicmVhazsKIAkJY2FzZSAyOgotCQkJeV9taW5fc2NhbmxpbmVzID0gODsKKwkJ CXdwLT55X21pbl9zY2FubGluZXMgPSA4OwogCQkJYnJlYWs7CiAJCWNhc2UgNDoKLQkJCXlfbWlu X3NjYW5saW5lcyA9IDQ7CisJCQl3cC0+eV9taW5fc2NhbmxpbmVzID0gNDsKIAkJCWJyZWFrOwog CQlkZWZhdWx0OgotCQkJTUlTU0lOR19DQVNFKGNwcCk7CisJCQlNSVNTSU5HX0NBU0Uod3AtPmNw cCk7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQogCX0gZWxzZSB7Ci0JCXlfbWluX3NjYW5saW5l cyA9IDQ7CisJCXdwLT55X21pbl9zY2FubGluZXMgPSA0OwogCX0KIAogCWlmIChhcHBseV9tZW1v cnlfYndfd2EpCi0JCXlfbWluX3NjYW5saW5lcyAqPSAyOwotCi0JcGxhbmVfYnl0ZXNfcGVyX2xp bmUgPSB3aWR0aCAqIGNwcDsKLQlpZiAoeV90aWxlZCkgewotCQlpbnRlcm1fcGJwbCA9IERJVl9S T1VORF9VUChwbGFuZV9ieXRlc19wZXJfbGluZSAqCi0JCQkJCSAgIHlfbWluX3NjYW5saW5lcywg NTEyKTsKLQkJcGxhbmVfYmxvY2tzX3Blcl9saW5lID0gZGl2X2ZpeGVkMTYoaW50ZXJtX3BicGws Ci0JCQkJCQkJeV9taW5fc2NhbmxpbmVzKTsKLQl9IGVsc2UgaWYgKHhfdGlsZWQpIHsKLQkJaW50 ZXJtX3BicGwgPSBESVZfUk9VTkRfVVAocGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMik7Ci0JCXBs YW5lX2Jsb2Nrc19wZXJfbGluZSA9IHUzMl90b19maXhlZDE2KGludGVybV9wYnBsKTsKKwkJd3At PnlfbWluX3NjYW5saW5lcyAqPSAyOworCisJd3AtPnBsYW5lX2J5dGVzX3Blcl9saW5lID0gd3At PndpZHRoICogd3AtPmNwcDsKKwlpZiAod3AtPnlfdGlsZWQpIHsKKwkJaW50ZXJtX3BicGwgPSBE SVZfUk9VTkRfVVAod3AtPnBsYW5lX2J5dGVzX3Blcl9saW5lICoKKwkJCQkJICAgd3AtPnlfbWlu X3NjYW5saW5lcywgNTEyKTsKKwkJd3AtPnBsYW5lX2Jsb2Nrc19wZXJfbGluZSA9IGRpdl9maXhl ZDE2KGludGVybV9wYnBsLAorCQkJCQkJCXdwLT55X21pbl9zY2FubGluZXMpOworCX0gZWxzZSBp ZiAod3AtPnhfdGlsZWQpIHsKKwkJaW50ZXJtX3BicGwgPSBESVZfUk9VTkRfVVAod3AtPnBsYW5l X2J5dGVzX3Blcl9saW5lLCA1MTIpOworCQl3cC0+cGxhbmVfYmxvY2tzX3Blcl9saW5lID0gdTMy X3RvX2ZpeGVkMTYoaW50ZXJtX3BicGwpOwogCX0gZWxzZSB7Ci0JCWludGVybV9wYnBsID0gRElW X1JPVU5EX1VQKHBsYW5lX2J5dGVzX3Blcl9saW5lLCA1MTIpICsgMTsKLQkJcGxhbmVfYmxvY2tz X3Blcl9saW5lID0gdTMyX3RvX2ZpeGVkMTYoaW50ZXJtX3BicGwpOworCQlpbnRlcm1fcGJwbCA9 IERJVl9ST1VORF9VUCh3cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUsIDUxMikgKyAxOworCQl3cC0+ cGxhbmVfYmxvY2tzX3Blcl9saW5lID0gdTMyX3RvX2ZpeGVkMTYoaW50ZXJtX3BicGwpOwogCX0K IAotCW1ldGhvZDEgPSBza2xfd21fbWV0aG9kMShwbGFuZV9waXhlbF9yYXRlLCBjcHAsIGxhdGVu Y3kpOwotCW1ldGhvZDIgPSBza2xfd21fbWV0aG9kMihwbGFuZV9waXhlbF9yYXRlLAorCXdwLT55 X3RpbGVfbWluaW11bSA9IG11bF91MzJfZml4ZWQxNih3cC0+eV9taW5fc2NhbmxpbmVzLAorCQkJ CQkgICAgIHdwLT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUpOworCXdwLT5saW5ldGltZV91cyA9IGZp eGVkMTZfdG9fdTMyX3JvdW5kX3VwKAorCQkJCQlpbnRlbF9nZXRfbGluZXRpbWVfdXMoY3N0YXRl KSk7CisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29u c3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUsCisJCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpp bnRlbF9wc3RhdGUsCisJCQkJdWludDE2X3QgZGRiX2FsbG9jYXRpb24sCisJCQkJaW50IGxldmVs LAorCQkJCWNvbnN0IHN0cnVjdCBza2xfd21fcGFyYW1zICp3cCwKKwkJCQl1aW50MTZfdCAqb3V0 X2Jsb2NrcywgLyogb3V0ICovCisJCQkJdWludDhfdCAqb3V0X2xpbmVzLCAvKiBvdXQgKi8KKwkJ CQlib29sICplbmFibGVkIC8qIG91dCAqLykKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOworCXVpbnQzMl90IGxhdGVuY3kgPSBk ZXZfcHJpdi0+d20uc2tsX2xhdGVuY3lbbGV2ZWxdOworCXVpbnRfZml4ZWRfMTZfMTZfdCBtZXRo b2QxLCBtZXRob2QyOworCXVpbnRfZml4ZWRfMTZfMTZfdCBzZWxlY3RlZF9yZXN1bHQ7CisJdWlu dDMyX3QgcmVzX2Jsb2NrcywgcmVzX2xpbmVzOworCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUg KnN0YXRlID0KKwkJdG9faW50ZWxfYXRvbWljX3N0YXRlKGNzdGF0ZS0+YmFzZS5zdGF0ZSk7CisJ Ym9vbCBhcHBseV9tZW1vcnlfYndfd2EgPSBza2xfbmVlZHNfbWVtb3J5X2J3X3dhKHN0YXRlKTsK KworCWlmIChsYXRlbmN5ID09IDAgfHwKKwkgICAgIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3N0 YXRlLCBpbnRlbF9wc3RhdGUpKSB7CisJCSplbmFibGVkID0gZmFsc2U7CisJCXJldHVybiAwOwor CX0KKworCS8qIERpc3BsYXkgV0EgIzExNDE6IGtibCxjZmwgKi8KKwlpZiAoKElTX0tBQllMQUtF KGRldl9wcml2KSB8fCBJU19DT0ZGRUVMQUtFKGRldl9wcml2KSkgJiYKKwkgICAgZGV2X3ByaXYt PmlwY19lbmFibGVkKQorCQlsYXRlbmN5ICs9IDQ7CisKKwlpZiAoYXBwbHlfbWVtb3J5X2J3X3dh ICYmIHdwLT54X3RpbGVkKQorCQlsYXRlbmN5ICs9IDE1OworCisJbWV0aG9kMSA9IHNrbF93bV9t ZXRob2QxKHdwLT5wbGFuZV9waXhlbF9yYXRlLCB3cC0+Y3BwLCBsYXRlbmN5KTsKKwltZXRob2Qy ID0gc2tsX3dtX21ldGhvZDIod3AtPnBsYW5lX3BpeGVsX3JhdGUsCiAJCQkJIGNzdGF0ZS0+YmFz ZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsLAogCQkJCSBsYXRlbmN5LAotCQkJCSBwbGFuZV9i bG9ja3NfcGVyX2xpbmUpOwotCi0JeV90aWxlX21pbmltdW0gPSBtdWxfdTMyX2ZpeGVkMTYoeV9t aW5fc2NhbmxpbmVzLAotCQkJCQkgcGxhbmVfYmxvY2tzX3Blcl9saW5lKTsKKwkJCQkgd3AtPnBs YW5lX2Jsb2Nrc19wZXJfbGluZSk7CiAKLQlpZiAoeV90aWxlZCkgewotCQlzZWxlY3RlZF9yZXN1 bHQgPSBtYXhfZml4ZWQxNihtZXRob2QyLCB5X3RpbGVfbWluaW11bSk7CisJaWYgKHdwLT55X3Rp bGVkKSB7CisJCXNlbGVjdGVkX3Jlc3VsdCA9IG1heF9maXhlZDE2KG1ldGhvZDIsIHdwLT55X3Rp bGVfbWluaW11bSk7CiAJfSBlbHNlIHsKLQkJdWludDMyX3QgbGluZXRpbWVfdXM7Ci0KLQkJbGlu ZXRpbWVfdXMgPSBmaXhlZDE2X3RvX3UzMl9yb3VuZF91cCgKLQkJCQlpbnRlbF9nZXRfbGluZXRp bWVfdXMoY3N0YXRlKSk7Ci0JCWlmICgoY3BwICogY3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUu Y3J0Y19odG90YWwgLyA1MTIgPCAxKSAmJgotCQkgICAgKHBsYW5lX2J5dGVzX3Blcl9saW5lIC8g NTEyIDwgMSkpCisJCWlmICgod3AtPmNwcCAqIGNzdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmNy dGNfaHRvdGFsIC8gNTEyIDwgMSkKKwkJICAgICYmICh3cC0+cGxhbmVfYnl0ZXNfcGVyX2xpbmUg LyA1MTIgPCAxKSkKIAkJCXNlbGVjdGVkX3Jlc3VsdCA9IG1ldGhvZDI7CiAJCWVsc2UgaWYgKChk ZGJfYWxsb2NhdGlvbiAmJiBkZGJfYWxsb2NhdGlvbiAvCi0JCQlmaXhlZDE2X3RvX3UzMl9yb3Vu ZF91cChwbGFuZV9ibG9ja3NfcGVyX2xpbmUpKSA+PSAxKQorCQkJZml4ZWQxNl90b191MzJfcm91 bmRfdXAod3AtPnBsYW5lX2Jsb2Nrc19wZXJfbGluZSkpID49IDEpCiAJCQlzZWxlY3RlZF9yZXN1 bHQgPSBtaW5fZml4ZWQxNihtZXRob2QxLCBtZXRob2QyKTsKLQkJZWxzZSBpZiAobGF0ZW5jeSA+ PSBsaW5ldGltZV91cykKKwkJZWxzZSBpZiAobGF0ZW5jeSA+PSB3cC0+bGluZXRpbWVfdXMpCiAJ CQlzZWxlY3RlZF9yZXN1bHQgPSBtaW5fZml4ZWQxNihtZXRob2QxLCBtZXRob2QyKTsKIAkJZWxz ZQogCQkJc2VsZWN0ZWRfcmVzdWx0ID0gbWV0aG9kMTsKQEAgLTQ0NzAsMTIgKzQ0NzcsMTMgQEAg c3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAKIAlyZXNfYmxvY2tzID0gZml4ZWQxNl90b191MzJfcm91bmRfdXAo c2VsZWN0ZWRfcmVzdWx0KSArIDE7CiAJcmVzX2xpbmVzID0gZGl2X3JvdW5kX3VwX2ZpeGVkMTYo c2VsZWN0ZWRfcmVzdWx0LAotCQkJCQkgcGxhbmVfYmxvY2tzX3Blcl9saW5lKTsKKwkJCQkJIHdw LT5wbGFuZV9ibG9ja3NfcGVyX2xpbmUpOwogCiAJaWYgKGxldmVsID49IDEgJiYgbGV2ZWwgPD0g NykgewotCQlpZiAoeV90aWxlZCkgewotCQkJcmVzX2Jsb2NrcyArPSBmaXhlZDE2X3RvX3UzMl9y b3VuZF91cCh5X3RpbGVfbWluaW11bSk7Ci0JCQlyZXNfbGluZXMgKz0geV9taW5fc2NhbmxpbmVz OworCQlpZiAod3AtPnlfdGlsZWQpIHsKKwkJCXJlc19ibG9ja3MgKz0gZml4ZWQxNl90b191MzJf cm91bmRfdXAoCisJCQkJCQkJd3AtPnlfdGlsZV9taW5pbXVtKTsKKwkJCXJlc19saW5lcyArPSB3 cC0+eV9taW5fc2NhbmxpbmVzOwogCQl9IGVsc2UgewogCQkJcmVzX2Jsb2NrcysrOwogCQl9CkBA IC00NTEzLDYgKzQ1MjEsNyBAQCBza2xfY29tcHV0ZV93bV9sZXZlbHMoY29uc3Qgc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0 aW9uICpkZGIsCiAJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCSAg ICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAorCQkgICAg ICBjb25zdCBzdHJ1Y3Qgc2tsX3dtX3BhcmFtcyAqd21fcGFyYW1zLAogCQkgICAgICBzdHJ1Y3Qg c2tsX3BsYW5lX3dtICp3bSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwpAQCAtNDUzNiw2ICs0NTQ1LDcgQEAgc2ts X2NvbXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJCQkJICAgaW50ZWxfcHN0YXRlLAogCQkJCQkgICBkZGJfYmxvY2tzLAogCQkJCQkgICBs ZXZlbCwKKwkJCQkJICAgd21fcGFyYW1zLAogCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfYiwK IAkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2wsCiAJCQkJCSAgICZyZXN1bHQtPnBsYW5lX2Vu KTsKQEAgLTQ2MDAsMTEgKzQ2MTAsMTggQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9CiAJCQkJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwc3Rh dGUpOwogCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5p ZDsKKwkJc3RydWN0IHNrbF93bV9wYXJhbXMgd21fcGFyYW1zOwogCiAJCXdtID0gJnBpcGVfd20t PnBsYW5lc1twbGFuZV9pZF07CisJCW1lbXNldCgmd21fcGFyYW1zLCAwLCBzaXplb2Yoc3RydWN0 IHNrbF93bV9wYXJhbXMpKTsKKworCQlyZXQgPSBza2xfY29tcHV0ZV9wbGFuZV93bV9wYXJhbXMo ZGV2X3ByaXYsIGNzdGF0ZSwKKwkJCQkJCSAgaW50ZWxfcHN0YXRlLCAmd21fcGFyYW1zKTsKKwkJ aWYgKHJldCkKKwkJCXJldHVybiByZXQ7CiAKIAkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2ZWxz KGRldl9wcml2LCBkZGIsIGNzdGF0ZSwKLQkJCQkJICAgIGludGVsX3BzdGF0ZSwgd20pOworCQkJ CQkgICAgaW50ZWxfcHN0YXRlLCAmd21fcGFyYW1zLCB3bSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1 cm4gcmV0OwogCQlza2xfY29tcHV0ZV90cmFuc2l0aW9uX3dtKGNzdGF0ZSwgJndtLT50cmFuc193 bSk7Ci0tIAoyLjEzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=