From: Ville Syrjala Subject: [PATCH v2] drm/i915: Promote .format_mod_supported() to the lead role Date: Fri, 18 May 2018 19:21:59 +0300 Message-ID: <20180518162159.30305-1-ville.syrjala@linux.intel.com> References: <20180319165017.31908-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 937B16EE1B for ; Fri, 18 May 2018 16:22:02 +0000 (UTC) In-Reply-To: <20180319165017.31908-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVw IHRvIG5vdyB3ZSd2ZSB1c2VkIHRoZSBwbGFuZSdzIG1vZGlmaWVyIGxpc3QgYXMgdGhlIHByaW1h cnkKc291cmNlIG9mIGluZm9ybWF0aW9uIGZvciB3aGljaCBtb2RpZmllcnMgYXJlIHN1cHBvcnRl ZCBieSBhCmdpdmVuIHBsYW5lLiBJbiBvcmRlciB0byBhbGxvdyBhdXhpbGlhcnkgbWV0YWRhdGEg dG8gYmUgZW1iZWRkZWQKd2l0aGluIHRoZSBiaXRzIG9mIHRoZSBtb2RpZmllciB3ZSBuZWVkIHRv IHN0b3AgZG9pbmcgdGhhdC4KClRodXMgd2UgaGF2ZSB0byBtYWtlIC5mb3JtYXRfbW9kX3N1cHBv cnRlZCgpIGF3YXJlIG9mIHRoZSBwbGFuZSdzCmNhcGFiaWxpdGllcyBhbmQgZ3JhY2VmdWxseSBk ZWFsIHdpdGggYW55IG1vZGlmaWVyIGJlaW5nIHBhc3NlZAppbiBkaXJlY3RseSBmcm9tIHVzZXJz cGFjZS4KCnYyOiBSZWJhc2UgYWZ0ZXIgTlYxMgogICAgU2ltcGxpZnkKCkNjOiBFcmljIEFuaG9s dCA8ZXJpY0BhbmhvbHQubmV0PgpSZWZlcmVuY2VzOiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9hcmNoaXZlcy9kcmktZGV2ZWwvMjAxOC1NYXJjaC8xNjk3ODIuaHRtbApTaWduZWQtb2Zm LWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDExNiArKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAg IDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMTQxICsrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE4NiBpbnNlcnRp b25zKCspLCA3MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggYzllYzg4YWNhZDljLi5mNWMwNzhjOWQwZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTEzMTM5LDggKzEzMTM5LDE3IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGVz dHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlrZnJlZSh0b19pbnRlbF9wbGFuZShwbGFu ZSkpOwogfQogCi1zdGF0aWMgYm9vbCBpOHh4X21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0 LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29sIGk4eHhfcGxhbmVfZm9ybWF0X21vZF9z dXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAorCQkJCQkgICAgdTMyIGZvcm1hdCwg dTY0IG1vZGlmaWVyKQogeworCXN3aXRjaCAobW9kaWZpZXIpIHsKKwljYXNlIERSTV9GT1JNQVRf TU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgorCQlicmVhazsKKwlk ZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorCiAJc3dpdGNoIChmb3JtYXQpIHsKIAljYXNl IERSTV9GT1JNQVRfQzg6CiAJY2FzZSBEUk1fRk9STUFUX1JHQjU2NToKQEAgLTEzMTUzLDggKzEz MTYyLDE3IEBAIHN0YXRpYyBib29sIGk4eHhfbW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQs IHVpbnQ2NF90IG1vZGlmaWVyKQogCX0KIH0KIAotc3RhdGljIGJvb2wgaTk2NV9tb2Rfc3VwcG9y dGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIpCitzdGF0aWMgYm9vbCBpOTY1 X3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwKKwkJ CQkJICAgIHUzMiBmb3JtYXQsIHU2NCBtb2RpZmllcikKIHsKKwlzd2l0Y2ggKG1vZGlmaWVyKSB7 CisJY2FzZSBEUk1fRk9STUFUX01PRF9MSU5FQVI6CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWF9U SUxFRDoKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJcmV0dXJuIGZhbHNlOworCX0KKwogCXN3aXRj aCAoZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFUX0M4OgogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1 NjU6CkBAIC0xMzE2OSw4ICsxMzE4NywyNiBAQCBzdGF0aWMgYm9vbCBpOTY1X21vZF9zdXBwb3J0 ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKIAl9CiB9CiAKLXN0YXRpYyBi b29sIHNrbF9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9kaWZpZXIp CitzdGF0aWMgYm9vbCBza2xfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9w bGFuZSAqX3BsYW5lLAorCQkJCQkgICB1MzIgZm9ybWF0LCB1NjQgbW9kaWZpZXIpCiB7CisJc3Ry dWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKF9wbGFuZSk7CisKKwlzd2l0 Y2ggKG1vZGlmaWVyKSB7CisJY2FzZSBEUk1fRk9STUFUX01PRF9MSU5FQVI6CisJY2FzZSBJOTE1 X0ZPUk1BVF9NT0RfWF9USUxFRDoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEOgorCWNh c2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOgorCQlicmVhazsKKwljYXNlIEk5MTVfRk9STUFU X01PRF9ZX1RJTEVEX0NDUzoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1M6CisJ CWlmICghcGxhbmUtPmhhc19jY3MpCisJCQlyZXR1cm4gZmFsc2U7CisJCWJyZWFrOworCWRlZmF1 bHQ6CisJCXJldHVybiBmYWxzZTsKKwl9CisKIAlzd2l0Y2ggKGZvcm1hdCkgewogCWNhc2UgRFJN X0ZPUk1BVF9YUkdCODg4ODoKIAljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CkBAIC0xMzIwMiwz OCArMTMyMzgsMzYgQEAgc3RhdGljIGJvb2wgc2tsX21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9y bWF0LCB1aW50NjRfdCBtb2RpZmllcikKIAl9CiB9CiAKLXN0YXRpYyBib29sIGludGVsX3ByaW1h cnlfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0J CQkJCQkgICAgIHVpbnQzMl90IGZvcm1hdCwKLQkJCQkJCSAgICAgdWludDY0X3QgbW9kaWZpZXIp CitzdGF0aWMgYm9vbCBpbnRlbF9jdXJzb3JfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRy bV9wbGFuZSAqX3BsYW5lLAorCQkJCQkgICAgICB1MzIgZm9ybWF0LCB1NjQgbW9kaWZpZXIpCiB7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+ZGV2 KTsKLQotCWlmIChXQVJOX09OKG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0lOVkFMSUQpKQot CQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAoKG1vZGlmaWVyID4+IDU2KSAhPSBEUk1fRk9STUFUX01P RF9WRU5ET1JfSU5URUwgJiYKLQkgICAgbW9kaWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTElORUFS KQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQotCQly ZXR1cm4gc2tsX21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7Ci0JZWxzZSBpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA0KQotCQlyZXR1cm4gaTk2NV9tb2Rfc3VwcG9ydGVkKGZvcm1h dCwgbW9kaWZpZXIpOwotCWVsc2UKLQkJcmV0dXJuIGk4eHhfbW9kX3N1cHBvcnRlZChmb3JtYXQs IG1vZGlmaWVyKTsKKwlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSICYm CisJCWZvcm1hdCA9PSBEUk1fRk9STUFUX0FSR0I4ODg4OwogfQogCi1zdGF0aWMgYm9vbCBpbnRl bF9jdXJzb3JfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCi0JCQkJCQkgICAgdWludDMyX3QgZm9ybWF0LAotCQkJCQkJICAgIHVpbnQ2NF90IG1vZGlm aWVyKQotewotCWlmIChXQVJOX09OKG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0lOVkFMSUQp KQotCQlyZXR1cm4gZmFsc2U7CitzdGF0aWMgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBza2xfcGxh bmVfZnVuY3MgPSB7CisJLnVwZGF0ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9w bGFuZSwKKwkuZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUs CisJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAorCS5hdG9taWNfZ2V0X3Byb3BlcnR5 ID0gaW50ZWxfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKKwkuYXRvbWljX3NldF9wcm9wZXJ0 eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHksCisJLmF0b21pY19kdXBsaWNhdGVf c3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21pY19kZXN0cm95X3N0 YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKKwkuZm9ybWF0X21vZF9zdXBwb3J0ZWQg PSBza2xfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCit9OwogCi0JcmV0dXJuIG1vZGlmaWVy ID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUiAmJiBmb3JtYXQgPT0gRFJNX0ZPUk1BVF9BUkdCODg4 ODsKLX0KK3N0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGk5NjVfcGxhbmVfZnVuY3MgPSB7 CisJLnVwZGF0ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKKwkuZGlz YWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCisJLmRlc3Ryb3kg PSBpbnRlbF9wbGFuZV9kZXN0cm95LAorCS5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxh bmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKKwkuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGludGVsX3Bs YW5lX2F0b21pY19zZXRfcHJvcGVydHksCisJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRl bF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxf cGxhbmVfZGVzdHJveV9zdGF0ZSwKKwkuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBpOTY1X3BsYW5l X2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAorfTsKIAotc3RhdGljIHN0cnVjdCBkcm1fcGxhbmVfZnVu Y3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CitzdGF0aWMgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBp OHh4X3BsYW5lX2Z1bmNzID0gewogCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91 cGRhdGVfcGxhbmUsCiAJLmRpc2FibGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxl X3BsYW5lLAogCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKQEAgLTEzMjQxLDcgKzEz Mjc1LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3Mg PSB7CiAJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3Bl cnR5LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0 YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUs Ci0JLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gaW50ZWxfcHJpbWFyeV9wbGFuZV9mb3JtYXRfbW9k X3N1cHBvcnRlZCwKKwkuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBpOHh4X3BsYW5lX2Zvcm1hdF9t b2Rfc3VwcG9ydGVkLAogfTsKIAogc3RhdGljIGludApAQCAtMTMzNjYsNyArMTM0MDAsNyBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9jdXJzb3JfcGxhbmVfZnVu Y3MgPSB7CiAJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3By b3BlcnR5LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRl X3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3Rh dGUsCi0JLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gaW50ZWxfY3Vyc29yX3BsYW5lX2Zvcm1hdF9t b2Rfc3VwcG9ydGVkLAorCS5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9IGludGVsX2N1cnNvcl9mb3Jt YXRfbW9kX3N1cHBvcnRlZCwKIH07CiAKIHN0YXRpYyBib29sIGk5eHhfcGxhbmVfaGFzX2ZiYyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xMzQyNCw2ICsxMzQ1OCw3IEBA IGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgZW51bSBwaXBlIHBpcGUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpwcmltYXJ5ID0g TlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwljb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzICpwbGFuZV9mdW5jczsKIAljb25zdCB1aW50MzJfdCAqaW50 ZWxfcHJpbWFyeV9mb3JtYXRzOwogCXVuc2lnbmVkIGludCBzdXBwb3J0ZWRfcm90YXRpb25zOwog CXVuc2lnbmVkIGludCBudW1fZm9ybWF0czsKQEAgLTEzNDc5LDYgKzEzNTE0LDkgQEAgaW50ZWxf cHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBl bnVtIHBpcGUgcGlwZSkKIAlwcmltYXJ5LT5jaGVja19wbGFuZSA9IGludGVsX2NoZWNrX3ByaW1h cnlfcGxhbmU7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CisJCXByaW1hcnkt Pmhhc19jY3MgPSBza2xfcGxhbmVfaGFzX2NjcyhkZXZfcHJpdiwgcGlwZSwKKwkJCQkJCSAgICAg UExBTkVfUFJJTUFSWSk7CisKIAkJaWYgKHNrbF9wbGFuZV9oYXNfcGxhbmFyKGRldl9wcml2LCBw aXBlLCBQTEFORV9QUklNQVJZKSkgewogCQkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gc2tsX3By aV9wbGFuYXJfZm9ybWF0czsKIAkJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcHJpX3Bs YW5hcl9mb3JtYXRzKTsKQEAgLTEzNDg3LDcgKzEzNTI1LDcgQEAgaW50ZWxfcHJpbWFyeV9wbGFu ZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlw ZSkKIAkJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcHJpbWFyeV9mb3JtYXRzKTsKIAkJ fQogCi0JCWlmIChza2xfcGxhbmVfaGFzX2NjcyhkZXZfcHJpdiwgcGlwZSwgUExBTkVfUFJJTUFS WSkpCisJCWlmIChwcmltYXJ5LT5oYXNfY2NzKQogCQkJbW9kaWZpZXJzID0gc2tsX2Zvcm1hdF9t b2RpZmllcnNfY2NzOwogCQllbHNlCiAJCQltb2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVy c19ub2NjczsKQEAgLTEzNDk1LDYgKzEzNTMzLDggQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVh dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAkJ cHJpbWFyeS0+dXBkYXRlX3BsYW5lID0gc2tsX3VwZGF0ZV9wbGFuZTsKIAkJcHJpbWFyeS0+ZGlz YWJsZV9wbGFuZSA9IHNrbF9kaXNhYmxlX3BsYW5lOwogCQlwcmltYXJ5LT5nZXRfaHdfc3RhdGUg PSBza2xfcGxhbmVfZ2V0X2h3X3N0YXRlOworCisJCXBsYW5lX2Z1bmNzID0gJnNrbF9wbGFuZV9m dW5jczsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgewogCQlpbnRlbF9w cmltYXJ5X2Zvcm1hdHMgPSBpOTY1X3ByaW1hcnlfZm9ybWF0czsKIAkJbnVtX2Zvcm1hdHMgPSBB UlJBWV9TSVpFKGk5NjVfcHJpbWFyeV9mb3JtYXRzKTsKQEAgLTEzNTAzLDYgKzEzNTQzLDggQEAg aW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBlbnVtIHBpcGUgcGlwZSkKIAkJcHJpbWFyeS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRh dGVfcGxhbmU7CiAJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcGxhbmU7 CiAJCXByaW1hcnktPmdldF9od19zdGF0ZSA9IGk5eHhfcGxhbmVfZ2V0X2h3X3N0YXRlOworCisJ CXBsYW5lX2Z1bmNzID0gJmk5NjVfcGxhbmVfZnVuY3M7CiAJfSBlbHNlIHsKIAkJaW50ZWxfcHJp bWFyeV9mb3JtYXRzID0gaTh4eF9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0gQVJS QVlfU0laRShpOHh4X3ByaW1hcnlfZm9ybWF0cyk7CkBAIC0xMzUxMSwyNSArMTM1NTMsMjcgQEAg aW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBlbnVtIHBpcGUgcGlwZSkKIAkJcHJpbWFyeS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRh dGVfcGxhbmU7CiAJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcGxhbmU7 CiAJCXByaW1hcnktPmdldF9od19zdGF0ZSA9IGk5eHhfcGxhbmVfZ2V0X2h3X3N0YXRlOworCisJ CXBsYW5lX2Z1bmNzID0gJmk4eHhfcGxhbmVfZnVuY3M7CiAJfQogCiAJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJp di0+ZHJtLCAmcHJpbWFyeS0+YmFzZSwKLQkJCQkJICAgICAgIDAsICZpbnRlbF9wbGFuZV9mdW5j cywKKwkJCQkJICAgICAgIDAsIHBsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJpbWFy eV9mb3JtYXRzLCBudW1fZm9ybWF0cywKIAkJCQkJICAgICAgIG1vZGlmaWVycywKIAkJCQkJICAg ICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlksCiAJCQkJCSAgICAgICAicGxhbmUgMSVjIiwgcGlw ZV9uYW1lKHBpcGUpKTsKIAllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNf RzRYKGRldl9wcml2KSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJp di0+ZHJtLCAmcHJpbWFyeS0+YmFzZSwKLQkJCQkJICAgICAgIDAsICZpbnRlbF9wbGFuZV9mdW5j cywKKwkJCQkJICAgICAgIDAsIHBsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJpbWFy eV9mb3JtYXRzLCBudW1fZm9ybWF0cywKIAkJCQkJICAgICAgIG1vZGlmaWVycywKIAkJCQkJICAg ICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlksCiAJCQkJCSAgICAgICAicHJpbWFyeSAlYyIsIHBp cGVfbmFtZShwaXBlKSk7CiAJZWxzZQogCQlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQo JmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5iYXNlLAotCQkJCQkgICAgICAgMCwgJmludGVsX3Bs YW5lX2Z1bmNzLAorCQkJCQkgICAgICAgMCwgcGxhbmVfZnVuY3MsCiAJCQkJCSAgICAgICBpbnRl bF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAogCQkJCQkgICAgICAgbW9kaWZpZXJzLAog CQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKaW5kZXggMjJhZjI0OTM5M2E0Li40MmE1OWI3ZmQ3MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCkBAIC05NTQsNiArOTU0LDcgQEAgc3RydWN0IGludGVsX3BsYW5lIHsKIAllbnVtIHBp cGUgcGlwZTsKIAlib29sIGNhbl9zY2FsZTsKIAlib29sIGhhc19mYmM7CisJYm9vbCBoYXNfY2Nz OwogCWludCBtYXhfZG93bnNjYWxlOwogCXVpbnQzMl90IGZyb250YnVmZmVyX2JpdDsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBlZTIzNjEzZjlmZDQuLjIxNGNjNzMwNjQy YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEyMTEsOCArMTIxMSwxNyBA QCBzdGF0aWMgY29uc3QgdWludDY0X3Qgc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmllcnNfY2NzW10g PSB7CiAJRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRAogfTsKIAotc3RhdGljIGJvb2wgZzR4X21vZF9z dXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29s IGc0eF9zcHJpdGVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5l LAorCQkJCQkgICAgdTMyIGZvcm1hdCwgdTY0IG1vZGlmaWVyKQogeworCXN3aXRjaCAobW9kaWZp ZXIpIHsKKwljYXNlIERSTV9GT1JNQVRfTU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFUX01P RF9YX1RJTEVEOgorCQlicmVhazsKKwlkZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorCiAJ c3dpdGNoIChmb3JtYXQpIHsKIAljYXNlIERSTV9GT1JNQVRfWFJHQjg4ODg6CiAJY2FzZSBEUk1f Rk9STUFUX1lVWVY6CkBAIC0xMjI4LDggKzEyMzcsMTcgQEAgc3RhdGljIGJvb2wgZzR4X21vZF9z dXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKIAl9CiB9CiAKLXN0 YXRpYyBib29sIHNuYl9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9k aWZpZXIpCitzdGF0aWMgYm9vbCBzbmJfc3ByaXRlX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVj dCBkcm1fcGxhbmUgKl9wbGFuZSwKKwkJCQkJICAgIHUzMiBmb3JtYXQsIHU2NCBtb2RpZmllcikK IHsKKwlzd2l0Y2ggKG1vZGlmaWVyKSB7CisJY2FzZSBEUk1fRk9STUFUX01PRF9MSU5FQVI6CisJ Y2FzZSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJcmV0 dXJuIGZhbHNlOworCX0KKwogCXN3aXRjaCAoZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFUX1hS R0I4ODg4OgogCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKQEAgLTEyNDYsOCArMTI2NCwxNyBA QCBzdGF0aWMgYm9vbCBzbmJfbW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2NF90 IG1vZGlmaWVyKQogCX0KIH0KIAotc3RhdGljIGJvb2wgdmx2X21vZF9zdXBwb3J0ZWQodWludDMy X3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRpYyBib29sIHZsdl9zcHJpdGVfZm9y bWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAorCQkJCQkgICAgdTMy IGZvcm1hdCwgdTY0IG1vZGlmaWVyKQogeworCXN3aXRjaCAobW9kaWZpZXIpIHsKKwljYXNlIERS TV9GT1JNQVRfTU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgorCQli cmVhazsKKwlkZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorCiAJc3dpdGNoIChmb3JtYXQp IHsKIAljYXNlIERSTV9GT1JNQVRfUkdCNTY1OgogCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoK QEAgLTEyNjksOCArMTI5NiwyNiBAQCBzdGF0aWMgYm9vbCB2bHZfbW9kX3N1cHBvcnRlZCh1aW50 MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQogCX0KIH0KIAotc3RhdGljIGJvb2wgc2ts X21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3N0YXRp YyBib29sIHNrbF9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpf cGxhbmUsCisJCQkJCSAgIHUzMiBmb3JtYXQsIHU2NCBtb2RpZmllcikKIHsKKwlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUoX3BsYW5lKTsKKworCXN3aXRjaCAobW9k aWZpZXIpIHsKKwljYXNlIERSTV9GT1JNQVRfTU9EX0xJTkVBUjoKKwljYXNlIEk5MTVfRk9STUFU X01PRF9YX1RJTEVEOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQ6CisJY2FzZSBJOTE1 X0ZPUk1BVF9NT0RfWWZfVElMRUQ6CisJCWJyZWFrOworCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lf VElMRURfQ0NTOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEX0NDUzoKKwkJaWYgKCFw bGFuZS0+aGFzX2NjcykKKwkJCXJldHVybiBmYWxzZTsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJ cmV0dXJuIGZhbHNlOworCX0KKwogCXN3aXRjaCAoZm9ybWF0KSB7CiAJY2FzZSBEUk1fRk9STUFU X1hSR0I4ODg4OgogCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKQEAgLTEzMDIsMzggKzEzNDcs NDggQEAgc3RhdGljIGJvb2wgc2tsX21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50 NjRfdCBtb2RpZmllcikKIAl9CiB9CiAKLXN0YXRpYyBib29sIGludGVsX3Nwcml0ZV9wbGFuZV9m b3JtYXRfbW9kX3N1cHBvcnRlZChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBmb3JtYXQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWlu dDY0X3QgbW9kaWZpZXIpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShwbGFuZS0+ZGV2KTsKLQotCWlmIChXQVJOX09OKG1vZGlmaWVyID09IERSTV9GT1JN QVRfTU9EX0lOVkFMSUQpKQotCQlyZXR1cm4gZmFsc2U7CitzdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9mdW5jcyBnNHhfc3ByaXRlX2Z1bmNzID0geworCS51cGRhdGVfcGxhbmUgPSBkcm1f YXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUsCisJLmRpc2FibGVfcGxhbmUgPSBkcm1fYXRvbWlj X2hlbHBlcl9kaXNhYmxlX3BsYW5lLAorCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwK KwkuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19nZXRfcHJvcGVydHks CisJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5 LAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRl LAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisJ LmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gZzR4X3Nwcml0ZV9mb3JtYXRfbW9kX3N1cHBvcnRlZCwK K307CiAKLQlpZiAoKG1vZGlmaWVyID4+IDU2KSAhPSBEUk1fRk9STUFUX01PRF9WRU5ET1JfSU5U RUwgJiYKLQkgICAgbW9kaWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSKQotCQlyZXR1cm4g ZmFsc2U7CitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBzbmJfc3ByaXRlX2Z1 bmNzID0geworCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVfcGxhbmUs CisJLmRpc2FibGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAorCS5k ZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKKwkuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGlu dGVsX3BsYW5lX2F0b21pY19nZXRfcHJvcGVydHksCisJLmF0b21pY19zZXRfcHJvcGVydHkgPSBp bnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRl ID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9 IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisJLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gc25i X3Nwcml0ZV9mb3JtYXRfbW9kX3N1cHBvcnRlZCwKK307CiAKLQlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA5KQotCQlyZXR1cm4gc2tsX21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7 Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikpCi0JCXJldHVybiB2bHZfbW9kX3N1cHBvcnRlZChmb3JtYXQsIG1vZGlmaWVyKTsKLQll bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCi0JCXJldHVybiBzbmJfbW9kX3N1cHBv cnRlZChmb3JtYXQsIG1vZGlmaWVyKTsKLQllbHNlCi0JCXJldHVybiBnNHhfbW9kX3N1cHBvcnRl ZChmb3JtYXQsIG1vZGlmaWVyKTsKLX0KK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1 bmNzIHZsdl9zcHJpdGVfZnVuY3MgPSB7CisJLnVwZGF0ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVs cGVyX3VwZGF0ZV9wbGFuZSwKKwkuZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rp c2FibGVfcGxhbmUsCisJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAorCS5hdG9taWNf Z2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwKKwkuYXRvbWlj X3NldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHksCisJLmF0b21p Y19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCisJLmF0b21p Y19kZXN0cm95X3N0YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKKwkuZm9ybWF0X21v ZF9zdXBwb3J0ZWQgPSB2bHZfc3ByaXRlX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAorfTsKIAotc3Rh dGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNz ID0gewotICAgICAgICAudXBkYXRlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3Bs YW5lLAotICAgICAgICAuZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVf cGxhbmUsCi0gICAgICAgIC5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKLSAgICAgICAg LmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LAot ICAgICAgICAuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJv cGVydHksCi0gICAgICAgIC5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfcGxhbmVfZHVw bGljYXRlX3N0YXRlLAotICAgICAgICAuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9wbGFu ZV9kZXN0cm95X3N0YXRlLAotICAgICAgICAuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBpbnRlbF9z cHJpdGVfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCitzdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9mdW5jcyBza2xfcGxhbmVfZnVuY3MgPSB7CisJLnVwZGF0ZV9wbGFuZSA9IGRybV9h dG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKKwkuZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNf aGVscGVyX2Rpc2FibGVfcGxhbmUsCisJLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAor CS5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWljX2dldF9wcm9wZXJ0eSwK KwkuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHks CisJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUs CisJLmF0b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKKwku Zm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBza2xfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQsCiB9 OwogCiBib29sIHNrbF9wbGFuZV9oYXNfY2NzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKQEAgLTEzNTksNiArMTQxNCw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmUgPSBOVUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBO VUxMOworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgKnBsYW5lX2Z1bmNzOwogCXVuc2ln bmVkIGxvbmcgcG9zc2libGVfY3J0Y3M7CiAJY29uc3QgdWludDMyX3QgKnBsYW5lX2Zvcm1hdHM7 CiAJY29uc3QgdWludDY0X3QgKm1vZGlmaWVyczsKQEAgLTEzODMsNiArMTQzOSw5IEBAIGludGVs X3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKIAkJc3RhdGUtPnNjYWxlcl9pZCA9IC0x OwogCisJCWludGVsX3BsYW5lLT5oYXNfY2NzID0gc2tsX3BsYW5lX2hhc19jY3MoZGV2X3ByaXYs IHBpcGUsCisJCQkJCQkJIFBMQU5FX1NQUklURTAgKyBwbGFuZSk7CisKIAkJaW50ZWxfcGxhbmUt PnVwZGF0ZV9wbGFuZSA9IHNrbF91cGRhdGVfcGxhbmU7CiAJCWludGVsX3BsYW5lLT5kaXNhYmxl X3BsYW5lID0gc2tsX2Rpc2FibGVfcGxhbmU7CiAJCWludGVsX3BsYW5lLT5nZXRfaHdfc3RhdGUg PSBza2xfcGxhbmVfZ2V0X2h3X3N0YXRlOwpAQCAtMTM5NiwxMCArMTQ1NSwxMiBAQCBpbnRlbF9z cHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ CW51bV9wbGFuZV9mb3JtYXRzID0gQVJSQVlfU0laRShza2xfcGxhbmVfZm9ybWF0cyk7CiAJCX0K IAotCQlpZiAoc2tsX3BsYW5lX2hhc19jY3MoZGV2X3ByaXYsIHBpcGUsIFBMQU5FX1NQUklURTAg KyBwbGFuZSkpCisJCWlmIChpbnRlbF9wbGFuZS0+aGFzX2NjcykKIAkJCW1vZGlmaWVycyA9IHNr bF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzX2NjczsKIAkJZWxzZQogCQkJbW9kaWZpZXJzID0gc2ts X3BsYW5lX2Zvcm1hdF9tb2RpZmllcnNfbm9jY3M7CisKKwkJcGxhbmVfZnVuY3MgPSAmc2tsX3Bs YW5lX2Z1bmNzOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfcGxhbmUtPmNhbl9zY2FsZSA9IGZhbHNlOwog CQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDE7CkBAIC0xNDExLDYgKzE0NzIsOCBAQCBp bnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJcGxhbmVfZm9ybWF0cyA9IHZsdl9wbGFuZV9mb3JtYXRzOwogCQludW1fcGxhbmVfZm9y bWF0cyA9IEFSUkFZX1NJWkUodmx2X3BsYW5lX2Zvcm1hdHMpOwogCQltb2RpZmllcnMgPSBpOXh4 X3BsYW5lX2Zvcm1hdF9tb2RpZmllcnM7CisKKwkJcGxhbmVfZnVuY3MgPSAmdmx2X3Nwcml0ZV9m dW5jczsKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykgewogCQlpZiAoSVNf SVZZQlJJREdFKGRldl9wcml2KSkgewogCQkJaW50ZWxfcGxhbmUtPmNhbl9zY2FsZSA9IHRydWU7 CkBAIC0xNDI3LDYgKzE0OTAsOCBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcGxhbmVfZm9ybWF0cyA9IHNuYl9wbGFuZV9m b3JtYXRzOwogCQludW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUoc25iX3BsYW5lX2Zvcm1h dHMpOwogCQltb2RpZmllcnMgPSBpOXh4X3BsYW5lX2Zvcm1hdF9tb2RpZmllcnM7CisKKwkJcGxh bmVfZnVuY3MgPSAmc25iX3Nwcml0ZV9mdW5jczsKIAl9IGVsc2UgewogCQlpbnRlbF9wbGFuZS0+ Y2FuX3NjYWxlID0gdHJ1ZTsKIAkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2NhbGUgPSAxNjsKQEAg LTE0MzksOSArMTUwNCwxMyBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKSB7CiAJCQlw bGFuZV9mb3JtYXRzID0gc25iX3BsYW5lX2Zvcm1hdHM7CiAJCQludW1fcGxhbmVfZm9ybWF0cyA9 IEFSUkFZX1NJWkUoc25iX3BsYW5lX2Zvcm1hdHMpOworCisJCQlwbGFuZV9mdW5jcyA9ICZzbmJf c3ByaXRlX2Z1bmNzOwogCQl9IGVsc2UgewogCQkJcGxhbmVfZm9ybWF0cyA9IGc0eF9wbGFuZV9m b3JtYXRzOwogCQkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKGc0eF9wbGFuZV9mb3Jt YXRzKTsKKworCQkJcGxhbmVfZnVuY3MgPSAmZzR4X3Nwcml0ZV9mdW5jczsKIAkJfQogCX0KIApA QCAtMTQ2OCwxNCArMTUzNywxNCBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDkpCiAJCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJmlu dGVsX3BsYW5lLT5iYXNlLAotCQkJCQkgICAgICAgcG9zc2libGVfY3J0Y3MsICZpbnRlbF9zcHJp dGVfcGxhbmVfZnVuY3MsCisJCQkJCSAgICAgICBwb3NzaWJsZV9jcnRjcywgcGxhbmVfZnVuY3Ms CiAJCQkJCSAgICAgICBwbGFuZV9mb3JtYXRzLCBudW1fcGxhbmVfZm9ybWF0cywKIAkJCQkJICAg ICAgIG1vZGlmaWVycywKIAkJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX09WRVJMQVksCiAJCQkJ CSAgICAgICAicGxhbmUgJWQlYyIsIHBsYW5lICsgMiwgcGlwZV9uYW1lKHBpcGUpKTsKIAllbHNl CiAJCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJmludGVs X3BsYW5lLT5iYXNlLAotCQkJCQkgICAgICAgcG9zc2libGVfY3J0Y3MsICZpbnRlbF9zcHJpdGVf cGxhbmVfZnVuY3MsCisJCQkJCSAgICAgICBwb3NzaWJsZV9jcnRjcywgcGxhbmVfZnVuY3MsCiAJ CQkJCSAgICAgICBwbGFuZV9mb3JtYXRzLCBudW1fcGxhbmVfZm9ybWF0cywKIAkJCQkJICAgICAg IG1vZGlmaWVycywKIAkJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX09WRVJMQVksCi0tIAoyLjE2 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=