From: Maarten Lankhorst Subject: [PATCH] drm/i915: Calculate gen3- watermarks semi-atomically, v2. Date: Tue, 8 Aug 2017 13:00:51 +0200 Message-ID: <20170808110051.12758-1-maarten.lankhorst@linux.intel.com> References: <20170807104828.21046-2-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 858046E0DB for ; Tue, 8 Aug 2017 11:01:00 +0000 (UTC) In-Reply-To: <20170807104828.21046-2-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 IHRoZXkgZ28gd3JvbmcuCgpDSSB3YXMgaGF2aW5nIGlzc3VlcyBvbiB0aGUga21zX2N1cnNvcl9s ZWdhY3kgdGVzdHMgd2l0aCB0b28KbXVjaCBkZWJ1ZyBpbmZvIHByaW50ZWQgb3V0LCBpbiBvcmRl ciB0byByZWR1Y2UgdGhlIGNoYXR0aW5lc3MKd2Ugd2lsbCBraWxsIHRoZSBwcmludHMgZnJvbSBp bnRlbF9jYWxjdWxhdGVfd20uCgpDaGFuZ2VzIHNpbmNlIHYxOgotIE5ldXRlciBpbnRlbF9jYWxj dWxhdGVfd20uCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5r aG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8ICAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwg IDE0ICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMjMzICsrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1MiBpbnNl cnRpb25zKCspLCA5OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggOTc0ZDRiNTc3MTg5Li4yMzRiOTRjYWZjN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTE0NzA5LDcgKzE0NzA5LDggQEAgaW50ZWxfbW9kZXNldF9zZXR1 cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlza2xfd21fZ2V0X2h3X3N0YXRl KGRldik7CiAJfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewogCQlpbGtfd21f Z2V0X2h3X3N0YXRlKGRldik7Ci0JfQorCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 PSAzICYmICFJU19QSU5FVklFVyhkZXZfcHJpdikpCisJCWk5eHhfd21fZ2V0X2h3X3N0YXRlKGRl dik7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQl1NjQgcHV0X2RvbWFp bnM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGY5MWRlOWNiOTY5Ny4uZDUzZDM0NzU2 MDQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTQ3LDYgKzU0NywxNSBAQCBzdHJ1 Y3QgZzR4X3dtX3N0YXRlIHsKIAlib29sIGZiY19lbjsKIH07CiAKK3N0cnVjdCBpOXh4X3dtX3N0 YXRlIHsKKwl1aW50MTZfdCBwbGFuZV93bTsKKwlib29sIGN4c3I7CisKKwlzdHJ1Y3QgeworCQl1 aW50MTZfdCBwbGFuZTsKKwl9IHNyOworfTsKKwogc3RydWN0IGludGVsX2NydGNfd21fc3RhdGUg ewogCXVuaW9uIHsKIAkJc3RydWN0IHsKQEAgLTU5MSw2ICs2MDAsOSBAQCBzdHJ1Y3QgaW50ZWxf Y3J0Y193bV9zdGF0ZSB7CiAJCQkvKiBvcHRpbWFsIHdhdGVybWFya3MgKi8KIAkJCXN0cnVjdCBn NHhfd21fc3RhdGUgb3B0aW1hbDsKIAkJfSBnNHg7CisJCXN0cnVjdCB7CisJCQlzdHJ1Y3QgaTl4 eF93bV9zdGF0ZSBvcHRpbWFsOworCQl9IGk5eHg7CiAJfTsKIAogCS8qCkBAIC04MjMsNiArODM1 LDcgQEAgc3RydWN0IGludGVsX2NydGMgewogCQkJc3RydWN0IGludGVsX3BpcGVfd20gaWxrOwog CQkJc3RydWN0IHZsdl93bV9zdGF0ZSB2bHY7CiAJCQlzdHJ1Y3QgZzR4X3dtX3N0YXRlIGc0eDsK KwkJCXN0cnVjdCBpOXh4X3dtX3N0YXRlIGk5eHg7CiAJCX0gYWN0aXZlOwogCX0gd207CiAKQEAg LTE4NDUsNiArMTg1OCw3IEBAIHZvaWQgZ2VuNl9ycHNfYm9vc3Qoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpycSwKIAkJICAgIHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMpOwogdm9p ZCBpbnRlbF9xdWV1ZV9ycHNfYm9vc3RfZm9yX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpOwogdm9pZCBnNHhfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwordm9pZCBpOXh4X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgdmx2X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZv aWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgc2ts X3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCmluZGV4IDZlMzkzYjIxNzQ1MC4uMTczYTUxNGNkNmRmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKQEAgLTc1MSwxMCArNzUxLDggQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9j YWxjdWxhdGVfd20oaW50IHBpeGVsX3JhdGUsCiAJCQkJICAgbGF0ZW5jeV9ucyAvIDEwMCk7CiAJ ZW50cmllcyA9IERJVl9ST1VORF9VUChlbnRyaWVzLCB3bS0+Y2FjaGVsaW5lX3NpemUpICsKIAkJ d20tPmd1YXJkX3NpemU7Ci0JRFJNX0RFQlVHX0tNUygiRklGTyBlbnRyaWVzIHJlcXVpcmVkIGZv ciBtb2RlOiAlZFxuIiwgZW50cmllcyk7CiAKIAl3bV9zaXplID0gZmlmb19zaXplIC0gZW50cmll czsKLQlEUk1fREVCVUdfS01TKCJGSUZPIHdhdGVybWFyayBsZXZlbDogJWRcbiIsIHdtX3NpemUp OwogCiAJLyogRG9uJ3QgcHJvbW90ZSB3bV9zaXplIHRvIHVuc2lnbmVkLi4uICovCiAJaWYgKHdt X3NpemUgPiB3bS0+bWF4X3dtKQpAQCAtMjIyNCw4OSArMjIyMiwxNTQgQEAgc3RhdGljIHZvaWQg aTk2NV91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKnVudXNlZF9jcnRjKQogCiAjdW5kZWYg RldfV00KIAotc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKnVu dXNlZF9jcnRjKQorc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF93YXRlcm1hcmtfcGFyYW1zICpp OXh4X2dldF93bV9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkJ CQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUodW51c2VkX2NydGMtPmJhc2UuZGV2KTsKLQljb25zdCBz dHJ1Y3QgaW50ZWxfd2F0ZXJtYXJrX3BhcmFtcyAqd21faW5mbzsKLQl1aW50MzJfdCBmd2F0ZXJf bG87Ci0JdWludDMyX3QgZndhdGVyX2hpOwotCWludCBjd20sIHNyd20gPSAxOwotCWludCBmaWZv X3NpemU7Ci0JaW50IHBsYW5lYV93bSwgcGxhbmViX3dtOwotCXN0cnVjdCBpbnRlbF9jcnRjICpj cnRjLCAqZW5hYmxlZCA9IE5VTEw7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2lu dGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7CiAKIAlpZiAoSVNfSTk0NUdNKGRldl9wcml2 KSkKLQkJd21faW5mbyA9ICZpOTQ1X3dtX2luZm87CisJCXJldHVybiAmaTk0NV93bV9pbmZvOwog CWVsc2UgaWYgKCFJU19HRU4yKGRldl9wcml2KSkKLQkJd21faW5mbyA9ICZpOTE1X3dtX2luZm87 CisJCXJldHVybiAmaTkxNV93bV9pbmZvOworCWVsc2UgaWYgKHBsYW5lLT5wbGFuZSA9PSBQTEFO RV9BKQorCQlyZXR1cm4gJmk4MzBfYV93bV9pbmZvOwogCWVsc2UKLQkJd21faW5mbyA9ICZpODMw X2Ffd21faW5mbzsKKwkJcmV0dXJuICZpODMwX2JjX3dtX2luZm87Cit9CiAKLQlmaWZvX3NpemUg PSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZmlmb19zaXplKGRldl9wcml2LCAwKTsKLQljcnRjID0g aW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9wcml2LCAwKTsKLQlpZiAoaW50ZWxfY3J0Y19h Y3RpdmUoY3J0YykpIHsKK3N0YXRpYyBpbnQgaTl4eF9jb21wdXRlX3BpcGVfd20oc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMg PSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJc3RydWN0IGlu dGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQorCQl0b19pbnRlbF9hdG9taWNfc3RhdGUoY3J0Y19z dGF0ZS0+YmFzZS5zdGF0ZSk7CisJc3RydWN0IGk5eHhfd21fc3RhdGUgKndtX3N0YXRlID0gJmNy dGNfc3RhdGUtPndtLmk5eHgub3B0aW1hbDsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0g dG9faW50ZWxfcGxhbmUoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9IE5VTEw7CisJaW50IGZpZm9fc2l6ZTsKKwljb25zdCBz dHJ1Y3QgaW50ZWxfd2F0ZXJtYXJrX3BhcmFtcyAqd21faW5mbzsKKworCWZpZm9fc2l6ZSA9IGRl dl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3ByaXYsIHBsYW5lLT5wbGFuZSk7CisK Kwl3bV9pbmZvID0gaTl4eF9nZXRfd21faW5mbyhkZXZfcHJpdiwgY3J0Yyk7CisKKwl3bV9zdGF0 ZS0+Y3hzciA9IGZhbHNlOworCW1lbXNldCgmd21fc3RhdGUtPnNyLCAwLCBzaXplb2Yod21fc3Rh dGUtPnNyKSk7CisKKwlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5wbGFuZV9tYXNrICYgQklUKGRybV9w bGFuZV9pbmRleCgmcGxhbmUtPmJhc2UpKSkKKwkJcGxhbmVfc3RhdGUgPSBfX2RybV9hdG9taWNf Z2V0X2N1cnJlbnRfcGxhbmVfc3RhdGUoJnN0YXRlLT5iYXNlLCAmcGxhbmUtPmJhc2UpOworCisJ aWYgKCFwbGFuZV9zdGF0ZSB8fCAhaW50ZWxfd21fcGxhbmVfdmlzaWJsZShjcnRjX3N0YXRlLCB0 b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSkpKSB7CisJCXdtX3N0YXRlLT5wbGFuZV93 bSA9IGZpZm9fc2l6ZSAtIHdtX2luZm8tPmd1YXJkX3NpemU7CisJCWlmICh3bV9zdGF0ZS0+cGxh bmVfd20gPiAobG9uZyl3bV9pbmZvLT5tYXhfd20pCisJCQl3bV9zdGF0ZS0+cGxhbmVfd20gPSB3 bV9pbmZvLT5tYXhfd207CisJfSBlbHNlIGlmIChIQVNfRldfQkxDKGRldl9wcml2KSkgeworCQlz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKKwkJdW5zaWduZWQg Y3BwID0gSVNfR0VOMihkZXZfcHJpdikgPyA0IDogZmItPmZvcm1hdC0+Y3BwWzBdOwogCQljb25z dCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9Ci0JCQkmY3J0Yy0+Y29u ZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7Ci0JCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiID0KLQkJCWNydGMtPmJhc2UucHJpbWFyeS0+c3RhdGUtPmZiOwotCQlpbnQgY3BwOworCQkJ JmNydGNfc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwkJdW5zaWduZWQgYWN0aXZlX2NydGNz OworCQlib29sIG1heV9jeHNyOwogCi0JCWlmIChJU19HRU4yKGRldl9wcml2KSkKLQkJCWNwcCA9 IDQ7CisJCWlmIChzdGF0ZS0+bW9kZXNldCkKKwkJCWFjdGl2ZV9jcnRjcyA9IHN0YXRlLT5hY3Rp dmVfY3J0Y3M7CiAJCWVsc2UKLQkJCWNwcCA9IGZiLT5mb3JtYXQtPmNwcFswXTsKKwkJCWFjdGl2 ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVfY3J0Y3M7CiAKLQkJcGxhbmVhX3dtID0gaW50ZWxf Y2FsY3VsYXRlX3dtKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ssCi0JCQkJCSAgICAgICB3bV9p bmZvLCBmaWZvX3NpemUsIGNwcCwKLQkJCQkJICAgICAgIHBlc3NpbWFsX2xhdGVuY3lfbnMpOwot CQllbmFibGVkID0gY3J0YzsKLQl9IGVsc2UgewotCQlwbGFuZWFfd20gPSBmaWZvX3NpemUgLSB3 bV9pbmZvLT5ndWFyZF9zaXplOwotCQlpZiAocGxhbmVhX3dtID4gKGxvbmcpd21faW5mby0+bWF4 X3dtKQotCQkJcGxhbmVhX3dtID0gd21faW5mby0+bWF4X3dtOworCQltYXlfY3hzciA9IGFjdGl2 ZV9jcnRjcyA9PSBkcm1fY3J0Y19tYXNrKCZjcnRjLT5iYXNlKTsKKworCQl3bV9zdGF0ZS0+cGxh bmVfd20gPSBpbnRlbF9jYWxjdWxhdGVfd20oYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKKwkJ CQkJCQl3bV9pbmZvLCBmaWZvX3NpemUsIGNwcCwKKwkJCQkJCQlwZXNzaW1hbF9sYXRlbmN5X25z KTsKKworCQlEUk1fREVCVUdfS01TKCJGSUZPIHdhdGVybWFya3MgLSBwbGFuZSB3YXRlcm1hcmtz OiAlZFxuIiwgd21fc3RhdGUtPnBsYW5lX3dtKTsKKworCQlpZiAoSVNfSTkxNUdNKGRldl9wcml2 KSAmJiBpOTE1X2dlbV9vYmplY3RfaXNfdGlsZWQoaW50ZWxfZmJfb2JqKGZiKSkpCisJCQltYXlf Y3hzciA9IGZhbHNlOworCisJCWlmIChtYXlfY3hzcikgeworCQkJc3RhdGljIGNvbnN0IGludCBz cl9sYXRlbmN5X25zID0gNjAwMDsKKwkJCXVuc2lnbmVkIGxvbmcgZW50cmllczsKKworCQkJZW50 cmllcyA9IGludGVsX3dtX21ldGhvZDIoYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKKwkJCQkJ CSAgIGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsLAorCQkJCQkJICAgY3J0Y19zdGF0ZS0+cGlw ZV9zcmNfdywgY3BwLAorCQkJCQkJICAgc3JfbGF0ZW5jeV9ucyAvIDEwMCk7CisJCQllbnRyaWVz ID0gRElWX1JPVU5EX1VQKGVudHJpZXMsIHdtX2luZm8tPmNhY2hlbGluZV9zaXplKTsKKworCQkJ RFJNX0RFQlVHX0tNUygic2VsZi1yZWZyZXNoIGVudHJpZXM6ICVsZFxuIiwgZW50cmllcyk7CisK KwkJCWlmICh3bV9pbmZvLT5maWZvX3NpemUgPj0gZW50cmllcykgeworCQkJCXdtX3N0YXRlLT5j eHNyID0gdHJ1ZTsKKwkJCQl3bV9zdGF0ZS0+c3IucGxhbmUgPSB3bV9pbmZvLT5maWZvX3NpemUg LSBlbnRyaWVzOworCQkJfSBlbHNlCisJCQkJbWF5X2N4c3IgPSBmYWxzZTsKKwkJfQorCisJCURS TV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyAtIHBsYW5lIHdhdGVybWFya3M6ICVkLCBjYW4g Y3hzcjogJXMsIFNSIHNpemU6ICVkXG4iLAorCQkJICAgICAgd21fc3RhdGUtPnBsYW5lX3dtLCB5 ZXNubyh3bV9zdGF0ZS0+Y3hzciksIHdtX3N0YXRlLT5zci5wbGFuZSk7CiAJfQogCi0JaWYgKElT X0dFTjIoZGV2X3ByaXYpKQotCQl3bV9pbmZvID0gJmk4MzBfYmNfd21faW5mbzsKKwlyZXR1cm4g MDsKK30KIAotCWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2 X3ByaXYsIDEpOwotCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2X3ByaXYsIDEp OwotCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkgewotCQljb25zdCBzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9Ci0JCQkmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVz dGVkX21vZGU7Ci0JCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0KLQkJCWNydGMt PmJhc2UucHJpbWFyeS0+c3RhdGUtPmZiOwotCQlpbnQgY3BwOwordm9pZCBpOXh4X3dtX2dldF9o d19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsK Kwl1aW50MzJfdCBmd2F0ZXJfbG8sIHBsYW5lYV93bSwgcGxhbmViX3dtOworCisJZndhdGVyX2xv ID0gSTkxNV9SRUFEKEZXX0JMQyk7CisKKwlwbGFuZWFfd20gPSBmd2F0ZXJfbG8gJiAweDNmOwor CXBsYW5lYl93bSA9IChmd2F0ZXJfbG8gPj4gMTYpICYgMHgzZjsKKworCWZvcl9lYWNoX2ludGVs X2NydGMoZGV2LCBjcnRjKSB7CisJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOworCQlzdHJ1Y3QgaTl4eF93bV9z dGF0ZSAqd21fc3RhdGUgPSAmY3N0YXRlLT53bS5pOXh4Lm9wdGltYWw7CisJCXN0cnVjdCBpbnRl bF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShjcnRjLT5iYXNlLnByaW1hcnkpOworCisJ CW1lbXNldCgmd21fc3RhdGUtPnNyLCAwLCBzaXplb2Yod21fc3RhdGUtPnNyKSk7CisJCXdtX3N0 YXRlLT5jeHNyID0gZmFsc2U7CiAKLQkJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQotCQkJY3BwID0g NDsKKwkJaWYgKHBsYW5lID09IFBMQU5FX0EpCisJCQl3bV9zdGF0ZS0+cGxhbmVfd20gPSBwbGFu ZWFfd207CiAJCWVsc2UKLQkJCWNwcCA9IGZiLT5mb3JtYXQtPmNwcFswXTsKKwkJCXdtX3N0YXRl LT5wbGFuZV93bSA9IHBsYW5lYl93bTsKKworCQljcnRjLT53bS5hY3RpdmUuaTl4eCA9ICp3bV9z dGF0ZTsKKwl9Cit9CiAKLQkJcGxhbmViX3dtID0gaW50ZWxfY2FsY3VsYXRlX3dtKGFkanVzdGVk X21vZGUtPmNydGNfY2xvY2ssCi0JCQkJCSAgICAgICB3bV9pbmZvLCBmaWZvX3NpemUsIGNwcCwK LQkJCQkJICAgICAgIHBlc3NpbWFsX2xhdGVuY3lfbnMpOworc3RhdGljIHZvaWQgaTl4eF91cGRh dGVfd20oc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJdWludDMyX3QgZndhdGVy X2xvOworCXVpbnQzMl90IGZ3YXRlcl9oaTsKKwlpbnQgY3dtLCBzcndtID0gLTE7CisJaW50IHBs YW5lYV93bSwgcGxhbmViX3dtOworCXN0cnVjdCBpbnRlbF9jcnRjICplbmFibGVkID0gTlVMTDsK KworCWNydGMtPndtLmFjdGl2ZS5pOXh4ID0gY3J0Yy0+Y29uZmlnLT53bS5pOXh4Lm9wdGltYWw7 CisKKwljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldl9wcml2LCAwKTsKKwlwbGFu ZWFfd20gPSBjcnRjLT53bS5hY3RpdmUuaTl4eC5wbGFuZV93bTsKKwlpZiAoaW50ZWxfY3J0Y19h Y3RpdmUoY3J0YykpCisJCWVuYWJsZWQgPSBjcnRjOworCisJY3J0YyA9IGludGVsX2dldF9jcnRj X2Zvcl9wbGFuZShkZXZfcHJpdiwgMSk7CisJaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7 CiAJCWlmIChlbmFibGVkID09IE5VTEwpCiAJCQllbmFibGVkID0gY3J0YzsKIAkJZWxzZQogCQkJ ZW5hYmxlZCA9IE5VTEw7Ci0JfSBlbHNlIHsKLQkJcGxhbmViX3dtID0gZmlmb19zaXplIC0gd21f aW5mby0+Z3VhcmRfc2l6ZTsKLQkJaWYgKHBsYW5lYl93bSA+IChsb25nKXdtX2luZm8tPm1heF93 bSkKLQkJCXBsYW5lYl93bSA9IHdtX2luZm8tPm1heF93bTsKIAl9CisJcGxhbmViX3dtID0gY3J0 Yy0+d20uYWN0aXZlLmk5eHgucGxhbmVfd207CiAKIAlEUk1fREVCVUdfS01TKCJGSUZPIHdhdGVy bWFya3MgLSBBOiAlZCwgQjogJWRcbiIsIHBsYW5lYV93bSwgcGxhbmViX3dtKTsKIAotCWlmIChJ U19JOTE1R00oZGV2X3ByaXYpICYmIGVuYWJsZWQpIHsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iajsKLQotCQlvYmogPSBpbnRlbF9mYl9vYmooZW5hYmxlZC0+YmFzZS5wcmltYXJ5 LT5zdGF0ZS0+ZmIpOwotCi0JCS8qIHNlbGYtcmVmcmVzaCBzZWVtcyBidXN0ZWQgd2l0aCB1bnRp bGVkICovCi0JCWlmICghaTkxNV9nZW1fb2JqZWN0X2lzX3RpbGVkKG9iaikpCi0JCQllbmFibGVk ID0gTlVMTDsKLQl9CisJaWYgKCFlbmFibGVkLT53bS5hY3RpdmUuaTl4eC5jeHNyKQorCQllbmFi bGVkID0gTlVMTDsKIAogCS8qCiAJICogT3ZlcmxheSBnZXRzIGFuIGFnZ3Jlc3NpdmUgZGVmYXVs dCBzaW5jZSB2aWRlbyBqaXR0ZXIgaXMgYmFkLgpAQCAtMjMxNywzMSArMjM4MCw4IEBAIHN0YXRp YyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICp1bnVzZWRfY3J0YykKIAlp bnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKIAogCS8qIENhbGMgc3IgZW50 cmllcyBmb3Igb25lIHBsYW5lIGNvbmZpZ3MgKi8KLQlpZiAoSEFTX0ZXX0JMQyhkZXZfcHJpdikg JiYgZW5hYmxlZCkgewotCQkvKiBzZWxmLXJlZnJlc2ggaGFzIG11Y2ggaGlnaGVyIGxhdGVuY3kg Ki8KLQkJc3RhdGljIGNvbnN0IGludCBzcl9sYXRlbmN5X25zID0gNjAwMDsKLQkJY29uc3Qgc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPQotCQkJJmVuYWJsZWQtPmNvbmZp Zy0+YmFzZS5hZGp1c3RlZF9tb2RlOwotCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm YiA9Ci0JCQllbmFibGVkLT5iYXNlLnByaW1hcnktPnN0YXRlLT5mYjsKLQkJaW50IGNsb2NrID0g YWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKLQkJaW50IGh0b3RhbCA9IGFkanVzdGVkX21vZGUt PmNydGNfaHRvdGFsOwotCQlpbnQgaGRpc3BsYXkgPSBlbmFibGVkLT5jb25maWctPnBpcGVfc3Jj X3c7Ci0JCWludCBjcHA7Ci0JCWludCBlbnRyaWVzOwotCi0JCWlmIChJU19JOTE1R00oZGV2X3By aXYpIHx8IElTX0k5NDVHTShkZXZfcHJpdikpCi0JCQljcHAgPSA0OwotCQllbHNlCi0JCQljcHAg PSBmYi0+Zm9ybWF0LT5jcHBbMF07Ci0KLQkJZW50cmllcyA9IGludGVsX3dtX21ldGhvZDIoY2xv Y2ssIGh0b3RhbCwgaGRpc3BsYXksIGNwcCwKLQkJCQkJICAgc3JfbGF0ZW5jeV9ucyAvIDEwMCk7 Ci0JCWVudHJpZXMgPSBESVZfUk9VTkRfVVAoZW50cmllcywgd21faW5mby0+Y2FjaGVsaW5lX3Np emUpOwotCQlEUk1fREVCVUdfS01TKCJzZWxmLXJlZnJlc2ggZW50cmllczogJWRcbiIsIGVudHJp ZXMpOwotCQlzcndtID0gd21faW5mby0+Zmlmb19zaXplIC0gZW50cmllczsKLQkJaWYgKHNyd20g PCAwKQotCQkJc3J3bSA9IDE7CisJaWYgKGVuYWJsZWQpIHsKKwkJc3J3bSA9IGVuYWJsZWQtPndt LmFjdGl2ZS5pOXh4LnNyLnBsYW5lOwogCiAJCWlmIChJU19JOTQ1RyhkZXZfcHJpdikgfHwgSVNf STk0NUdNKGRldl9wcml2KSkKIAkJCUk5MTVfV1JJVEUoRldfQkxDX1NFTEYsCkBAIC0yMzY3LDIz ICsyNDA3LDE4IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRj ICp1bnVzZWRfY3J0YykKIAkJaW50ZWxfc2V0X21lbW9yeV9jeHNyKGRldl9wcml2LCB0cnVlKTsK IH0KIAotc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKnVudXNl ZF9jcnRjKQorc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKmNy dGMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNSh1bnVz ZWRfY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwotCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlOworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCXVpbnQzMl90IGZ3 YXRlcl9sbzsKIAlpbnQgcGxhbmVhX3dtOwogCi0JY3J0YyA9IHNpbmdsZV9lbmFibGVkX2NydGMo ZGV2X3ByaXYpOwotCWlmIChjcnRjID09IE5VTEwpCisJaWYgKCFpbnRlbF9jcnRjX2FjdGl2ZShj cnRjKSkKIAkJcmV0dXJuOwogCi0JYWRqdXN0ZWRfbW9kZSA9ICZjcnRjLT5jb25maWctPmJhc2Uu YWRqdXN0ZWRfbW9kZTsKLQlwbGFuZWFfd20gPSBpbnRlbF9jYWxjdWxhdGVfd20oYWRqdXN0ZWRf bW9kZS0+Y3J0Y19jbG9jaywKLQkJCQkgICAgICAgJmk4NDVfd21faW5mbywKLQkJCQkgICAgICAg ZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2ZpZm9fc2l6ZShkZXZfcHJpdiwgMCksCi0JCQkJICAgICAg IDQsIHBlc3NpbWFsX2xhdGVuY3lfbnMpOworCWNydGMtPndtLmFjdGl2ZS5pOXh4ID0gY3J0Yy0+ Y29uZmlnLT53bS5pOXh4Lm9wdGltYWw7CisJcGxhbmVhX3dtID0gY3J0Yy0+d20uYWN0aXZlLmk5 eHgucGxhbmVfd207CisKIAlmd2F0ZXJfbG8gPSBJOTE1X1JFQUQoRldfQkxDKSAmIH4weGZmZjsK IAlmd2F0ZXJfbG8gfD0gKDM8PDgpIHwgcGxhbmVhX3dtOwogCkBAIC04ODEzLDkgKzg4NDgsMTMg QEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAl9IGVsc2UgaWYgKElTX0dFTjQoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVw ZGF0ZV93bSA9IGk5NjVfdXBkYXRlX3dtOwogCX0gZWxzZSBpZiAoSVNfR0VOMyhkZXZfcHJpdikp IHsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtID0gaTl4eF9jb21wdXRlX3Bp cGVfd207CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGk5eHhfdXBkYXRlX3dtOwor CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUgPSBpOXh4X2dldF9maWZvX3NpemU7 CiAJfSBlbHNlIGlmIChJU19HRU4yKGRldl9wcml2KSkgeworCQlkZXZfcHJpdi0+ZGlzcGxheS5j b21wdXRlX3BpcGVfd20gPSBpOXh4X2NvbXB1dGVfcGlwZV93bTsKKwogCQlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAxKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRh dGVfd20gPSBpODQ1X3VwZGF0ZV93bTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3Np emUgPSBpODQ1X2dldF9maWZvX3NpemU7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=