From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 4/5] drm: Check crtc_state->enable rather than crtc->enabled in drm_plane_helper_check_state() Date: Wed, 1 Nov 2017 20:29:19 +0200 Message-ID: <20171101182920.14386-5-ville.syrjala@linux.intel.com> References: <20171101182920.14386-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171101182920.14386-1-ville.syrjala@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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmRy bV9wbGFuZV9oZWxwZXJfY2hlY2tfc3RhdGUoKSBpcyBzdXBwb3NlZCB0byBkbyB0aGluZ3MgdGhl IGF0b21pYyB3YXksCnNvIGl0IHNob3VsZCBub3QgYmUgaW5zcGVjdGluZyBjcnRjLT5lbmFibGVk LiBSYXRoZXIgd2Ugc2hvdWxkIGJlCmxvb2tpbmcgYXQgY3J0Y19zdGF0ZS0+ZW5hYmxlLgoKV2Ug aGF2ZSBhIHNsaWdodCBjb21wbGljYXRpb24gZHVlIHRvIGRybV9wbGFuZV9oZWxwZXJfY2hlY2tf dXBkYXRlKCkKcmV1c2luZyBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKCkgZm9yIG5vbi1h dG9taWMgZHJpdmVycy4gVGh1cwp3ZSdsbCBoYXZlIHRvIHBhc3MgdGhlIGNydGNfc3RhdGUgaW4g bWFuYWxseSBhbmQgY29uc3RydWN0IGEgZmFrZQpjcnRjX3N0YXRlIGluIGRybV9wbGFuZV9oZWxw ZXJfY2hlY2tfdXBkYXRlKCkuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hcm0vaGRsY2Rf Y3J0Yy5jICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2FybS9tYWxpZHBfcGxh bmVzLmMgICAgICAgICB8ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5j ICAgICAgICAgIHwgNTIgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaW14 L2lwdXYzLXBsYW5lLmMgICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZHJtX3BsYW5lLmMgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29u X3BsYW5lLmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21k cDVfcGxhbmUuYyAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3Bs YXkuYyAgICAgIHwgIDYgKystLQogZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2Ry bV92b3AuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYyAgICAgICAgICAgICAg ICAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYyAgICAgICAg IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS96dGUvenhfcGxhbmUuYyAgICAgICAgICAgICAgfCAg NCArLS0KIGluY2x1ZGUvZHJtL2RybV9wbGFuZV9oZWxwZXIuaCAgICAgICAgICAgICAgfCAgMyAr LQogMTUgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FybS9oZGxjZF9jcnRjLmMgYi9kcml2ZXJzL2dw dS9kcm0vYXJtL2hkbGNkX2NydGMuYwppbmRleCA3MmIyMmI4MDU0MTIuLjE0NzIxNzIzZmE4YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FybS9oZGxjZF9jcnRjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FybS9oZGxjZF9jcnRjLmMKQEAgLTI1Miw3ICsyNTIsNyBAQCBzdGF0aWMgaW50 IGhkbGNkX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAljbGlw LngyID0gY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZS5oZGlzcGxheTsKIAljbGlwLnkyID0gY3J0 Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZS52ZGlzcGxheTsKIAotCXJldHVybiBkcm1fcGxhbmVfaGVs cGVyX2NoZWNrX3N0YXRlKHN0YXRlLCAmY2xpcCwKKwlyZXR1cm4gZHJtX3BsYW5lX2hlbHBlcl9j aGVja19zdGF0ZShzdGF0ZSwgY3J0Y19zdGF0ZSwgJmNsaXAsCiAJCQkJCSAgICBEUk1fUExBTkVf SEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcs CiAJCQkJCSAgICBmYWxzZSwgdHJ1ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXJt L21hbGlkcF9wbGFuZXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hcm0vbWFsaWRwX3BsYW5lcy5jCmlu ZGV4IDk0ZTdlM2ZhMzQwOC4uNDkyZDk5ZGQ1NWQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYXJtL21hbGlkcF9wbGFuZXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYXJtL21hbGlkcF9w bGFuZXMuYwpAQCAtMTUwLDcgKzE1MCw4IEBAIHN0YXRpYyBpbnQgbWFsaWRwX3NlX2NoZWNrX3Nj YWxpbmcoc3RydWN0IG1hbGlkcF9wbGFuZSAqbXAsCiAKIAljbGlwLngyID0gY3J0Y19zdGF0ZS0+ YWRqdXN0ZWRfbW9kZS5oZGlzcGxheTsKIAljbGlwLnkyID0gY3J0Y19zdGF0ZS0+YWRqdXN0ZWRf bW9kZS52ZGlzcGxheTsKLQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKHN0YXRl LCAmY2xpcCwgMCwgSU5UX01BWCwgdHJ1ZSwgdHJ1ZSk7CisJcmV0ID0gZHJtX3BsYW5lX2hlbHBl cl9jaGVja19zdGF0ZShzdGF0ZSwgY3J0Y19zdGF0ZSwgJmNsaXAsCisJCQkJCSAgIDAsIElOVF9N QVgsIHRydWUsIHRydWUpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X3BsYW5lX2hlbHBlci5jCmluZGV4IDc1OWVkOTNmNGJhOC4uYWRiOGQ5NDQ4NGYyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fcGxhbmVfaGVscGVyLmMKQEAgLTEwMSw3ICsxMDEsOCBAQCBzdGF0aWMgaW50IGdl dF9jb25uZWN0b3JzX2Zvcl9jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogLyoqCiAgKiBk cm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKCkgLSBDaGVjayBwbGFuZSBzdGF0ZSBmb3IgdmFs aWRpdHkKLSAqIEBzdGF0ZTogcGxhbmUgc3RhdGUgdG8gY2hlY2sKKyAqIEBwbGFuZV9zdGF0ZTog cGxhbmUgc3RhdGUgdG8gY2hlY2sKKyAqIEBjcnRjX3N0YXRlOiBjcnRjIHN0YXRlIHRvIGNoZWNr CiAgKiBAY2xpcDogaW50ZWdlciBjbGlwcGluZyBjb29yZGluYXRlcwogICogQG1pbl9zY2FsZTog bWluaW11bSBAc3JjOkBkZXN0IHNjYWxpbmcgZmFjdG9yIGluIDE2LjE2IGZpeGVkIHBvaW50CiAg KiBAbWF4X3NjYWxlOiBtYXhpbXVtIEBzcmM6QGRlc3Qgc2NhbGluZyBmYWN0b3IgaW4gMTYuMTYg Zml4ZWQgcG9pbnQKQEAgLTEyMCwzNSArMTIxLDM4IEBAIHN0YXRpYyBpbnQgZ2V0X2Nvbm5lY3Rv cnNfZm9yX2NydGMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogICogUkVUVVJOUzoKICAqIFplcm8g aWYgdXBkYXRlIGFwcGVhcnMgdmFsaWQsIGVycm9yIGNvZGUgb24gZmFpbHVyZQogICovCi1pbnQg ZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0 ZSwKK2ludCBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlLAorCQkJCSBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsCiAJCQkJIGNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCwKIAkJCQkgaW50IG1pbl9z Y2FsZSwKIAkJCQkgaW50IG1heF9zY2FsZSwKIAkJCQkgYm9vbCBjYW5fcG9zaXRpb24sCiAJCQkJ IGJvb2wgY2FuX3VwZGF0ZV9kaXNhYmxlZCkKIHsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBz dGF0ZS0+Y3J0YzsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5mYjsKLQlz dHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3JjOwotCXN0cnVjdCBkcm1fcmVjdCAqZHN0 ID0gJnN0YXRlLT5kc3Q7Ci0JdW5zaWduZWQgaW50IHJvdGF0aW9uID0gc3RhdGUtPnJvdGF0aW9u OworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOworCXN0cnVj dCBkcm1fcmVjdCAqc3JjID0gJnBsYW5lX3N0YXRlLT5zcmM7CisJc3RydWN0IGRybV9yZWN0ICpk c3QgPSAmcGxhbmVfc3RhdGUtPmRzdDsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb24gPSBwbGFuZV9z dGF0ZS0+cm90YXRpb247CiAJaW50IGhzY2FsZSwgdnNjYWxlOwogCi0JKnNyYyA9IGRybV9wbGFu ZV9zdGF0ZV9zcmMoc3RhdGUpOwotCSpkc3QgPSBkcm1fcGxhbmVfc3RhdGVfZGVzdChzdGF0ZSk7 CisJV0FSTl9PTighY3J0Y19zdGF0ZSAhPSAhcGxhbmVfc3RhdGUtPmNydGMpOworCVdBUk5fT04o Y3J0Y19zdGF0ZSAmJiBjcnRjX3N0YXRlLT5jcnRjICE9IHBsYW5lX3N0YXRlLT5jcnRjKTsKKwor CSpzcmMgPSBkcm1fcGxhbmVfc3RhdGVfc3JjKHBsYW5lX3N0YXRlKTsKKwkqZHN0ID0gZHJtX3Bs YW5lX3N0YXRlX2Rlc3QocGxhbmVfc3RhdGUpOwogCiAJaWYgKCFmYikgewotCQlzdGF0ZS0+dmlz aWJsZSA9IGZhbHNlOworCQlwbGFuZV9zdGF0ZS0+dmlzaWJsZSA9IGZhbHNlOwogCQlyZXR1cm4g MDsKIAl9CiAKIAkvKiBjcnRjIHNob3VsZCBvbmx5IGJlIE5VTEwgd2hlbiBkaXNhYmxpbmcgKGku ZS4sICFmYikgKi8KLQlpZiAoV0FSTl9PTighY3J0YykpIHsKLQkJc3RhdGUtPnZpc2libGUgPSBm YWxzZTsKKwlpZiAoV0FSTl9PTighcGxhbmVfc3RhdGUtPmNydGMpKSB7CisJCXBsYW5lX3N0YXRl LT52aXNpYmxlID0gZmFsc2U7CiAJCXJldHVybiAwOwogCX0KIAotCWlmICghY3J0Yy0+ZW5hYmxl ZCAmJiAhY2FuX3VwZGF0ZV9kaXNhYmxlZCkgeworCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlICYm ICFjYW5fdXBkYXRlX2Rpc2FibGVkKSB7CiAJCURSTV9ERUJVR19LTVMoIkNhbm5vdCB1cGRhdGUg cGxhbmUgb2YgYSBkaXNhYmxlZCBDUlRDLlxuIik7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KQEAg LTE2MCwxNiArMTY0LDE2IEBAIGludCBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKHN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlLAogCXZzY2FsZSA9IGRybV9yZWN0X2NhbGNfdnNjYWxl KHNyYywgZHN0LCBtaW5fc2NhbGUsIG1heF9zY2FsZSk7CiAJaWYgKGhzY2FsZSA8IDAgfHwgdnNj YWxlIDwgMCkgewogCQlEUk1fREVCVUdfS01TKCJJbnZhbGlkIHNjYWxpbmcgb2YgcGxhbmVcbiIp OwotCQlkcm1fcmVjdF9kZWJ1Z19wcmludCgic3JjOiAiLCAmc3RhdGUtPnNyYywgdHJ1ZSk7Ci0J CWRybV9yZWN0X2RlYnVnX3ByaW50KCJkc3Q6ICIsICZzdGF0ZS0+ZHN0LCBmYWxzZSk7CisJCWRy bV9yZWN0X2RlYnVnX3ByaW50KCJzcmM6ICIsICZwbGFuZV9zdGF0ZS0+c3JjLCB0cnVlKTsKKwkJ ZHJtX3JlY3RfZGVidWdfcHJpbnQoImRzdDogIiwgJnBsYW5lX3N0YXRlLT5kc3QsIGZhbHNlKTsK IAkJcmV0dXJuIC1FUkFOR0U7CiAJfQogCi0Jc3RhdGUtPnZpc2libGUgPSBkcm1fcmVjdF9jbGlw X3NjYWxlZChzcmMsIGRzdCwgY2xpcCwgaHNjYWxlLCB2c2NhbGUpOworCXBsYW5lX3N0YXRlLT52 aXNpYmxlID0gZHJtX3JlY3RfY2xpcF9zY2FsZWQoc3JjLCBkc3QsIGNsaXAsIGhzY2FsZSwgdnNj YWxlKTsKIAogCWRybV9yZWN0X3JvdGF0ZV9pbnYoc3JjLCBmYi0+d2lkdGggPDwgMTYsIGZiLT5o ZWlnaHQgPDwgMTYsIHJvdGF0aW9uKTsKIAotCWlmICghc3RhdGUtPnZpc2libGUpCisJaWYgKCFw bGFuZV9zdGF0ZS0+dmlzaWJsZSkKIAkJLyoKIAkJICogUGxhbmUgaXNuJ3QgdmlzaWJsZTsgc29t ZSBkcml2ZXJzIGNhbiBoYW5kbGUgdGhpcwogCQkgKiBzbyB3ZSBqdXN0IHJldHVybiBzdWNjZXNz IGhlcmUuICBEcml2ZXJzIHRoYXQgY2FuJ3QKQEAgLTIzMCw3ICsyMzQsNyBAQCBpbnQgZHJtX3Bs YW5lX2hlbHBlcl9jaGVja191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJICBi b29sIGNhbl91cGRhdGVfZGlzYWJsZWQsCiAJCQkJICBib29sICp2aXNpYmxlKQogewotCXN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgc3RhdGUgPSB7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBwbGFu ZV9zdGF0ZSA9IHsKIAkJLnBsYW5lID0gcGxhbmUsCiAJCS5jcnRjID0gY3J0YywKIAkJLmZiID0g ZmIsCkBAIC0yNDUsMTggKzI0OSwyMiBAQCBpbnQgZHJtX3BsYW5lX2hlbHBlcl9jaGVja191cGRh dGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCS5yb3RhdGlvbiA9IHJvdGF0aW9uLAogCQku dmlzaWJsZSA9ICp2aXNpYmxlLAogCX07CisJc3RydWN0IGRybV9jcnRjX3N0YXRlIGNydGNfc3Rh dGUgPSB7CisJCS5jcnRjID0gY3J0YywKKwkJLmVuYWJsZSA9IGNydGMtPmVuYWJsZWQsCisJfTsK IAlpbnQgcmV0OwogCi0JcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgmc3RhdGUs IGNsaXAsCisJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgmcGxhbmVfc3RhdGUs ICZjcnRjX3N0YXRlLCBjbGlwLAogCQkJCQkgICBtaW5fc2NhbGUsIG1heF9zY2FsZSwKIAkJCQkJ ICAgY2FuX3Bvc2l0aW9uLAogCQkJCQkgICBjYW5fdXBkYXRlX2Rpc2FibGVkKTsKIAlpZiAocmV0 KQogCQlyZXR1cm4gcmV0OwogCi0JKnNyYyA9IHN0YXRlLnNyYzsKLQkqZHN0ID0gc3RhdGUuZHN0 OwotCSp2aXNpYmxlID0gc3RhdGUudmlzaWJsZTsKKwkqc3JjID0gcGxhbmVfc3RhdGUuc3JjOwor CSpkc3QgPSBwbGFuZV9zdGF0ZS5kc3Q7CisJKnZpc2libGUgPSBwbGFuZV9zdGF0ZS52aXNpYmxl OwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBs ZV9rbXNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMK aW5kZXggZGM5ZmQxMDlkZTE0Li5kNDI4YzgwNTAyNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3Np bXBsZV9rbXNfaGVscGVyLmMKQEAgLTEwMyw3ICsxMDMsNyBAQCBzdGF0aWMgaW50IGRybV9zaW1w bGVfa21zX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAljbGlw LngyID0gY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZS5oZGlzcGxheTsKIAljbGlwLnkyID0gY3J0 Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZS52ZGlzcGxheTsKIAotCXJldCA9IGRybV9wbGFuZV9oZWxw ZXJfY2hlY2tfc3RhdGUocGxhbmVfc3RhdGUsICZjbGlwLAorCXJldCA9IGRybV9wbGFuZV9oZWxw ZXJfY2hlY2tfc3RhdGUocGxhbmVfc3RhdGUsIGNydGNfc3RhdGUsICZjbGlwLAogCQkJCQkgICBE Uk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJCSAgIERSTV9QTEFORV9IRUxQRVJfTk9f U0NBTElORywKIAkJCQkJICAgZmFsc2UsIHRydWUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDczN2RlMjUxZDBmOC4uNGE0NTk3MjZiMzZiIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05MzE3LDYgKzkzMTcsNyBAQCBzdGF0aWMgaW50IGludGVs X2NoZWNrX2N1cnNvcihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlpbnQg cmV0OwogCiAJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgmcGxhbmVfc3RhdGUt PmJhc2UsCisJCQkJCSAgICZjcnRjX3N0YXRlLT5iYXNlLAogCQkJCQkgICAmcGxhbmVfc3RhdGUt PmNsaXAsCiAJCQkJCSAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKIAkJCQkJICAgRFJN X1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLApAQCAtMTI4MDgsNiArMTI4MDksNyBAQCBpbnRlbF9j aGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJfQogCiAJcmV0 ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgmc3RhdGUtPmJhc2UsCisJCQkJCSAgICZj cnRjX3N0YXRlLT5iYXNlLAogCQkJCQkgICAmc3RhdGUtPmNsaXAsCiAJCQkJCSAgIG1pbl9zY2Fs ZSwgbWF4X3NjYWxlLAogCQkJCQkgICBjYW5fcG9zaXRpb24sIHRydWUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2lteC9pcHV2My1wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2lteC9p cHV2My1wbGFuZS5jCmluZGV4IDI0N2M2MGU2YmVkMi4uNTFiMjNhYzE3NWUzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaW14L2lwdXYzLXBsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2lteC9pcHV2My1wbGFuZS5jCkBAIC0zNDIsNyArMzQyLDcgQEAgc3RhdGljIGludCBpcHVfcGxh bmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWNsaXAueTEgPSAwOwog CWNsaXAueDIgPSBjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLmhkaXNwbGF5OwogCWNsaXAueTIg PSBjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLnZkaXNwbGF5OwotCXJldCA9IGRybV9wbGFuZV9o ZWxwZXJfY2hlY2tfc3RhdGUoc3RhdGUsICZjbGlwLAorCXJldCA9IGRybV9wbGFuZV9oZWxwZXJf Y2hlY2tfc3RhdGUoc3RhdGUsIGNydGNfc3RhdGUsICZjbGlwLAogCQkJCQkgICBEUk1fUExBTkVf SEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJCSAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywK IAkJCQkJICAgY2FuX3Bvc2l0aW9uLCB0cnVlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9wbGFuZS5jCmluZGV4IDZmMTIxODkxNDMwZi4uN2ViYjMzNjU3NzA0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9wbGFuZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX3BsYW5lLmMKQEAgLTExMSw3ICsxMTEsNyBAQCBzdGF0 aWMgaW50IG10a19wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ Y2xpcC54MiA9IGNydGNfc3RhdGUtPm1vZGUuaGRpc3BsYXk7CiAJY2xpcC55MiA9IGNydGNfc3Rh dGUtPm1vZGUudmRpc3BsYXk7CiAKLQlyZXR1cm4gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0 ZShzdGF0ZSwgJmNsaXAsCisJcmV0dXJuIGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfc3RhdGUoc3Rh dGUsIGNydGNfc3RhdGUsICZjbGlwLAogCQkJCQkgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FM SU5HLAogCQkJCQkgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLAogCQkJCQkgICAgdHJ1 ZSwgdHJ1ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fcGxhbmUu YyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9wbGFuZS5jCmluZGV4IDE3ZTk2ZmE0Nzg2 OC4uMmEwMGI3MjBjMzcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25f cGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fcGxhbmUuYwpAQCAtNjEs NyArNjEsNyBAQCBzdGF0aWMgaW50IG1lc29uX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAljbGlwLngyID0gY3J0Y19zdGF0ZS0+bW9kZS5oZGlzcGxheTsKIAlj bGlwLnkyID0gY3J0Y19zdGF0ZS0+bW9kZS52ZGlzcGxheTsKIAotCXJldHVybiBkcm1fcGxhbmVf aGVscGVyX2NoZWNrX3N0YXRlKHN0YXRlLCAmY2xpcCwKKwlyZXR1cm4gZHJtX3BsYW5lX2hlbHBl cl9jaGVja19zdGF0ZShzdGF0ZSwgY3J0Y19zdGF0ZSwgJmNsaXAsCiAJCQkJCSAgICBEUk1fUExB TkVfSEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJ TkcsCiAJCQkJCSAgICB0cnVlLCB0cnVlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9t c20vbWRwL21kcDUvbWRwNV9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9t ZHA1X3BsYW5lLmMKaW5kZXggNGIyMmFjMzQxM2ExLi4xYzE5NGE5NDUzZDkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9wbGFuZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9wbGFuZS5jCkBAIC0zNDgsOCArMzQ4LDggQEAgc3Rh dGljIGludCBtZHA1X3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKHN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAltaW5fc2NhbGUgPSBGUkFDXzE2XzE2KDEsIDgpOwogCW1h eF9zY2FsZSA9IEZSQUNfMTZfMTYoOCwgMSk7CiAKLQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2No ZWNrX3N0YXRlKHN0YXRlLCAmY2xpcCwgbWluX3NjYWxlLAotCQkJCQkgICBtYXhfc2NhbGUsIHRy dWUsIHRydWUpOworCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfc3RhdGUoc3RhdGUsIGNy dGNfc3RhdGUsICZjbGlwLAorCQkJCQkgICBtaW5fc2NhbGUsIG1heF9zY2FsZSwgdHJ1ZSwgdHJ1 ZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUw X2Rpc3BsYXkuYwppbmRleCBlNDc1MWY5MmIzNDIuLjdmMTFhODhkMDU5MyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMKQEAgLTExNDMsNyArMTE0Myw4IEBAIG52NTBfY3Vy c19hY3F1aXJlKHN0cnVjdCBudjUwX3duZHcgKnduZHcsIHN0cnVjdCBudjUwX3duZHdfYXRvbSAq YXN5dywKIHsKIAlpbnQgcmV0OwogCi0JcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0 ZSgmYXN5dy0+c3RhdGUsICZhc3l3LT5jbGlwLAorCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hl Y2tfc3RhdGUoJmFzeXctPnN0YXRlLCAmYXN5aC0+c3RhdGUsCisJCQkJCSAgICZhc3l3LT5jbGlw LAogCQkJCQkgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJCSAgIERSTV9QTEFO RV9IRUxQRVJfTk9fU0NBTElORywKIAkJCQkJICAgdHJ1ZSwgdHJ1ZSk7CkBAIC0xNDMyLDcgKzE0 MzMsOCBAQCBudjUwX2Jhc2VfYWNxdWlyZShzdHJ1Y3QgbnY1MF93bmR3ICp3bmR3LCBzdHJ1Y3Qg bnY1MF93bmR3X2F0b20gKmFzeXcsCiAJaWYgKCFmYi0+Zm9ybWF0LT5kZXB0aCkKIAkJcmV0dXJu IC1FSU5WQUw7CiAKLQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3N0YXRlKCZhc3l3LT5z dGF0ZSwgJmFzeXctPmNsaXAsCisJcmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZSgm YXN5dy0+c3RhdGUsICZhc3loLT5zdGF0ZSwKKwkJCQkJICAgJmFzeXctPmNsaXAsCiAJCQkJCSAg IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKIAkJCQkJICAgRFJNX1BMQU5FX0hFTFBFUl9O T19TQ0FMSU5HLAogCQkJCQkgICBmYWxzZSwgdHJ1ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL3JvY2tjaGlwX2RybV92b3AuYwppbmRleCAxOTEyOGI0ZGVhNTQuLjM2ZDBmMTAxZTMwZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCkBAIC02NTks NyArNjU5LDcgQEAgc3RhdGljIGludCB2b3BfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAogCWNsaXAueDIgPSBjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLmhkaXNw bGF5OwogCWNsaXAueTIgPSBjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLnZkaXNwbGF5OwogCi0J cmV0ID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZShzdGF0ZSwgJmNsaXAsCisJcmV0ID0g ZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZShzdGF0ZSwgY3J0Y19zdGF0ZSwgJmNsaXAsCiAJ CQkJCSAgIG1pbl9zY2FsZSwgbWF4X3NjYWxlLAogCQkJCQkgICB0cnVlLCB0cnVlKTsKIAlpZiAo cmV0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMgYi9kcml2ZXJzL2dw dS9kcm0vdGVncmEvZGMuYwppbmRleCAyNGE1ZWY0ZjViYjguLmU5NWQ5ZTJhN2Y2YyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Rl Z3JhL2RjLmMKQEAgLTQ5MSw4ICs0OTEsOCBAQCBzdGF0aWMgaW50IHRlZ3JhX3BsYW5lX3N0YXRl X2FkZChzdHJ1Y3QgdGVncmFfcGxhbmUgKnBsYW5lLAogCWNsaXAueTIgPSBjcnRjX3N0YXRlLT5t b2RlLnZkaXNwbGF5OwogCiAJLyogQ2hlY2sgcGxhbmUgc3RhdGUgZm9yIHZpc2liaWxpdHkgYW5k IGNhbGN1bGF0ZSBjbGlwcGluZyBib3VuZHMgKi8KLQllcnIgPSBkcm1fcGxhbmVfaGVscGVyX2No ZWNrX3N0YXRlKHN0YXRlLCAmY2xpcCwgMCwgSU5UX01BWCwKLQkJCQkJICAgdHJ1ZSwgdHJ1ZSk7 CisJZXJyID0gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZShzdGF0ZSwgY3J0Y19zdGF0ZSwg JmNsaXAsCisJCQkJCSAgIDAsIElOVF9NQVgsIHRydWUsIHRydWUpOwogCWlmIChlcnIgPCAwKQog CQlyZXR1cm4gZXJyOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dm eF9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ttcy5jCmluZGV4IGVmYTQx YzA4NjE5OC4uZDk1ZTdiMWMzYjExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9rbXMuYwpA QCAtNDU0LDcgKzQ1NCw3IEBAIGludCB2bXdfZHVfcHJpbWFyeV9wbGFuZV9hdG9taWNfY2hlY2so c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCWNsaXAueTIgPSBjcnRjX3N0YXRlLT5hZGp1c3Rl ZF9tb2RlLnZkaXNwbGF5OwogCX0KIAotCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfc3Rh dGUoc3RhdGUsICZjbGlwLAorCXJldCA9IGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfc3RhdGUoc3Rh dGUsIGNydGNfc3RhdGUsICZjbGlwLAogCQkJCQkgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJ TkcsCiAJCQkJCSAgIERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORywKIAkJCQkJICAgZmFsc2Us IHRydWUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3p0ZS96eF9wbGFuZS5jIGIvZHJp dmVycy9ncHUvZHJtL3p0ZS96eF9wbGFuZS5jCmluZGV4IDE4ZTc2MzQ5MzI2NC4uZWUwMDAyNTI5 YjhmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0venRlL3p4X3BsYW5lLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3p0ZS96eF9wbGFuZS5jCkBAIC04MCw3ICs4MCw3IEBAIHN0YXRpYyBpbnQg enhfdmxfcGxhbmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWNsaXAu eDIgPSBjcnRjX3N0YXRlLT5hZGp1c3RlZF9tb2RlLmhkaXNwbGF5OwogCWNsaXAueTIgPSBjcnRj X3N0YXRlLT5hZGp1c3RlZF9tb2RlLnZkaXNwbGF5OwogCi0JcmV0dXJuIGRybV9wbGFuZV9oZWxw ZXJfY2hlY2tfc3RhdGUocGxhbmVfc3RhdGUsICZjbGlwLAorCXJldHVybiBkcm1fcGxhbmVfaGVs cGVyX2NoZWNrX3N0YXRlKHBsYW5lX3N0YXRlLCBjcnRjX3N0YXRlLCAmY2xpcCwKIAkJCQkJICAg IG1pbl9zY2FsZSwgbWF4X3NjYWxlLAogCQkJCQkgICAgdHJ1ZSwgdHJ1ZSk7CiB9CkBAIC0zMTUs NyArMzE1LDcgQEAgc3RhdGljIGludCB6eF9nbF9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJY2xpcC54MiA9IGNydGNfc3RhdGUtPmFkanVzdGVkX21vZGUuaGRp c3BsYXk7CiAJY2xpcC55MiA9IGNydGNfc3RhdGUtPmFkanVzdGVkX21vZGUudmRpc3BsYXk7CiAK LQlyZXR1cm4gZHJtX3BsYW5lX2hlbHBlcl9jaGVja19zdGF0ZShwbGFuZV9zdGF0ZSwgJmNsaXAs CisJcmV0dXJuIGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfc3RhdGUocGxhbmVfc3RhdGUsIGNydGNf c3RhdGUsICZjbGlwLAogCQkJCQkgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLAogCQkJ CQkgICAgRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HLAogCQkJCQkgICAgZmFsc2UsIHRydWUp OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX3BsYW5lX2hlbHBlci5oIGIvaW5jbHVkZS9k cm0vZHJtX3BsYW5lX2hlbHBlci5oCmluZGV4IDdjOGEwMGNlYWRiNy4uNDFiODMwOWIwYTU3IDEw MDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fcGxhbmVfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9k cm0vZHJtX3BsYW5lX2hlbHBlci5oCkBAIC0zOCw3ICszOCw4IEBACiAgKi8KICNkZWZpbmUgRFJN X1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HICgxPDwxNikKIAotaW50IGRybV9wbGFuZV9oZWxwZXJf Y2hlY2tfc3RhdGUoc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUsCitpbnQgZHJtX3BsYW5l X2hlbHBlcl9jaGVja19zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwK KwkJCQkgY29uc3Qgc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCSBjb25z dCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXAsCiAJCQkJIGludCBtaW5fc2NhbGUsIGludCBtYXhfc2Nh bGUsCiAJCQkJIGJvb2wgY2FuX3Bvc2l0aW9uLAotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK