From: Maarten Lankhorst Subject: [RFC 1/7] drm/i915: Calculate gen3- watermarks semi-atomically. Date: Thu, 4 May 2017 13:41:27 +0200 Message-ID: <20170504114133.4843-2-maarten.lankhorst@linux.intel.com> References: <20170504114133.4843-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA8E76E180 for ; Thu, 4 May 2017 11:41:48 +0000 (UTC) In-Reply-To: <20170504114133.4843-1-maarten.lankhorst@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-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIGdlbjMgd2F0ZXJtYXJrIGNhbGN1bGF0aW9ucyBhcmUgY29udmVydGVkIHRvIGF0b21pYywK YnV0IHRoZSB3bSB1cGRhdGUgY2FsbHMgYXJlIHN0aWxsIGRvbmUgdGhyb3VnaCB0aGUgbGVnYWN5 CmZ1bmN0aW9ucy4KClRoaXMgd2lsbCBtYWtlIGl0IGVhc2llciB0byBiaXNlY3QgdGhpbmdzIGlm IHRoZXkgZ28gd3JvbmcuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg ICAgIHwgIDE0ICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMjMx ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1 MiBpbnNlcnRpb25zKCspLCA5NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggNDk5MWVmMmFjNzdkLi5jN2QyOTVhMDg5NWQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1NTE4LDcgKzE1NTE4LDggQEAgaW50ZWxfbW9kZXNl dF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlza2xfd21fZ2V0X2h3 X3N0YXRlKGRldik7CiAJfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewogCQlp bGtfd21fZ2V0X2h3X3N0YXRlKGRldik7Ci0JfQorCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8PSAzICYmICFJU19QSU5FVklFVyhkZXZfcHJpdikpCisJCWk5eHhfd21fZ2V0X2h3X3N0 YXRlKGRldik7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQl1NjQgcHV0 X2RvbWFpbnM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGFlOTE3MzcwNzk1OS4uZDll NDlmMmIzYzIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTQ2LDYgKzU0NiwxNSBA QCBzdHJ1Y3QgZzR4X3dtX3N0YXRlIHsKIAlib29sIGZiY19lbjsKIH07CiAKK3N0cnVjdCBpOXh4 X3dtX3N0YXRlIHsKKwl1aW50MTZfdCBwbGFuZV93bTsKKwlib29sIGN4c3I7CisKKwlzdHJ1Y3Qg eworCQl1aW50MTZfdCBwbGFuZTsKKwl9IHNyOworfTsKKwogc3RydWN0IGludGVsX2NydGNfd21f c3RhdGUgewogCXVuaW9uIHsKIAkJc3RydWN0IHsKQEAgLTU5MCw2ICs1OTksOSBAQCBzdHJ1Y3Qg aW50ZWxfY3J0Y193bV9zdGF0ZSB7CiAJCQkvKiBvcHRpbWFsIHdhdGVybWFya3MgKi8KIAkJCXN0 cnVjdCBnNHhfd21fc3RhdGUgb3B0aW1hbDsKIAkJfSBnNHg7CisJCXN0cnVjdCB7CisJCQlzdHJ1 Y3QgaTl4eF93bV9zdGF0ZSBvcHRpbWFsOworCQl9IGk5eHg7CiAJfTsKIAogCS8qCkBAIC04Mjgs NiArODQwLDcgQEAgc3RydWN0IGludGVsX2NydGMgewogCQkJc3RydWN0IGludGVsX3BpcGVfd20g aWxrOwogCQkJc3RydWN0IHZsdl93bV9zdGF0ZSB2bHY7CiAJCQlzdHJ1Y3QgZzR4X3dtX3N0YXRl IGc0eDsKKwkJCXN0cnVjdCBpOXh4X3dtX3N0YXRlIGk5eHg7CiAJCX0gYWN0aXZlOwogCX0gd207 CiAKQEAgLTE4NjgsNiArMTg4MSw3IEBAIHZvaWQgZ2VuNl9ycHNfYm9vc3Qoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgICAgdW5zaWduZWQgbG9uZyBzdWJtaXR0ZWQpOwog dm9pZCBpbnRlbF9xdWV1ZV9ycHNfYm9vc3RfZm9yX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBnNHhfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwordm9pZCBpOXh4X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIHZvaWQgdmx2X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg c2tsX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCmluZGV4IGQyY2VjMzI0OWU4Ny4uMGM5MzNjZmFkMDJjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKQEAgLTIyMjYsODkgKzIyMjYsMTU0IEBAIHN0YXRpYyB2b2lkIGk5NjVfdXBk YXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0YykKIAogI3VuZGVmIEZXX1dNCiAK LXN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0 YykKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfd2F0ZXJtYXJrX3BhcmFtcyAqaTl4eF9nZXRf d21faW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCQkJICAgICBz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHVudXNlZF9jcnRjLT5iYXNlLmRldik7Ci0JY29uc3Qgc3RydWN0IGlu dGVsX3dhdGVybWFya19wYXJhbXMgKndtX2luZm87Ci0JdWludDMyX3QgZndhdGVyX2xvOwotCXVp bnQzMl90IGZ3YXRlcl9oaTsKLQlpbnQgY3dtLCBzcndtID0gMTsKLQlpbnQgZmlmb19zaXplOwot CWludCBwbGFuZWFfd20sIHBsYW5lYl93bTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgKmVu YWJsZWQgPSBOVUxMOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShjcnRjLT5iYXNlLnByaW1hcnkpOwogCiAJaWYgKElTX0k5NDVHTShkZXZfcHJpdikpCi0JCXdt X2luZm8gPSAmaTk0NV93bV9pbmZvOworCQlyZXR1cm4gJmk5NDVfd21faW5mbzsKIAllbHNlIGlm ICghSVNfR0VOMihkZXZfcHJpdikpCi0JCXdtX2luZm8gPSAmaTkxNV93bV9pbmZvOworCQlyZXR1 cm4gJmk5MTVfd21faW5mbzsKKwllbHNlIGlmIChwbGFuZS0+cGxhbmUgPT0gUExBTkVfQSkKKwkJ cmV0dXJuICZpODMwX2Ffd21faW5mbzsKIAllbHNlCi0JCXdtX2luZm8gPSAmaTgzMF9hX3dtX2lu Zm87CisJCXJldHVybiAmaTgzMF9iY193bV9pbmZvOworfQogCi0JZmlmb19zaXplID0gZGV2X3By aXYtPmRpc3BsYXkuZ2V0X2ZpZm9fc2l6ZShkZXZfcHJpdiwgMCk7Ci0JY3J0YyA9IGludGVsX2dl dF9jcnRjX2Zvcl9wbGFuZShkZXZfcHJpdiwgMCk7Ci0JaWYgKGludGVsX2NydGNfYWN0aXZlKGNy dGMpKSB7CitzdGF0aWMgaW50IGk5eHhfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjcnRjX3N0YXRlKQoreworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9hdG9t aWNfc3RhdGUgKnN0YXRlID0KKwkJdG9faW50ZWxfYXRvbWljX3N0YXRlKGNydGNfc3RhdGUtPmJh c2Uuc3RhdGUpOworCXN0cnVjdCBpOXh4X3dtX3N0YXRlICp3bV9zdGF0ZSA9ICZjcnRjX3N0YXRl LT53bS5pOXh4Lm9wdGltYWw7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVs X3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7CisJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqcGxhbmVfc3RhdGUgPSBOVUxMOworCWludCBmaWZvX3NpemU7CisJY29uc3Qgc3RydWN0IGlu dGVsX3dhdGVybWFya19wYXJhbXMgKndtX2luZm87CisKKwlmaWZvX3NpemUgPSBkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfZmlmb19zaXplKGRldl9wcml2LCBwbGFuZS0+cGxhbmUpOworCisJd21faW5m byA9IGk5eHhfZ2V0X3dtX2luZm8oZGV2X3ByaXYsIGNydGMpOworCisJd21fc3RhdGUtPmN4c3Ig PSBmYWxzZTsKKwltZW1zZXQoJndtX3N0YXRlLT5zciwgMCwgc2l6ZW9mKHdtX3N0YXRlLT5zcikp OworCisJaWYgKGNydGNfc3RhdGUtPmJhc2UucGxhbmVfbWFzayAmIEJJVChkcm1fcGxhbmVfaW5k ZXgoJnBsYW5lLT5iYXNlKSkpCisJCXBsYW5lX3N0YXRlID0gX19kcm1fYXRvbWljX2dldF9jdXJy ZW50X3BsYW5lX3N0YXRlKCZzdGF0ZS0+YmFzZSwgJnBsYW5lLT5iYXNlKTsKKworCWlmICghcGxh bmVfc3RhdGUgfHwgIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3J0Y19zdGF0ZSwgdG9faW50ZWxf cGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSkgeworCQl3bV9zdGF0ZS0+cGxhbmVfd20gPSBmaWZv X3NpemUgLSB3bV9pbmZvLT5ndWFyZF9zaXplOworCQlpZiAod21fc3RhdGUtPnBsYW5lX3dtID4g KGxvbmcpd21faW5mby0+bWF4X3dtKQorCQkJd21fc3RhdGUtPnBsYW5lX3dtID0gd21faW5mby0+ bWF4X3dtOworCX0gZWxzZSBpZiAoSEFTX0ZXX0JMQyhkZXZfcHJpdikpIHsKKwkJc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+ZmI7CisJCXVuc2lnbmVkIGNwcCA9IElT X0dFTjIoZGV2X3ByaXYpID8gNCA6IGZiLT5mb3JtYXQtPmNwcFswXTsKIAkJY29uc3Qgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPQotCQkJJmNydGMtPmNvbmZpZy0+YmFz ZS5hZGp1c3RlZF9tb2RlOwotCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9Ci0J CQljcnRjLT5iYXNlLnByaW1hcnktPnN0YXRlLT5mYjsKLQkJaW50IGNwcDsKKwkJCSZjcnRjX3N0 YXRlLT5iYXNlLmFkanVzdGVkX21vZGU7CisJCXVuc2lnbmVkIGFjdGl2ZV9jcnRjczsKKwkJYm9v bCBtYXlfY3hzcjsKIAotCQlpZiAoSVNfR0VOMihkZXZfcHJpdikpCi0JCQljcHAgPSA0OworCQlp ZiAoc3RhdGUtPm1vZGVzZXQpCisJCQlhY3RpdmVfY3J0Y3MgPSBzdGF0ZS0+YWN0aXZlX2NydGNz OwogCQllbHNlCi0JCQljcHAgPSBmYi0+Zm9ybWF0LT5jcHBbMF07CisJCQlhY3RpdmVfY3J0Y3Mg PSBkZXZfcHJpdi0+YWN0aXZlX2NydGNzOwogCi0JCXBsYW5lYV93bSA9IGludGVsX2NhbGN1bGF0 ZV93bShhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrLAotCQkJCQkgICAgICAgd21faW5mbywgZmlm b19zaXplLCBjcHAsCi0JCQkJCSAgICAgICBwZXNzaW1hbF9sYXRlbmN5X25zKTsKLQkJZW5hYmxl ZCA9IGNydGM7Ci0JfSBlbHNlIHsKLQkJcGxhbmVhX3dtID0gZmlmb19zaXplIC0gd21faW5mby0+ Z3VhcmRfc2l6ZTsKLQkJaWYgKHBsYW5lYV93bSA+IChsb25nKXdtX2luZm8tPm1heF93bSkKLQkJ CXBsYW5lYV93bSA9IHdtX2luZm8tPm1heF93bTsKKwkJbWF5X2N4c3IgPSBhY3RpdmVfY3J0Y3Mg PT0gZHJtX2NydGNfbWFzaygmY3J0Yy0+YmFzZSk7CisKKwkJd21fc3RhdGUtPnBsYW5lX3dtID0g aW50ZWxfY2FsY3VsYXRlX3dtKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCisJCQkJCQkJd21f aW5mbywgZmlmb19zaXplLCBjcHAsCisJCQkJCQkJcGVzc2ltYWxfbGF0ZW5jeV9ucyk7CisKKwkJ RFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtzIC0gcGxhbmUgd2F0ZXJtYXJrczogJWRcbiIs IHdtX3N0YXRlLT5wbGFuZV93bSk7CisKKwkJaWYgKElTX0k5MTVHTShkZXZfcHJpdikgJiYgaTkx NV9nZW1fb2JqZWN0X2lzX3RpbGVkKGludGVsX2ZiX29iaihmYikpKQorCQkJbWF5X2N4c3IgPSBm YWxzZTsKKworCQlpZiAobWF5X2N4c3IpIHsKKwkJCXN0YXRpYyBjb25zdCBpbnQgc3JfbGF0ZW5j eV9ucyA9IDYwMDA7CisJCQl1bnNpZ25lZCBsb25nIGVudHJpZXM7CisKKwkJCWVudHJpZXMgPSBp bnRlbF93bV9tZXRob2QyKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCisJCQkJCQkgICBhZGp1 c3RlZF9tb2RlLT5jcnRjX2h0b3RhbCwKKwkJCQkJCSAgIGNydGNfc3RhdGUtPnBpcGVfc3JjX3cs IGNwcCwKKwkJCQkJCSAgIHNyX2xhdGVuY3lfbnMgLyAxMDApOworCQkJZW50cmllcyA9IERJVl9S T1VORF9VUChlbnRyaWVzLCB3bV9pbmZvLT5jYWNoZWxpbmVfc2l6ZSk7CisKKwkJCURSTV9ERUJV R19LTVMoInNlbGYtcmVmcmVzaCBlbnRyaWVzOiAlbGRcbiIsIGVudHJpZXMpOworCisJCQlpZiAo d21faW5mby0+Zmlmb19zaXplID49IGVudHJpZXMpIHsKKwkJCQl3bV9zdGF0ZS0+Y3hzciA9IHRy dWU7CisJCQkJd21fc3RhdGUtPnNyLnBsYW5lID0gd21faW5mby0+Zmlmb19zaXplIC0gZW50cmll czsKKwkJCX0gZWxzZQorCQkJCW1heV9jeHNyID0gZmFsc2U7CisJCX0KKworCQlEUk1fREVCVUdf S01TKCJGSUZPIHdhdGVybWFya3MgLSBwbGFuZSB3YXRlcm1hcmtzOiAlZCwgY2FuIGN4c3I6ICVz LCBTUiBzaXplOiAlZFxuIiwKKwkJCSAgICAgIHdtX3N0YXRlLT5wbGFuZV93bSwgeWVzbm8od21f c3RhdGUtPmN4c3IpLCB3bV9zdGF0ZS0+c3IucGxhbmUpOwogCX0KIAotCWlmIChJU19HRU4yKGRl dl9wcml2KSkKLQkJd21faW5mbyA9ICZpODMwX2JjX3dtX2luZm87CisJcmV0dXJuIDA7Cit9CiAK LQlmaWZvX3NpemUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplKGRldl9wcml2LCAx KTsKLQljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9wcml2LCAxKTsKLQlpZiAo aW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpIHsKLQkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21v ZGUgKmFkanVzdGVkX21vZGUgPQotCQkJJmNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2Rl OwotCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9Ci0JCQljcnRjLT5iYXNlLnBy aW1hcnktPnN0YXRlLT5mYjsKLQkJaW50IGNwcDsKK3ZvaWQgaTl4eF93bV9nZXRfaHdfc3RhdGUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGludGVsX2NydGMgKmNydGM7CisJdWludDMy X3QgZndhdGVyX2xvLCBwbGFuZWFfd20sIHBsYW5lYl93bTsKKworCWZ3YXRlcl9sbyA9IEk5MTVf UkVBRChGV19CTEMpOworCisJcGxhbmVhX3dtID0gZndhdGVyX2xvICYgMHgzZjsKKwlwbGFuZWJf d20gPSAoZndhdGVyX2xvID4+IDE2KSAmIDB4M2Y7CisKKwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgY3J0YykgeworCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxf Y3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKKwkJc3RydWN0IGk5eHhfd21fc3RhdGUgKndt X3N0YXRlID0gJmNzdGF0ZS0+d20uaTl4eC5vcHRpbWFsOworCQlzdHJ1Y3QgaW50ZWxfcGxhbmUg KnBsYW5lID0gdG9faW50ZWxfcGxhbmUoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKKworCQltZW1zZXQo JndtX3N0YXRlLT5zciwgMCwgc2l6ZW9mKHdtX3N0YXRlLT5zcikpOworCQl3bV9zdGF0ZS0+Y3hz ciA9IGZhbHNlOwogCi0JCWlmIChJU19HRU4yKGRldl9wcml2KSkKLQkJCWNwcCA9IDQ7CisJCWlm IChwbGFuZSA9PSBQTEFORV9BKQorCQkJd21fc3RhdGUtPnBsYW5lX3dtID0gcGxhbmVhX3dtOwog CQllbHNlCi0JCQljcHAgPSBmYi0+Zm9ybWF0LT5jcHBbMF07CisJCQl3bV9zdGF0ZS0+cGxhbmVf d20gPSBwbGFuZWJfd207CisKKwkJY3J0Yy0+d20uYWN0aXZlLmk5eHggPSAqd21fc3RhdGU7CisJ fQorfQogCi0JCXBsYW5lYl93bSA9IGludGVsX2NhbGN1bGF0ZV93bShhZGp1c3RlZF9tb2RlLT5j cnRjX2Nsb2NrLAotCQkJCQkgICAgICAgd21faW5mbywgZmlmb19zaXplLCBjcHAsCi0JCQkJCSAg ICAgICBwZXNzaW1hbF9sYXRlbmN5X25zKTsKK3N0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCXVpbnQzMl90IGZ3YXRlcl9sbzsKKwl1 aW50MzJfdCBmd2F0ZXJfaGk7CisJaW50IGN3bSwgc3J3bSA9IC0xOworCWludCBwbGFuZWFfd20s IHBsYW5lYl93bTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqZW5hYmxlZCA9IE5VTEw7CisKKwljcnRj LT53bS5hY3RpdmUuaTl4eCA9IGNydGMtPmNvbmZpZy0+d20uaTl4eC5vcHRpbWFsOworCisJY3J0 YyA9IGludGVsX2dldF9jcnRjX2Zvcl9wbGFuZShkZXZfcHJpdiwgMCk7CisJcGxhbmVhX3dtID0g Y3J0Yy0+d20uYWN0aXZlLmk5eHgucGxhbmVfd207CisJaWYgKGludGVsX2NydGNfYWN0aXZlKGNy dGMpKQorCQllbmFibGVkID0gY3J0YzsKKworCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxh bmUoZGV2X3ByaXYsIDEpOworCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkgewogCQlpZiAo ZW5hYmxlZCA9PSBOVUxMKQogCQkJZW5hYmxlZCA9IGNydGM7CiAJCWVsc2UKIAkJCWVuYWJsZWQg PSBOVUxMOwotCX0gZWxzZSB7Ci0JCXBsYW5lYl93bSA9IGZpZm9fc2l6ZSAtIHdtX2luZm8tPmd1 YXJkX3NpemU7Ci0JCWlmIChwbGFuZWJfd20gPiAobG9uZyl3bV9pbmZvLT5tYXhfd20pCi0JCQlw bGFuZWJfd20gPSB3bV9pbmZvLT5tYXhfd207CiAJfQorCXBsYW5lYl93bSA9IGNydGMtPndtLmFj dGl2ZS5pOXh4LnBsYW5lX3dtOwogCiAJRFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtzIC0g QTogJWQsIEI6ICVkXG4iLCBwbGFuZWFfd20sIHBsYW5lYl93bSk7CiAKLQlpZiAoSVNfSTkxNUdN KGRldl9wcml2KSAmJiBlbmFibGVkKSB7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv Ymo7Ci0KLQkJb2JqID0gaW50ZWxfZmJfb2JqKGVuYWJsZWQtPmJhc2UucHJpbWFyeS0+c3RhdGUt PmZiKTsKLQotCQkvKiBzZWxmLXJlZnJlc2ggc2VlbXMgYnVzdGVkIHdpdGggdW50aWxlZCAqLwot CQlpZiAoIWk5MTVfZ2VtX29iamVjdF9pc190aWxlZChvYmopKQotCQkJZW5hYmxlZCA9IE5VTEw7 Ci0JfQorCWlmICghZW5hYmxlZC0+d20uYWN0aXZlLmk5eHguY3hzcikKKwkJZW5hYmxlZCA9IE5V TEw7CiAKIAkvKgogCSAqIE92ZXJsYXkgZ2V0cyBhbiBhZ2dyZXNzaXZlIGRlZmF1bHQgc2luY2Ug dmlkZW8gaml0dGVyIGlzIGJhZC4KQEAgLTIzMTksMzEgKzIzODQsOCBAQCBzdGF0aWMgdm9pZCBp OXh4X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqdW51c2VkX2NydGMpCiAJaW50ZWxfc2V0 X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7CiAKIAkvKiBDYWxjIHNyIGVudHJpZXMgZm9y IG9uZSBwbGFuZSBjb25maWdzICovCi0JaWYgKEhBU19GV19CTEMoZGV2X3ByaXYpICYmIGVuYWJs ZWQpIHsKLQkJLyogc2VsZi1yZWZyZXNoIGhhcyBtdWNoIGhpZ2hlciBsYXRlbmN5ICovCi0JCXN0 YXRpYyBjb25zdCBpbnQgc3JfbGF0ZW5jeV9ucyA9IDYwMDA7Ci0JCWNvbnN0IHN0cnVjdCBkcm1f ZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KLQkJCSZlbmFibGVkLT5jb25maWctPmJhc2Uu YWRqdXN0ZWRfbW9kZTsKLQkJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPQotCQkJ ZW5hYmxlZC0+YmFzZS5wcmltYXJ5LT5zdGF0ZS0+ZmI7Ci0JCWludCBjbG9jayA9IGFkanVzdGVk X21vZGUtPmNydGNfY2xvY2s7Ci0JCWludCBodG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0 b3RhbDsKLQkJaW50IGhkaXNwbGF5ID0gZW5hYmxlZC0+Y29uZmlnLT5waXBlX3NyY193OwotCQlp bnQgY3BwOwotCQlpbnQgZW50cmllczsKLQotCQlpZiAoSVNfSTkxNUdNKGRldl9wcml2KSB8fCBJ U19JOTQ1R00oZGV2X3ByaXYpKQotCQkJY3BwID0gNDsKLQkJZWxzZQotCQkJY3BwID0gZmItPmZv cm1hdC0+Y3BwWzBdOwotCi0JCWVudHJpZXMgPSBpbnRlbF93bV9tZXRob2QyKGNsb2NrLCBodG90 YWwsIGhkaXNwbGF5LCBjcHAsCi0JCQkJCSAgIHNyX2xhdGVuY3lfbnMgLyAxMDApOwotCQllbnRy aWVzID0gRElWX1JPVU5EX1VQKGVudHJpZXMsIHdtX2luZm8tPmNhY2hlbGluZV9zaXplKTsKLQkJ RFJNX0RFQlVHX0tNUygic2VsZi1yZWZyZXNoIGVudHJpZXM6ICVkXG4iLCBlbnRyaWVzKTsKLQkJ c3J3bSA9IHdtX2luZm8tPmZpZm9fc2l6ZSAtIGVudHJpZXM7Ci0JCWlmIChzcndtIDwgMCkKLQkJ CXNyd20gPSAxOworCWlmIChlbmFibGVkKSB7CisJCXNyd20gPSBlbmFibGVkLT53bS5hY3RpdmUu aTl4eC5zci5wbGFuZTsKIAogCQlpZiAoSVNfSTk0NUcoZGV2X3ByaXYpIHx8IElTX0k5NDVHTShk ZXZfcHJpdikpCiAJCQlJOTE1X1dSSVRFKEZXX0JMQ19TRUxGLApAQCAtMjM2OSwyMyArMjQxMSwx OCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqdW51c2Vk X2NydGMpCiAJCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgdHJ1ZSk7CiB9CiAKLXN0 YXRpYyB2b2lkIGk4NDVfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0YykK K3N0YXRpYyB2b2lkIGk4NDVfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewot CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUodW51c2VkX2NydGMt PmJhc2UuZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKLQljb25zdCBzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAl1aW50MzJfdCBmd2F0ZXJfbG87 CiAJaW50IHBsYW5lYV93bTsKIAotCWNydGMgPSBzaW5nbGVfZW5hYmxlZF9jcnRjKGRldl9wcml2 KTsKLQlpZiAoY3J0YyA9PSBOVUxMKQorCWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpCiAJ CXJldHVybjsKIAotCWFkanVzdGVkX21vZGUgPSAmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVk X21vZGU7Ci0JcGxhbmVhX3dtID0gaW50ZWxfY2FsY3VsYXRlX3dtKGFkanVzdGVkX21vZGUtPmNy dGNfY2xvY2ssCi0JCQkJICAgICAgICZpODQ1X3dtX2luZm8sCi0JCQkJICAgICAgIGRldl9wcml2 LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3ByaXYsIDApLAotCQkJCSAgICAgICA0LCBwZXNz aW1hbF9sYXRlbmN5X25zKTsKKwljcnRjLT53bS5hY3RpdmUuaTl4eCA9IGNydGMtPmNvbmZpZy0+ d20uaTl4eC5vcHRpbWFsOworCXBsYW5lYV93bSA9IGNydGMtPndtLmFjdGl2ZS5pOXh4LnBsYW5l X3dtOworCiAJZndhdGVyX2xvID0gSTkxNV9SRUFEKEZXX0JMQykgJiB+MHhmZmY7CiAJZndhdGVy X2xvIHw9ICgzPDw4KSB8IHBsYW5lYV93bTsKIApAQCAtODcwNSw5ICs4NzQyLDEzIEBAIHZvaWQg aW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNl IGlmIChJU19HRU40KGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20g PSBpOTY1X3VwZGF0ZV93bTsKIAl9IGVsc2UgaWYgKElTX0dFTjMoZGV2X3ByaXYpKSB7CisJCWRl dl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bSA9IGk5eHhfY29tcHV0ZV9waXBlX3dtOwog CQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBpOXh4X3VwZGF0ZV93bTsKKwogCQlkZXZf cHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTl4eF9nZXRfZmlmb19zaXplOwogCX0gZWxz ZSBpZiAoSVNfR0VOMihkZXZfcHJpdikpIHsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9w aXBlX3dtID0gaTl4eF9jb21wdXRlX3BpcGVfd207CisKIAkJaWYgKElOVEVMX0lORk8oZGV2X3By aXYpLT5udW1fcGlwZXMgPT0gMSkgewogCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0g aTg0NV91cGRhdGVfd207CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplID0gaTg0 NV9nZXRfZmlmb19zaXplOwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=