From: Maarten Lankhorst Subject: [PATCH v2.1 09/11] drm/i915/gen9+: Program watermarks as a separate step during evasion, v3. Date: Thu, 27 Oct 2016 13:45:20 +0200 Message-ID: References: <1477489299-25777-1-git-send-email-maarten.lankhorst@linux.intel.com> <1477489299-25777-10-git-send-email-maarten.lankhorst@linux.intel.com> <20161026232445.GD5924@intel.com> <1feac5e6-6423-dde7-cb69-52d2b308fe8a@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDDDE6EA5A for ; Thu, 27 Oct 2016 11:45:22 +0000 (UTC) In-Reply-To: <1feac5e6-6423-dde7-cb69-52d2b308fe8a@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: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhlIHdhdGVybWFyayB1cGRhdGVzIGZvciBTS0wgc3R5bGUgd2F0ZXJtYXJrcyBhcmUgbm8gbG9u Z2VyIGRvbmUKaW4gdGhlIHBsYW5lIGNhbGxiYWNrcywgYnV0IGFyZSBub3cgY2FsbGVkIGluIGEg c2VwYXJhdGUgd2F0ZXJtYXJrCnVwZGF0ZSBmdW5jdGlvbiB0aGF0J3MgY2FsbGVkIGR1cmluZyB0 aGUgc2FtZSB2YmxhbmsgZXZhc2lvbiwKYmVmb3JlIHRoZSBwbGFuZSB1cGRhdGVzLgoKVGhpcyBh bHNvIGdldHMgcmlkIG9mIHRoZSBnbG9iYWwgc2tsX3Jlc3VsdHMsIHdoaWNoIHdhcyByZXF1aXJl ZCBmb3IKa2VlcGluZyB0cmFjayBvZiB0aGUgY3VycmVudCBhdG9taWMgY29tbWl0LgoKQ2hhbmdl cyBzaW5jZSB2MToKLSBNb3ZlIGxpbmUgdW53cmFwIHRvIGNvcnJlY3QgcGF0Y2guIChMeXVkZSkK LSBNYWtlIHN1cmUgd2UgZG9uJ3QgcmVncmVzcyBJTEsgd2F0ZXJtYXJrcy4gKE1hdHQpCi0gUmVw aHJhc2UgY29tbWl0IG1lc3NhZ2UuIChNYXR0KQpDaGFuZ2VzIHNpbmNlIHYyOgotIEZpeCBkaXNh YmxlIHdhdGVybWFyayBjaGVjayB0byB1c2UgdGhlIGNvcnJlY3Qgd2F5IHRvIGRldGVybWluZSBz aW5nbGUKICBzdGVwIHdhdGVybWFyayBzdXBwb3J0LgoKUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIg PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBMeXVkZSA8Y3BhdWxAcmVk aGF0LmNvbT4KU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgfCAgNyAtLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCA0MCArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICA3IC0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgICAgICB8IDMyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxOCAtLS0tLS0tLS0tLS0tLS0tCiA1 IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDc0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IDY2MzliYjgxMmI5Ni4uOTk0M2NmZTAxNDQ5IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIwNDEsMTMgKzIwNDEsNiBAQCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSB7CiAJCSAqLwogCQl1aW50MTZfdCBza2xfbGF0ZW5jeVs4XTsKIAotCQkvKgotCQkg KiBUaGUgc2tsX3dtX3ZhbHVlcyBzdHJ1Y3R1cmUgaXMgYSBiaXQgdG9vIGJpZyBmb3Igc3RhY2sK LQkJICogYWxsb2NhdGlvbiwgc28gd2Uga2VlcCB0aGUgc3RhZ2luZyBzdHJ1Y3Qgd2hlcmUgd2Ug c3RvcmUKLQkJICogaW50ZXJtZWRpYXRlIHJlc3VsdHMgaGVyZSBpbnN0ZWFkLgotCQkgKi8KLQkJ c3RydWN0IHNrbF93bV92YWx1ZXMgc2tsX3Jlc3VsdHM7Ci0KIAkJLyogY3VycmVudCBoYXJkd2Fy ZSBzdGF0ZSAqLwogCQl1bmlvbiB7CiAJCQlzdHJ1Y3QgaWxrX3dtX3ZhbHVlcyBodzsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4MmJjYTU4NWMyYjMuLjhlYTA3NGVhNjBk YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzM4NCw5ICszMzg0LDYg QEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNy dGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFu ZV9zdGF0ZS0+YmFzZS5mYjsKLQljb25zdCBzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqd20gPSAmZGV2 X3ByaXYtPndtLnNrbF9yZXN1bHRzOwotCWNvbnN0IHN0cnVjdCBza2xfcGxhbmVfd20gKnBfd20g PQotCQkmY3J0Y19zdGF0ZS0+d20uc2tsLm9wdGltYWwucGxhbmVzWzBdOwogCWludCBwaXBlID0g aW50ZWxfY3J0Yy0+cGlwZTsKIAl1MzIgcGxhbmVfY3RsOwogCXVuc2lnbmVkIGludCByb3RhdGlv biA9IHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uOwpAQCAtMzQyMiw5ICszNDE5LDYgQEAgc3Rh dGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAlpbnRlbF9jcnRjLT5hZGp1c3RlZF94ID0gc3JjX3g7CiAJaW50ZWxfY3J0Yy0+YWRq dXN0ZWRfeSA9IHNyY195OwogCi0JaWYgKHdtLT5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21hc2so JmludGVsX2NydGMtPmJhc2UpKQotCQlza2xfd3JpdGVfcGxhbmVfd20oaW50ZWxfY3J0YywgcF93 bSwgJndtLT5kZGIsIDApOwotCiAJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgMCksIHBsYW5l X2N0bCk7CiAJSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlwZSwgMCksIChzcmNfeSA8PCAxNikg fCBzcmNfeCk7CiAJSTkxNV9XUklURShQTEFORV9TVFJJREUocGlwZSwgMCksIHN0cmlkZSk7CkBA IC0zNDU3LDE4ICszNDUxLDggQEAgc3RhdGljIHZvaWQgc2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Yyk7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNf c3RhdGUoY3J0Yy0+c3RhdGUpOwotCWNvbnN0IHN0cnVjdCBza2xfcGxhbmVfd20gKnBfd20gPSAm Y3N0YXRlLT53bS5za2wub3B0aW1hbC5wbGFuZXNbMF07CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRj LT5waXBlOwogCi0JLyoKLQkgKiBXZSBvbmx5IHBvcHVsYXRlIHNrbF9yZXN1bHRzIG9uIHdhdGVy bWFyayB1cGRhdGVzLCBhbmQgaWYgdGhlCi0JICogcGxhbmUncyB2aXNpYmxpdHkgaXNuJ3QgYWN0 dWFsbHkgY2hhbmdpbmcgbmVpdGhlciBpcyBpdHMgd2F0ZXJtYXJrcy4KLQkgKi8KLQlpZiAoIWNy dGMtPnByaW1hcnktPnN0YXRlLT52aXNpYmxlKQotCQlza2xfd3JpdGVfcGxhbmVfd20oaW50ZWxf Y3J0YywgcF93bSwKLQkJCQkgICAmZGV2X3ByaXYtPndtLnNrbF9yZXN1bHRzLmRkYiwgMCk7Ci0K IAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCAwKSwgMCk7CiAJSTkxNV9XUklURShQTEFORV9T VVJGKHBpcGUsIDApLCAwKTsKIAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCAwKSk7CkBA IC0xMDg0MCwxNiArMTA4MjQsOSBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9jdXJzb3Ioc3Ry dWN0IGRybV9jcnRjICpjcnRjLCB1MzIgYmFzZSwKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpOwotCWNvbnN0IHN0cnVjdCBza2xfd21fdmFsdWVzICp3bSA9ICZkZXZf cHJpdi0+d20uc2tsX3Jlc3VsdHM7Ci0JY29uc3Qgc3RydWN0IHNrbF9wbGFuZV93bSAqcF93bSA9 Ci0JCSZjc3RhdGUtPndtLnNrbC5vcHRpbWFsLnBsYW5lc1tQTEFORV9DVVJTT1JdOwogCWludCBw aXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1aW50MzJfdCBjbnRsID0gMDsKIAotCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDkgJiYgd20tPmRpcnR5X3BpcGVzICYgZHJtX2NydGNfbWFzayhj cnRjKSkKLQkJc2tsX3dyaXRlX2N1cnNvcl93bShpbnRlbF9jcnRjLCBwX3dtLCAmd20tPmRkYik7 Ci0KIAlpZiAocGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkgewogCQlj bnRsID0gTUNVUlNPUl9HQU1NQV9FTkFCTEU7CiAJCXN3aXRjaCAocGxhbmVfc3RhdGUtPmJhc2Uu Y3J0Y193KSB7CkBAIC0xNDQ1OSw4ICsxNDQzNiwxNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9hdG9t aWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkJaW50ZWxf Y2hlY2tfY3B1X2ZpZm9fdW5kZXJydW5zKGRldl9wcml2KTsKIAkJCWludGVsX2NoZWNrX3BjaF9m aWZvX3VuZGVycnVucyhkZXZfcHJpdik7CiAKLQkJCWlmICghY3J0Yy0+c3RhdGUtPmFjdGl2ZSkK LQkJCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKKwkJCWlmICghY3J0Yy0+c3RhdGUt PmFjdGl2ZSkgeworCQkJCS8qCisJCQkJICogTWFrZSBzdXJlIHdlIGRvbid0IGNhbGwgaW5pdGlh bF93YXRlcm1hcmtzCisJCQkJICogZm9yIElMSy1zdHlsZSB3YXRlcm1hcmsgdXBkYXRlcy4KKwkJ CQkgKi8KKwkJCQlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuYXRvbWljX3VwZGF0ZV93YXRlcm1hcmtz KQorCQkJCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MoaW50ZWxfc3RhdGUs CisJCQkJCQkJCQkgICAgIHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpKTsKKwkJCQll bHNlCisJCQkJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOworCQkJfQogCQl9CiAJfQog CkBAIC0xNDYzMSw3ICsxNDYxNyw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZShz dGF0ZSwgdHJ1ZSk7CiAJZGV2X3ByaXYtPndtLmRpc3RydXN0X2Jpb3Nfd20gPSBmYWxzZTsKLQlk ZXZfcHJpdi0+d20uc2tsX3Jlc3VsdHMgPSBpbnRlbF9zdGF0ZS0+d21fcmVzdWx0czsKIAlpbnRl bF9zaGFyZWRfZHBsbF9jb21taXQoc3RhdGUpOwogCWludGVsX2F0b21pY190cmFja19mYnMoc3Rh dGUpOwogCkBAIC0xNDk0MSw3ICsxNDkyNiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2Ny dGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpbnRlbF9waXBlX3VwZGF0ZV9zdGFy dChpbnRlbF9jcnRjKTsKIAogCWlmIChtb2Rlc2V0KQotCQlyZXR1cm47CisJCWdvdG8gb3V0Owog CiAJaWYgKGNydGMtPnN0YXRlLT5jb2xvcl9tZ210X2NoYW5nZWQgfHwgdG9faW50ZWxfY3J0Y19z dGF0ZShjcnRjLT5zdGF0ZSktPnVwZGF0ZV9waXBlKSB7CiAJCWludGVsX2NvbG9yX3NldF9jc2Mo Y3J0Yy0+c3RhdGUpOwpAQCAtMTQ5NTMsNiArMTQ5MzgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9i ZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZWxzZSBpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KQogCQlza2xfZGV0YWNoX3NjYWxlcnMoaW50ZWxfY3J0Yyk7CiAK K291dDoKIAlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuYXRvbWljX3VwZGF0ZV93YXRlcm1hcmtzKQog CQlkZXZfcHJpdi0+ZGlzcGxheS5hdG9taWNfdXBkYXRlX3dhdGVybWFya3Mob2xkX2ludGVsX3N0 YXRlLCBpbnRlbF9jc3RhdGUpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA3N2Ew YTczZTM3YjAuLjJjZDdjNWZkOWViZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE3 NDcsMTMgKzE3NDcsNiBAQCBib29sIHNrbF9kZGJfYWxsb2NhdGlvbl9lcXVhbHMoY29uc3Qgc3Ry dWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqb2xkLAogCQkJICAgICAgIGVudW0gcGlwZSBwaXBlKTsK IGJvb2wgc2tsX2RkYl9hbGxvY2F0aW9uX292ZXJsYXBzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAkJCQkgc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpOwotdm9pZCBza2xf d3JpdGVfY3Vyc29yX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAotCQkJIGNvbnN0 IHN0cnVjdCBza2xfcGxhbmVfd20gKndtLAotCQkJIGNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9j YXRpb24gKmRkYik7Ci12b2lkIHNrbF93cml0ZV9wbGFuZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YywKLQkJCWNvbnN0IHN0cnVjdCBza2xfcGxhbmVfd20gKndtLAotCQkJY29uc3Qg c3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAotCQkJaW50IHBsYW5lKTsKIHVpbnQzMl90 IGlsa19waXBlX3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKTsKIGJvb2wgaWxrX2Rpc2FibGVfbHBfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiBpbnQgc2FuaXRpemVfcmM2X29wdGlvbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGludCBlbmFibGVfcmM2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGI1ODZiZGMx ZDNhMS4uZDI2M2NhNjFlOTZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTQyMDcsMjAg KzQyMDcsMzAgQEAgc3RhdGljIHZvaWQgc2tsX2F0b21pY191cGRhdGVfY3J0Y193bShzdHJ1Y3Qg aW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRv X2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoc3RhdGUtPmJhc2UuZGV2KTsKIAlzdHJ1Y3Qgc2tsX3BpcGVf d20gKnBpcGVfd20gPSAmY3N0YXRlLT53bS5za2wub3B0aW1hbDsKKwljb25zdCBzdHJ1Y3Qgc2ts X2RkYl9hbGxvY2F0aW9uICpkZGIgPSAmc3RhdGUtPndtX3Jlc3VsdHMuZGRiOwogCWVudW0gcGlw ZSBwaXBlID0gY3J0Yy0+cGlwZTsKKwlpbnQgcGxhbmU7CisKKwlpZiAoIShzdGF0ZS0+d21fcmVz dWx0cy5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21hc2soJmNydGMtPmJhc2UpKSkKKwkJcmV0dXJu OwogCiAJSTkxNV9XUklURShQSVBFX1dNX0xJTkVUSU1FKHBpcGUpLCBwaXBlX3dtLT5saW5ldGlt ZSk7CisKKwlmb3IgKHBsYW5lID0gMDsgcGxhbmUgPCBpbnRlbF9udW1fcGxhbmVzKGNydGMpOyBw bGFuZSsrKQorCQlza2xfd3JpdGVfcGxhbmVfd20oY3J0YywgJnBpcGVfd20tPnBsYW5lc1twbGFu ZV0sIGRkYiwgcGxhbmUpOworCisJc2tsX3dyaXRlX2N1cnNvcl93bShjcnRjLCAmcGlwZV93bS0+ cGxhbmVzW1BMQU5FX0NVUlNPUl0sIGRkYik7CiB9CiAKLXN0YXRpYyB2b2lkIHNrbF91cGRhdGVf d20oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgc2tsX2luaXRpYWxfd20oc3Ry dWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlKQogeworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNzdGF0ZS0+YmFzZS5j cnRjOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3Qgc2tsX3dtX3ZhbHVl cyAqcmVzdWx0cyA9ICZkZXZfcHJpdi0+d20uc2tsX3Jlc3VsdHM7CisJc3RydWN0IHNrbF93bV92 YWx1ZXMgKnJlc3VsdHMgPSAmc3RhdGUtPndtX3Jlc3VsdHM7CiAJc3RydWN0IHNrbF93bV92YWx1 ZXMgKmh3X3ZhbHMgPSAmZGV2X3ByaXYtPndtLnNrbF9odzsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Ci0Jc3RydWN0 IHNrbF9waXBlX3dtICpwaXBlX3dtID0gJmNzdGF0ZS0+d20uc2tsLm9wdGltYWw7CiAJZW51bSBw aXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCiAJaWYgKChyZXN1bHRzLT5kaXJ0eV9waXBl cyAmIGRybV9jcnRjX21hc2soY3J0YykpID09IDApCkBAIC00MjM0LDE2ICs0MjQ0LDggQEAgc3Rh dGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJICogdGhlIHBp cGUncyBzaHV0IG9mZiwganVzdCBkbyBzbyBoZXJlLiBBbHJlYWR5IGFjdGl2ZSBwaXBlcyB3aWxs IGhhdmUKIAkgKiB0aGVpciB3YXRlcm1hcmtzIHVwZGF0ZWQgb25jZSB3ZSB1cGRhdGUgdGhlaXIg cGxhbmVzLgogCSAqLwotCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlX2NoYW5nZWQpIHsKLQkJaW50 IHBsYW5lOwotCi0JCWZvciAocGxhbmUgPSAwOyBwbGFuZSA8IGludGVsX251bV9wbGFuZXMoaW50 ZWxfY3J0Yyk7IHBsYW5lKyspCi0JCQlza2xfd3JpdGVfcGxhbmVfd20oaW50ZWxfY3J0YywgJnBp cGVfd20tPnBsYW5lc1twbGFuZV0sCi0JCQkJCSAgICZyZXN1bHRzLT5kZGIsIHBsYW5lKTsKLQot CQlza2xfd3JpdGVfY3Vyc29yX3dtKGludGVsX2NydGMsICZwaXBlX3dtLT5wbGFuZXNbUExBTkVf Q1VSU09SXSwKLQkJCQkgICAgJnJlc3VsdHMtPmRkYik7Ci0JfQorCWlmIChjc3RhdGUtPmJhc2Uu YWN0aXZlX2NoYW5nZWQpCisJCXNrbF9ldmFkZV9jcnRjX3dtKHN0YXRlLCBjc3RhdGUpOwogCiAJ c2tsX2NvcHlfd21fZm9yX3BpcGUoaHdfdmFscywgcmVzdWx0cywgcGlwZSk7CiAKQEAgLTc3NTEs NyArNzc1Myw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CS8qIEZvciBGSUZPIHdhdGVybWFyayB1cGRhdGVzICovCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID49IDkpIHsKIAkJc2tsX3NldHVwX3dtX2xhdGVuY3koZGV2KTsKLQkJZGV2X3ByaXYtPmRp c3BsYXkudXBkYXRlX3dtID0gc2tsX3VwZGF0ZV93bTsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5p dGlhbF93YXRlcm1hcmtzID0gc2tsX2luaXRpYWxfd207CiAJCWRldl9wcml2LT5kaXNwbGF5LmF0 b21pY191cGRhdGVfd2F0ZXJtYXJrcyA9IHNrbF9hdG9taWNfdXBkYXRlX2NydGNfd207CiAJCWRl dl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfZ2xvYmFsX3dhdGVybWFya3MgPSBza2xfY29tcHV0ZV93 bTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCmluZGV4IDQzZDAzNTA4NTZlNy4uMDBkMTdkNjgzZjY3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjAzLDEzICsyMDMsOCBAQCBza2xfdXBkYXRl X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKGRybV9wbGFuZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKLQljb25zdCBzdHJ1Y3Qgc2tsX3dtX3Zh bHVlcyAqd20gPSAmZGV2X3ByaXYtPndtLnNrbF9yZXN1bHRzOwotCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YyA9IGNydGNfc3RhdGUtPmJhc2UuY3J0YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJY29uc3QgaW50IHBpcGUgPSBpbnRlbF9wbGFu ZS0+cGlwZTsKIAljb25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxOwotCWNv bnN0IHN0cnVjdCBza2xfcGxhbmVfd20gKnBfd20gPQotCQkmY3J0Y19zdGF0ZS0+d20uc2tsLm9w dGltYWwucGxhbmVzW3BsYW5lXTsKIAl1MzIgcGxhbmVfY3RsOwogCWNvbnN0IHN0cnVjdCBkcm1f aW50ZWxfc3ByaXRlX2NvbG9ya2V5ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJdTMyIHN1 cmZfYWRkciA9IHBsYW5lX3N0YXRlLT5tYWluLm9mZnNldDsKQEAgLTIzMyw5ICsyMjgsNiBAQCBz a2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwKIAogCXBsYW5lX2N0 bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHJvdGF0aW9uKTsKIAotCWlmICh3bS0+ZGlydHlf cGlwZXMgJiBkcm1fY3J0Y19tYXNrKGNydGMpKQotCQlza2xfd3JpdGVfcGxhbmVfd20oaW50ZWxf Y3J0YywgcF93bSwgJndtLT5kZGIsIHBsYW5lKTsKLQogCWlmIChrZXktPmZsYWdzKSB7CiAJCUk5 MTVfV1JJVEUoUExBTkVfS0VZVkFMKHBpcGUsIHBsYW5lKSwga2V5LT5taW5fdmFsdWUpOwogCQlJ OTE1X1dSSVRFKFBMQU5FX0tFWU1BWChwaXBlLCBwbGFuZSksIGtleS0+bWF4X3ZhbHVlKTsKQEAg LTI5MSwxOSArMjgzLDkgQEAgc2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBs YW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRw bGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUo ZHBsYW5lKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0 Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CiAJY29uc3QgaW50IHBpcGUgPSBpbnRlbF9wbGFuZS0+cGlw ZTsKIAljb25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxOwogCi0JLyoKLQkg KiBXZSBvbmx5IHBvcHVsYXRlIHNrbF9yZXN1bHRzIG9uIHdhdGVybWFyayB1cGRhdGVzLCBhbmQg aWYgdGhlCi0JICogcGxhbmUncyB2aXNpYmxpdHkgaXNuJ3QgYWN0dWFsbHkgY2hhbmdpbmcgbmVp dGhlciBpcyBpdHMgd2F0ZXJtYXJrcy4KLQkgKi8KLQlpZiAoIWRwbGFuZS0+c3RhdGUtPnZpc2li bGUpCi0JCXNrbF93cml0ZV9wbGFuZV93bSh0b19pbnRlbF9jcnRjKGNydGMpLAotCQkJCSAgICZj c3RhdGUtPndtLnNrbC5vcHRpbWFsLnBsYW5lc1twbGFuZV0sCi0JCQkJICAgJmRldl9wcml2LT53 bS5za2xfcmVzdWx0cy5kZGIsIHBsYW5lKTsKLQogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUs IHBsYW5lKSwgMCk7CiAKIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUpLCAwKTsK LS0gCjIuNy40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==