From: Maarten Lankhorst Subject: [RFC 7/7] drm/i915: Rip out legacy watermark infrastructure Date: Thu, 4 May 2017 13:41:33 +0200 Message-ID: <20170504114133.4843-8-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 2F7236E458 for ; Thu, 4 May 2017 11:41:50 +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 VGhlIGxlZ2FjeSB3YXRlcm1hcmsgaW5mcmFzdHJ1Y3R1cmUgaXMgbm93IHVudXNlZCwgc28gcmVt b3ZlIGl0LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAgMiAt CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA3NSArKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o ICAgICB8ICAyIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDQyIC0t LS0tLS0tLS0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMTE5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDdhZjRmOTA4YjJjZC4u NDZiMzE3Yzk5MWYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTYzNyw3ICs2MzcsNiBA QCBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJdm9pZCAoKm9wdGltaXplX3dhdGVy bWFya3MpKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJCSAgICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKTsKIAlpbnQgKCpjb21wdXRlX2dsb2JhbF93YXRlcm1h cmtzKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwotCXZvaWQgKCp1cGRhdGVfd20p KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIAlpbnQgKCptb2Rlc2V0X2NhbGNfY2RjbGspKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAJLyogUmV0dXJucyB0aGUgYWN0aXZlIHN0 YXRlIG9mIHRoZSBjcnRjLCBhbmQgaWYgdGhlIGNydGMgaXMgYWN0aXZlLAogCSAqIGZpbGxzIG91 dCB0aGUgcGlwZS1jb25maWcgd2l0aCB0aGUgaHcgc3RhdGUuICovCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pYy5jCmluZGV4IDg3YjFkZDQ2NGVlZS4uN2E0YWNhYTQ1ZWRkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMTczLDggKzE3Myw2IEBAIGludGVsX2NydGNfZHVw bGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAljcnRjX3N0YXRlLT51cGRhdGVf cGlwZSA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmRpc2FibGVfbHBfd20gPSBmYWxzZTsKIAljcnRj X3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBmYWxzZTsKLQljcnRjX3N0YXRlLT51cGRhdGVfd21fcHJl ID0gZmFsc2U7Ci0JY3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3Bvc3QgPSBmYWxzZTsKIAljcnRjX3N0 YXRlLT5mYl9jaGFuZ2VkID0gZmFsc2U7CiAJY3J0Y19zdGF0ZS0+Zmlmb19jaGFuZ2VkID0gZmFs c2U7CiAJY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IGZhbHNlOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDg1MzhjMDI0NjAxNS4uMjk1ZTE3ZDBmMjcy IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00OTU4LDkgKzQ5NTgsNiBA QCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAKIAlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKHRvX2k5MTUo Y3J0Yy0+YmFzZS5kZXYpLCBwaXBlX2NvbmZpZy0+ZmJfYml0cyk7CiAKLQlpZiAocGlwZV9jb25m aWctPnVwZGF0ZV93bV9wb3N0ICYmIHBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZSkKLQkJaW50ZWxf dXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0KIAlpZiAob2xkX3ByaV9zdGF0ZSkgewogCQlzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaW1hcnlfc3RhdGUgPQogCQkJdG9faW50ZWxfcGxhbmVf c3RhdGUocHJpbWFyeS0+c3RhdGUpOwpAQCAtNTA1MCw4ICs1MDQ3LDYgQEAgc3RhdGljIHZvaWQg aW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNf c3RhdGUsCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyAhPSBOVUxM KQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3Mob2xkX2ludGVsX3N0YXRl LAogCQkJCQkJICAgICBwaXBlX2NvbmZpZyk7Ci0JZWxzZSBpZiAocGlwZV9jb25maWctPnVwZGF0 ZV93bV9wcmUpCi0JCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwogfQogCiBzdGF0aWMg dm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdW5z aWduZWQgcGxhbmVfbWFzaykKQEAgLTU3MzcsOCArNTczMiw2IEBAIHN0YXRpYyB2b2lkIGk5eHhf Y3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCWlmIChk ZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MgIT0gTlVMTCkKIAkJZGV2X3ByaXYt PmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9sZF9pbnRlbF9zdGF0ZSwKIAkJCQkJCSAgICAg aW50ZWxfY3J0Yy0+Y29uZmlnKTsKLQllbHNlCi0JCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGlu dGVsX2NydGMpOwogCWludGVsX2VuYWJsZV9waXBlKGludGVsX2NydGMpOwogCiAJYXNzZXJ0X3Zi bGFua19kaXNhYmxlZChjcnRjKTsKQEAgLTU4MDIsOSArNTc5NSw2IEBAIHN0YXRpYyB2b2lkIGk5 eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwK IAogCWlmICghSVNfR0VOMihkZXZfcHJpdikpCiAJCWludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1 bl9yZXBvcnRpbmcoZGV2X3ByaXYsIHBpcGUsIGZhbHNlKTsKLQotCWlmICghZGV2X3ByaXYtPmRp c3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKQotCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhpbnRl bF9jcnRjKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKQEAgLTU4NjMsNyArNTg1Myw2IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWVuY29k ZXItPmJhc2UuY3J0YyA9IE5VTEw7CiAKIAlpbnRlbF9mYmNfZGlzYWJsZShpbnRlbF9jcnRjKTsK LQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhpbnRlbF9jcnRjKTsKIAlpbnRlbF9kaXNhYmxlX3No YXJlZF9kcGxsKGludGVsX2NydGMpOwogCiAJZG9tYWlucyA9IGludGVsX2NydGMtPmVuYWJsZWRf cG93ZXJfZG9tYWluczsKQEAgLTEwNzM4LDQwICsxMDcyNyw2IEBAIHN0YXRpYyBpbnQgaW50ZWxf Y3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogfQogCiAKLS8qKgotICogaW50 ZWxfd21fbmVlZF91cGRhdGUgLSBDaGVjayB3aGV0aGVyIHdhdGVybWFya3MgbmVlZCB1cGRhdGlu ZwotICogQHBsYW5lOiBkcm0gcGxhbmUKLSAqIEBzdGF0ZTogbmV3IHBsYW5lIHN0YXRlCi0gKgot ICogQ2hlY2sgY3VycmVudCBwbGFuZSBzdGF0ZSB2ZXJzdXMgdGhlIG5ldyBvbmUgdG8gZGV0ZXJt aW5lIHdoZXRoZXIKLSAqIHdhdGVybWFya3MgbmVlZCB0byBiZSByZWNhbGN1bGF0ZWQuCi0gKgot ICogUmV0dXJucyB0cnVlIG9yIGZhbHNlLgotICovCi1zdGF0aWMgYm9vbCBpbnRlbF93bV9uZWVk X3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkgc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqc3RhdGUpCi17Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpuZXcgPSB0b19pbnRl bF9wbGFuZV9zdGF0ZShzdGF0ZSk7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXIgPSB0 b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOwotCi0JLyogVXBkYXRlIHdhdGVybWFy a3Mgb24gdGlsaW5nIG9yIHNpemUgY2hhbmdlcy4gKi8KLQlpZiAobmV3LT5iYXNlLnZpc2libGUg IT0gY3VyLT5iYXNlLnZpc2libGUpCi0JCXJldHVybiB0cnVlOwotCi0JaWYgKCFjdXItPmJhc2Uu ZmIgfHwgIW5ldy0+YmFzZS5mYikKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYgKGN1ci0+YmFzZS5m Yi0+bW9kaWZpZXIgIT0gbmV3LT5iYXNlLmZiLT5tb2RpZmllciB8fAotCSAgICBjdXItPmJhc2Uu cm90YXRpb24gIT0gbmV3LT5iYXNlLnJvdGF0aW9uIHx8Ci0JICAgIGRybV9yZWN0X3dpZHRoKCZu ZXctPmJhc2Uuc3JjKSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5iYXNlLnNyYykgfHwKLQkgICAg ZHJtX3JlY3RfaGVpZ2h0KCZuZXctPmJhc2Uuc3JjKSAhPSBkcm1fcmVjdF9oZWlnaHQoJmN1ci0+ YmFzZS5zcmMpIHx8Ci0JICAgIGRybV9yZWN0X3dpZHRoKCZuZXctPmJhc2UuZHN0KSAhPSBkcm1f cmVjdF93aWR0aCgmY3VyLT5iYXNlLmRzdCkgfHwKLQkgICAgZHJtX3JlY3RfaGVpZ2h0KCZuZXct PmJhc2UuZHN0KSAhPSBkcm1fcmVjdF9oZWlnaHQoJmN1ci0+YmFzZS5kc3QpKQotCQlyZXR1cm4g dHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQogc3RhdGljIGJvb2wgbmVlZHNfc2NhbGluZyhz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewogCWludCBzcmNfdyA9IGRybV9yZWN0 X3dpZHRoKCZzdGF0ZS0+YmFzZS5zcmMpID4+IDE2OwpAQCAtMTA4NDgsMjcgKzEwODAzLDkgQEAg aW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLAogCQkJIHdhc192aXNpYmxlLCB2aXNpYmxlLAogCQkJIHR1cm5fb2ZmLCB0 dXJuX29uLCBtb2RlX2NoYW5nZWQpOwogCi0JaWYgKHR1cm5fb24pIHsKLQkJaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPCA1ICYmICFJU19HNFgoZGV2X3ByaXYpKQotCQkJcGlwZV9jb25maWctPnVw ZGF0ZV93bV9wcmUgPSB0cnVlOwotCi0JCS8qIG11c3QgZGlzYWJsZSBjeHNyIGFyb3VuZCBwbGFu ZSBlbmFibGUvZGlzYWJsZSAqLwotCQlpZiAocGxhbmUtPmlkICE9IFBMQU5FX0NVUlNPUikKLQkJ CXBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3IgPSB0cnVlOwotCX0gZWxzZSBpZiAodHVybl9vZmYp IHsKLQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1ICYmICFJU19HNFgoZGV2X3ByaXYpKQot CQkJcGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKLQotCQkvKiBtdXN0IGRpc2Fi bGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KLQkJaWYgKHBsYW5lLT5pZCAh PSBQTEFORV9DVVJTT1IpCi0JCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKLQl9 IGVsc2UgaWYgKGludGVsX3dtX25lZWRfdXBkYXRlKCZwbGFuZS0+YmFzZSwgcGxhbmVfc3RhdGUp KSB7Ci0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNSAmJiAhSVNfRzRYKGRldl9wcml2KSkg ewotCQkJLyogRklYTUUgYm9sbG9ja3MgKi8KLQkJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcHJl ID0gdHJ1ZTsKLQkJCXBpcGVfY29uZmlnLT51cGRhdGVfd21fcG9zdCA9IHRydWU7Ci0JCX0KLQl9 CisJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICovCisJ aWYgKCh0dXJuX29uIHx8IHR1cm5fb2ZmKSAmJiBwbGFuZS0+aWQgIT0gUExBTkVfQ1VSU09SKQor CQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKIAogCWlmICh2aXNpYmxlIHx8IHdh c192aXNpYmxlKQogCQlwaXBlX2NvbmZpZy0+ZmJfYml0cyB8PSBwbGFuZS0+ZnJvbnRidWZmZXJf Yml0OwpAQCAtMTA5MjksOSArMTA4NjYsNiBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfYXRvbWlj X2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpbnQgcmV0OwogCWJvb2wgbW9kZV9jaGFu Z2VkID0gbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKTsKIAotCWlmIChtb2RlX2NoYW5nZWQgJiYg IWNydGNfc3RhdGUtPmFjdGl2ZSkKLQkJcGlwZV9jb25maWctPnVwZGF0ZV93bV9wb3N0ID0gdHJ1 ZTsKLQogCWlmIChtb2RlX2NoYW5nZWQgJiYgY3J0Y19zdGF0ZS0+ZW5hYmxlICYmCiAJICAgIGRl dl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayAmJgogCSAgICAhV0FSTl9PTihwaXBl X2NvbmZpZy0+c2hhcmVkX2RwbGwpKSB7CkBAIC0xMjYyNSw5ICsxMjU1OSw2IEBAIHN0YXRpYyBi b29sIG5lZWRzX3ZibGFua193YWl0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KQogCQlyZXR1cm4gdHJ1ZTsKIAogCS8qIHdtIGNoYW5nZXMsIG5lZWQgdmJsYW5rIGJlZm9yZSBm aW5hbCB3bSdzICovCi0JaWYgKGNydGNfc3RhdGUtPnVwZGF0ZV93bV9wb3N0KQotCQlyZXR1cm4g dHJ1ZTsKLQogCWlmIChjcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlKQogCQlyZXR1 cm4gdHJ1ZTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkYmUzM2I3YmNmNjcuLjA5 NGEwNDdhNDBiYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTYzMSw3ICs2MzEsNiBA QCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJdW5zaWduZWQgZmJfYml0czsgLyogZnJhbWVi dWZmZXJzIHRvIGZsaXAgKi8KIAlib29sIHVwZGF0ZV9waXBlOyAvKiBjYW4gYSBmYXN0IG1vZGVz ZXQgYmUgcGVyZm9ybWVkPyAqLwogCWJvb2wgZGlzYWJsZV9jeHNyOwotCWJvb2wgdXBkYXRlX3dt X3ByZSwgdXBkYXRlX3dtX3Bvc3Q7IC8qIHdhdGVybWFya3MgYXJlIHVwZGF0ZWQgKi8KIAlib29s IGZiX2NoYW5nZWQ7IC8qIGZiIG9uIGFueSBvZiB0aGUgcGxhbmVzIGlzIGNoYW5nZWQgKi8KIAli b29sIGZpZm9fY2hhbmdlZDsgLyogRklGTyBzcGxpdCBpcyBjaGFuZ2VkICovCiAKQEAgLTE4NjAs NyArMTg1OSw2IEBAIGJvb2wgY2h2X3BoeV9wb3dlcmdhdGVfY2goc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIGRwaW9fcGh5IHBoeSwKIHZvaWQgaW50ZWxfaW5pdF9jbG9j a19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxf c3VzcGVuZF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogaW50IGlsa193 bV9tYXhfbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLXZv aWQgaW50ZWxfdXBkYXRlX3dhdGVybWFya3Moc3RydWN0IGludGVsX2NydGMgKmNydGMpOwogdm9p ZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lk IGludGVsX2luaXRfY2xvY2tfZ2F0aW5nX2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGludGVsX3BtX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBiZjIxMjdhM2Y3MzAuLjgwZDRi MDdmMDYzNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC01MDcxLDggKzUwNzEsNiBAQCBz a2xfY29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCWlmICgocmVz dWx0cy0+ZGlydHlfcGlwZXMgJiBkcm1fY3J0Y19tYXNrKGNydGMpKSA9PSAwKQogCQkJLyogVGhp cyBwaXBlJ3MgV00ncyBkaWQgbm90IGNoYW5nZSAqLwogCQkJY29udGludWU7Ci0KLQkJaW50ZWxf Y3N0YXRlLT51cGRhdGVfd21fcHJlID0gdHJ1ZTsKIAl9CiAKIAlza2xfcHJpbnRfd21fY2hhbmdl cyhzdGF0ZSk7CkBAIC01NzU4LDQ2ICs1NzU2LDYgQEAgdm9pZCBpbGtfd21fZ2V0X2h3X3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSEoSTkxNV9SRUFEKERJU1BfQVJCX0NUTCkgJiBE SVNQX0ZCQ19XTV9ESVMpOwogfQogCi0vKioKLSAqIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzIC0g dXBkYXRlIEZJRk8gd2F0ZXJtYXJrIHZhbHVlcyBiYXNlZCBvbiBjdXJyZW50IG1vZGVzCi0gKgot ICogQ2FsY3VsYXRlIHdhdGVybWFyayB2YWx1ZXMgZm9yIHRoZSB2YXJpb3VzIFdNIHJlZ3MgYmFz ZWQgb24gY3VycmVudCBtb2RlCi0gKiBhbmQgcGxhbmUgY29uZmlndXJhdGlvbi4KLSAqCi0gKiBU aGVyZSBhcmUgc2V2ZXJhbCBjYXNlcyB0byBkZWFsIHdpdGggaGVyZToKLSAqICAgLSBub3JtYWwg KGkuZS4gbm9uLXNlbGYtcmVmcmVzaCkKLSAqICAgLSBzZWxmLXJlZnJlc2ggKFNSKSBtb2RlCi0g KiAgIC0gbGluZXMgYXJlIGxhcmdlIHJlbGF0aXZlIHRvIEZJRk8gc2l6ZSAoYnVmZmVyIGNhbiBo b2xkIHVwIHRvIDIpCi0gKiAgIC0gbGluZXMgYXJlIHNtYWxsIHJlbGF0aXZlIHRvIEZJRk8gc2l6 ZSAoYnVmZmVyIGNhbiBob2xkIG1vcmUgdGhhbiAyCi0gKiAgICAgbGluZXMpLCBzbyBuZWVkIHRv IGFjY291bnQgZm9yIFRMQiBsYXRlbmN5Ci0gKgotICogICBUaGUgbm9ybWFsIGNhbGN1bGF0aW9u IGlzOgotICogICAgIHdhdGVybWFyayA9IGRvdGNsb2NrICogYnl0ZXMgcGVyIHBpeGVsICogbGF0 ZW5jeQotICogICB3aGVyZSBsYXRlbmN5IGlzIHBsYXRmb3JtICYgY29uZmlndXJhdGlvbiBkZXBl bmRlbnQgKHdlIGFzc3VtZSBwZXNzaW1hbAotICogICB2YWx1ZXMgaGVyZSkuCi0gKgotICogICBU aGUgU1IgY2FsY3VsYXRpb24gaXM6Ci0gKiAgICAgd2F0ZXJtYXJrID0gKHRydW5jKGxhdGVuY3kv bGluZSB0aW1lKSsxKSAqIHN1cmZhY2Ugd2lkdGggKgotICogICAgICAgYnl0ZXMgcGVyIHBpeGVs Ci0gKiAgIHdoZXJlCi0gKiAgICAgbGluZSB0aW1lID0gaHRvdGFsIC8gZG90Y2xvY2sKLSAqICAg ICBzdXJmYWNlIHdpZHRoID0gaGRpc3BsYXkgZm9yIG5vcm1hbCBwbGFuZSBhbmQgNjQgZm9yIGN1 cnNvcgotICogICBhbmQgbGF0ZW5jeSBpcyBhc3N1bWVkIHRvIGJlIGhpZ2gsIGFzIGFib3ZlLgot ICoKLSAqIFRoZSBmaW5hbCB2YWx1ZSBwcm9ncmFtbWVkIHRvIHRoZSByZWdpc3RlciBzaG91bGQg YWx3YXlzIGJlIHJvdW5kZWQgdXAsCi0gKiBhbmQgaW5jbHVkZSBhbiBleHRyYSAyIGVudHJpZXMg dG8gYWNjb3VudCBmb3IgY2xvY2sgY3Jvc3NpbmdzLgotICoKLSAqIFdlIGRvbid0IHVzZSB0aGUg c3ByaXRlLCBzbyB3ZSBjYW4gaWdub3JlIHRoYXQuICBBbmQgb24gQ3Jlc3RsaW5lIHdlIGhhdmUK LSAqIHRvIHNldCB0aGUgbm9uLVNSIHdhdGVybWFya3MgdG8gOC4KLSAqLwotdm9pZCBpbnRlbF91 cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKLQotCWlm IChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20pCi0JCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0 ZV93bShjcnRjKTsKLX0KLQogLyoKICAqIExvY2sgcHJvdGVjdGluZyBJUFMgcmVsYXRlZCBkYXRh IHN0cnVjdHVyZXMKICAqLwotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=