From: Maarten Lankhorst Subject: [PATCH v2 (resend) 6/6] drm/i915: Rip out legacy watermark infrastructure, v2. Date: Fri, 17 Nov 2017 12:59:37 +0100 Message-ID: <20171117115937.25714-7-maarten.lankhorst@linux.intel.com> References: <20171117115937.25714-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A34DB6EA36 for ; Fri, 17 Nov 2017 11:59:45 +0000 (UTC) In-Reply-To: <20171117115937.25714-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 VGhlIGxlZ2FjeSB3YXRlcm1hcmsgaW5mcmFzdHJ1Y3R1cmUgaXMgbm93IHVudXNlZCwgc28gcmVt b3ZlIGl0LgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBSZWJhc2Ugb24gdG9wIG9mIGxlZ2FjeV9jdXJz b3JfdXBkYXRlIGZpeC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMg IHwgIDIgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNzQgKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgfCAgMiAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAg fCA0MiAtLS0tLS0tLS0tLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDExNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA5NWE5ODhi MDU4ZjQuLjlkYTNmYTdiN2NhYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC03MTAsNyAr NzEwLDYgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewogCXZvaWQgKCpvcHRpbWl6 ZV93YXRlcm1hcmtzKShzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCQkgICAg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSk7CiAJaW50ICgqY29tcHV0ZV9nbG9iYWxf d2F0ZXJtYXJrcykoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKLQl2b2lkICgqdXBk YXRlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiAJaW50ICgqbW9kZXNldF9jYWxjX2Nk Y2xrKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCS8qIFJldHVybnMgdGhlIGFj dGl2ZSBzdGF0ZSBvZiB0aGUgY3J0YywgYW5kIGlmIHRoZSBjcnRjIGlzIGFjdGl2ZSwKIAkgKiBm aWxscyBvdXQgdGhlIHBpcGUtY29uZmlnIHdpdGggdGhlIGh3IHN0YXRlLiAqLwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCAzNmQ0ZTYzNWU0Y2UuLmUyYjRjYTUxOGEwNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTE3Myw4ICsxNzMsNiBAQCBpbnRlbF9j cnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJY3J0Y19zdGF0ZS0+ dXBkYXRlX3BpcGUgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT5kaXNhYmxlX2xwX3dtID0gZmFsc2U7 CiAJY3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyID0gZmFsc2U7Ci0JY3J0Y19zdGF0ZS0+dXBkYXRl X3dtX3ByZSA9IGZhbHNlOwotCWNydGNfc3RhdGUtPnVwZGF0ZV93bV9wb3N0ID0gZmFsc2U7CiAJ Y3J0Y19zdGF0ZS0+ZmJfY2hhbmdlZCA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmZpZm9fY2hhbmdl ZCA9IGZhbHNlOwogCWNydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUgPSBmYWxzZTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzNjcxZDU4NjAwM2YuLjM3MTdh MDA2ZjkxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTAzNiw4ICs1 MDM2LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCiAJaW50ZWxfZnJvbnRidWZmZXJfZmxpcCh0 b19pOTE1KGNydGMtPmJhc2UuZGV2KSwgcGlwZV9jb25maWctPmZiX2JpdHMpOwogCi0JaWYgKHBp cGVfY29uZmlnLT51cGRhdGVfd21fcG9zdCAmJiBwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUpCi0J CWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwogCiAJaWYgKG9sZF9wcmlfc3RhdGUpIHsK IAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5X3N0YXRlID0KQEAgLTUxMzAsOCAr NTEyOCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5pbml0 aWFsX3dhdGVybWFya3MgIT0gTlVMTCkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRl cm1hcmtzKG9sZF9pbnRlbF9zdGF0ZSwKIAkJCQkJCSAgICAgcGlwZV9jb25maWcpOwotCWVsc2Ug aWYgKHBpcGVfY29uZmlnLT51cGRhdGVfd21fcHJlKQotCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJr cyhjcnRjKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsIHVuc2lnbmVkIHBsYW5lX21hc2spCkBAIC01ODE1LDggKzU4MTEs NiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZywKIAlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtz ICE9IE5VTEwpCiAJCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyhvbGRfaW50 ZWxfc3RhdGUsCiAJCQkJCQkgICAgIGludGVsX2NydGMtPmNvbmZpZyk7Ci0JZWxzZQotCQlpbnRl bF91cGRhdGVfd2F0ZXJtYXJrcyhpbnRlbF9jcnRjKTsKIAlpbnRlbF9lbmFibGVfcGlwZShpbnRl bF9jcnRjKTsKIAogCWFzc2VydF92YmxhbmtfZGlzYWJsZWQoY3J0Yyk7CkBAIC01ODgxLDkgKzU4 NzUsNiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJaWYgKCFJU19HRU4yKGRldl9wcml2KSkKIAkJaW50ZWxf c2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlwZSwgZmFsc2UpOwog Ci0JaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MpCi0JCWludGVsX3Vw ZGF0ZV93YXRlcm1hcmtzKGludGVsX2NydGMpOwotCiAJLyogY2xvY2sgdGhlIHBpcGUgZG93biB0 byA2NDB4NDgwQDYwIHRvIHBvdGVudGlhbGx5IHNhdmUgcG93ZXIgKi8KIAlpZiAoSVNfSTgzMChk ZXZfcHJpdikpCiAJCWk4MzBfZW5hYmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUpOwpAQCAtNTk0NCw3 ICs1OTM1LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAkJZW5jb2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKIAogCWludGVs X2ZiY19kaXNhYmxlKGludGVsX2NydGMpOwotCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGludGVs X2NydGMpOwogCWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CiAKIAlkb21h aW5zID0gaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zOwpAQCAtMTAyMTEsNDAgKzEw MjAxLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kZXN0cm95KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAlrZnJlZShpbnRlbF9jcnRjKTsKIH0KIAotLyoqCi0gKiBpbnRlbF93bV9uZWVkX3Vw ZGF0ZSAtIENoZWNrIHdoZXRoZXIgd2F0ZXJtYXJrcyBuZWVkIHVwZGF0aW5nCi0gKiBAcGxhbmU6 IGRybSBwbGFuZQotICogQHN0YXRlOiBuZXcgcGxhbmUgc3RhdGUKLSAqCi0gKiBDaGVjayBjdXJy ZW50IHBsYW5lIHN0YXRlIHZlcnN1cyB0aGUgbmV3IG9uZSB0byBkZXRlcm1pbmUgd2hldGhlcgot ICogd2F0ZXJtYXJrcyBuZWVkIHRvIGJlIHJlY2FsY3VsYXRlZC4KLSAqCi0gKiBSZXR1cm5zIHRy dWUgb3IgZmFsc2UuCi0gKi8KLXN0YXRpYyBib29sIGludGVsX3dtX25lZWRfdXBkYXRlKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJCSBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkK LXsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ldyA9IHRvX2ludGVsX3BsYW5lX3N0YXRl KHN0YXRlKTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1ciA9IHRvX2ludGVsX3BsYW5l X3N0YXRlKHBsYW5lLT5zdGF0ZSk7Ci0KLQkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcg b3Igc2l6ZSBjaGFuZ2VzLiAqLwotCWlmIChuZXctPmJhc2UudmlzaWJsZSAhPSBjdXItPmJhc2Uu dmlzaWJsZSkKLQkJcmV0dXJuIHRydWU7Ci0KLQlpZiAoIWN1ci0+YmFzZS5mYiB8fCAhbmV3LT5i YXNlLmZiKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAoY3VyLT5iYXNlLmZiLT5tb2RpZmllciAh PSBuZXctPmJhc2UuZmItPm1vZGlmaWVyIHx8Ci0JICAgIGN1ci0+YmFzZS5yb3RhdGlvbiAhPSBu ZXctPmJhc2Uucm90YXRpb24gfHwKLQkgICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+YmFzZS5zcmMp ICE9IGRybV9yZWN0X3dpZHRoKCZjdXItPmJhc2Uuc3JjKSB8fAotCSAgICBkcm1fcmVjdF9oZWln aHQoJm5ldy0+YmFzZS5zcmMpICE9IGRybV9yZWN0X2hlaWdodCgmY3VyLT5iYXNlLnNyYykgfHwK LQkgICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+YmFzZS5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZj dXItPmJhc2UuZHN0KSB8fAotCSAgICBkcm1fcmVjdF9oZWlnaHQoJm5ldy0+YmFzZS5kc3QpICE9 IGRybV9yZWN0X2hlaWdodCgmY3VyLT5iYXNlLmRzdCkpCi0JCXJldHVybiB0cnVlOwotCi0JcmV0 dXJuIGZhbHNlOwotfQotCiBzdGF0aWMgYm9vbCBuZWVkc19zY2FsaW5nKGNvbnN0IHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7CiAJaW50IHNyY193ID0gZHJtX3JlY3Rfd2lkdGgo JnN0YXRlLT5iYXNlLnNyYykgPj4gMTY7CkBAIC0xMDMyMSwyNyArMTAyNzcsOSBAQCBpbnQgaW50 ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqb2xkX2NydGNfc3RhdAogCQkJIHdhc192aXNpYmxlLCB2aXNpYmxlLAogCQkJIHR1cm5fb2Zm LCB0dXJuX29uLCBtb2RlX2NoYW5nZWQpOwogCi0JaWYgKHR1cm5fb24pIHsKLQkJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPCA1ICYmICFJU19HNFgoZGV2X3ByaXYpKQotCQkJcGlwZV9jb25maWct PnVwZGF0ZV93bV9wcmUgPSB0cnVlOwotCi0JCS8qIG11c3QgZGlzYWJsZSBjeHNyIGFyb3VuZCBw bGFuZSBlbmFibGUvZGlzYWJsZSAqLwotCQlpZiAocGxhbmUtPmlkICE9IFBMQU5FX0NVUlNPUikK LQkJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3IgPSB0cnVlOwotCX0gZWxzZSBpZiAodHVybl9v ZmYpIHsKLQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1ICYmICFJU19HNFgoZGV2X3ByaXYp KQotCQkJcGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKLQotCQkvKiBtdXN0IGRp c2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KLQkJaWYgKHBsYW5lLT5p ZCAhPSBQTEFORV9DVVJTT1IpCi0JCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsK LQl9IGVsc2UgaWYgKGludGVsX3dtX25lZWRfdXBkYXRlKCZwbGFuZS0+YmFzZSwgcGxhbmVfc3Rh dGUpKSB7Ci0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNSAmJiAhSVNfRzRYKGRldl9wcml2 KSkgewotCQkJLyogRklYTUUgYm9sbG9ja3MgKi8KLQkJCXBpcGVfY29uZmlnLT51cGRhdGVfd21f cHJlID0gdHJ1ZTsKLQkJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcG9zdCA9IHRydWU7Ci0JCX0K LQl9CisJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICov CisJaWYgKCh0dXJuX29uIHx8IHR1cm5fb2ZmKSAmJiBwbGFuZS0+aWQgIT0gUExBTkVfQ1VSU09S KQorCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKIAogCWlmICh2aXNpYmxlIHx8 IHdhc192aXNpYmxlKQogCQlwaXBlX2NvbmZpZy0+ZmJfYml0cyB8PSBwbGFuZS0+ZnJvbnRidWZm ZXJfYml0OwpAQCAtMTA0MDIsOSArMTAzNDAsNiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpbnQgcmV0OwogCWJvb2wgbW9kZV9j aGFuZ2VkID0gbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKTsKIAotCWlmIChtb2RlX2NoYW5nZWQg JiYgIWNydGNfc3RhdGUtPmFjdGl2ZSkKLQkJcGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ID0g dHJ1ZTsKLQogCWlmIChtb2RlX2NoYW5nZWQgJiYgY3J0Y19zdGF0ZS0+ZW5hYmxlICYmCiAJICAg IGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayAmJgogCSAgICAhV0FSTl9PTihw aXBlX2NvbmZpZy0+c2hhcmVkX2RwbGwpKSB7CkBAIC0xMjU0NCw4ICsxMjQ3OSw3IEBAIHN0YXRp YyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpbnQg aTsKIAogCQlmb3JfZWFjaF9uZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShpbnRlbF9zdGF0ZSwgY3J0 YywgbmV3X2NydGNfc3RhdGUsIGkpCi0JCQlpZiAobmV3X2NydGNfc3RhdGUtPndtLm5lZWRfcG9z dHZibF91cGRhdGUgfHwKLQkJCSAgICBuZXdfY3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3Bvc3QpCisJ CQlpZiAobmV3X2NydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUpCiAJCQkJc3RhdGUt PmxlZ2FjeV9jdXJzb3JfdXBkYXRlID0gZmFsc2U7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDFmNGMzNjIwMWUyNS4uYWNlMDNkMjM1OGY3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtNjM3LDcgKzYzNyw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAl1 bnNpZ25lZCBmYl9iaXRzOyAvKiBmcmFtZWJ1ZmZlcnMgdG8gZmxpcCAqLwogCWJvb2wgdXBkYXRl X3BpcGU7IC8qIGNhbiBhIGZhc3QgbW9kZXNldCBiZSBwZXJmb3JtZWQ/ICovCiAJYm9vbCBkaXNh YmxlX2N4c3I7Ci0JYm9vbCB1cGRhdGVfd21fcHJlLCB1cGRhdGVfd21fcG9zdDsgLyogd2F0ZXJt YXJrcyBhcmUgdXBkYXRlZCAqLwogCWJvb2wgZmJfY2hhbmdlZDsgLyogZmIgb24gYW55IG9mIHRo ZSBwbGFuZXMgaXMgY2hhbmdlZCAqLwogCWJvb2wgZmlmb19jaGFuZ2VkOyAvKiBGSUZPIHNwbGl0 IGlzIGNoYW5nZWQgKi8KIApAQCAtMTg4Myw3ICsxODgyLDYgQEAgYm9vbCBjaHZfcGh5X3Bvd2Vy Z2F0ZV9jaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gZHBpb19waHkg cGh5LAogdm9pZCBpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9zdXNwZW5kX2h3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiBpbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19nYXRpbmdfaG9va3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfcG1fc2V0dXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IGFlOGJhZDEwMTQ1Yy4uM2NhNzAzZDE4ZmZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKQEAgLTUzMDksOCArNTMwOSw2IEBAIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAkJaWYgKChyZXN1bHRzLT5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21h c2soY3J0YykpID09IDApCiAJCQkvKiBUaGlzIHBpcGUncyBXTSdzIGRpZCBub3QgY2hhbmdlICov CiAJCQljb250aW51ZTsKLQotCQlpbnRlbF9jc3RhdGUtPnVwZGF0ZV93bV9wcmUgPSB0cnVlOwog CX0KIAogCXNrbF9wcmludF93bV9jaGFuZ2VzKHN0YXRlKTsKQEAgLTYwMTQsNDYgKzYwMTIsNiBA QCB2b2lkIGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJIShJ OTE1X1JFQUQoRElTUF9BUkJfQ1RMKSAmIERJU1BfRkJDX1dNX0RJUyk7CiB9CiAKLS8qKgotICog aW50ZWxfdXBkYXRlX3dhdGVybWFya3MgLSB1cGRhdGUgRklGTyB3YXRlcm1hcmsgdmFsdWVzIGJh c2VkIG9uIGN1cnJlbnQgbW9kZXMKLSAqCi0gKiBDYWxjdWxhdGUgd2F0ZXJtYXJrIHZhbHVlcyBm b3IgdGhlIHZhcmlvdXMgV00gcmVncyBiYXNlZCBvbiBjdXJyZW50IG1vZGUKLSAqIGFuZCBwbGFu ZSBjb25maWd1cmF0aW9uLgotICoKLSAqIFRoZXJlIGFyZSBzZXZlcmFsIGNhc2VzIHRvIGRlYWwg d2l0aCBoZXJlOgotICogICAtIG5vcm1hbCAoaS5lLiBub24tc2VsZi1yZWZyZXNoKQotICogICAt IHNlbGYtcmVmcmVzaCAoU1IpIG1vZGUKLSAqICAgLSBsaW5lcyBhcmUgbGFyZ2UgcmVsYXRpdmUg dG8gRklGTyBzaXplIChidWZmZXIgY2FuIGhvbGQgdXAgdG8gMikKLSAqICAgLSBsaW5lcyBhcmUg c21hbGwgcmVsYXRpdmUgdG8gRklGTyBzaXplIChidWZmZXIgY2FuIGhvbGQgbW9yZSB0aGFuIDIK LSAqICAgICBsaW5lcyksIHNvIG5lZWQgdG8gYWNjb3VudCBmb3IgVExCIGxhdGVuY3kKLSAqCi0g KiAgIFRoZSBub3JtYWwgY2FsY3VsYXRpb24gaXM6Ci0gKiAgICAgd2F0ZXJtYXJrID0gZG90Y2xv Y2sgKiBieXRlcyBwZXIgcGl4ZWwgKiBsYXRlbmN5Ci0gKiAgIHdoZXJlIGxhdGVuY3kgaXMgcGxh dGZvcm0gJiBjb25maWd1cmF0aW9uIGRlcGVuZGVudCAod2UgYXNzdW1lIHBlc3NpbWFsCi0gKiAg IHZhbHVlcyBoZXJlKS4KLSAqCi0gKiAgIFRoZSBTUiBjYWxjdWxhdGlvbiBpczoKLSAqICAgICB3 YXRlcm1hcmsgPSAodHJ1bmMobGF0ZW5jeS9saW5lIHRpbWUpKzEpICogc3VyZmFjZSB3aWR0aCAq Ci0gKiAgICAgICBieXRlcyBwZXIgcGl4ZWwKLSAqICAgd2hlcmUKLSAqICAgICBsaW5lIHRpbWUg PSBodG90YWwgLyBkb3RjbG9jawotICogICAgIHN1cmZhY2Ugd2lkdGggPSBoZGlzcGxheSBmb3Ig bm9ybWFsIHBsYW5lIGFuZCA2NCBmb3IgY3Vyc29yCi0gKiAgIGFuZCBsYXRlbmN5IGlzIGFzc3Vt ZWQgdG8gYmUgaGlnaCwgYXMgYWJvdmUuCi0gKgotICogVGhlIGZpbmFsIHZhbHVlIHByb2dyYW1t ZWQgdG8gdGhlIHJlZ2lzdGVyIHNob3VsZCBhbHdheXMgYmUgcm91bmRlZCB1cCwKLSAqIGFuZCBp bmNsdWRlIGFuIGV4dHJhIDIgZW50cmllcyB0byBhY2NvdW50IGZvciBjbG9jayBjcm9zc2luZ3Mu Ci0gKgotICogV2UgZG9uJ3QgdXNlIHRoZSBzcHJpdGUsIHNvIHdlIGNhbiBpZ25vcmUgdGhhdC4g IEFuZCBvbiBDcmVzdGxpbmUgd2UgaGF2ZQotICogdG8gc2V0IHRoZSBub24tU1Igd2F0ZXJtYXJr cyB0byA4LgotICovCi12b2lkIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoY3J0Yy0+YmFzZS5kZXYpOwotCi0JaWYgKGRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSkK LQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtKGNydGMpOwotfQotCiB2b2lkIGludGVsX2Vu YWJsZV9pcGMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXUzMiB2YWw7 Ci0tIAoyLjE1LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=