From: Maarten Lankhorst Subject: [PATCH v4 4/5] drm/atomic: Convert get_existing_state callers to get_old/new_state, v3. Date: Thu, 16 Feb 2017 15:47:09 +0100 Message-ID: <1487256430-7625-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1487256430-7625-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487256430-7625-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyBhIHN0cmFpZ2h0Zm9yd2FyZCBjb252ZXJzaW9uIHRoYXQgY29udmVydHMgYWxsIHRo ZSB1c2VycyBvZgpnZXRfZXhpc3Rpbmdfc3RhdGUgaW4gYXRvbWljIGNvcmUgdG8gdXNlIGdldF9v bGRfc3RhdGUgb3IgZ2V0X25ld19zdGF0ZQoKQ2hhbmdlcyBzaW5jZSB2MToKLSBGaXggdXNpbmcg dGhlIHdyb25nIHN0YXRlIGluIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNl dF9zdGF0ZS4KQ2hhbmdlcyBzaW5jZSB2MjoKLSBVc2UgdGhlIGNvcnJlY3Qgc3RhdGUgaW4gZGlz YWJsZV9vdXRwdXRzKCkKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWMuYyAgICAgICAgICAgIHwgIDYgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hl bHBlci5jICAgICB8IDQzICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2RybV9ibGVuZC5jICAgICAgICAgICAgIHwgIDMgKy0tCiBkcml2ZXJzL2dwdS9k cm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMgfCAgNCArLS0KIDQgZmlsZXMgY2hhbmdlZCwgMjgg aW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKaW5kZXggYWZl YzUzODMyMTQ1Li5jOWFhYzljYmYxMTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAtMTM1OCw4ICsx MzU4LDggQEAgZHJtX2F0b21pY19zZXRfY3J0Y19mb3JfY29ubmVjdG9yKHN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpjb25uX3N0YXRlLAogCQlyZXR1cm4gMDsKIAogCWlmIChjb25uX3N0YXRl LT5jcnRjKSB7Ci0JCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0 YXRlKGNvbm5fc3RhdGUtPnN0YXRlLAotCQkJCQkJCQljb25uX3N0YXRlLT5jcnRjKTsKKwkJY3J0 Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKGNvbm5fc3RhdGUtPnN0YXRl LAorCQkJCQkJCSAgIGNvbm5fc3RhdGUtPmNydGMpOwogCiAJCWNydGNfc3RhdGUtPmNvbm5lY3Rv cl9tYXNrICY9CiAJCQl+KDEgPDwgZHJtX2Nvbm5lY3Rvcl9pbmRleChjb25uX3N0YXRlLT5jb25u ZWN0b3IpKTsKQEAgLTE0NzYsNyArMTQ3Niw3IEBAIGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX3Bs YW5lcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiB7CiAJc3RydWN0IGRybV9wbGFu ZSAqcGxhbmU7CiAKLQlXQVJOX09OKCFkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRl KHN0YXRlLCBjcnRjKSk7CisJV0FSTl9PTighZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUo c3RhdGUsIGNydGMpKTsKIAogCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBzdGF0ZS0+ ZGV2LCBjcnRjLT5zdGF0ZS0+cGxhbmVfbWFzaykgewogCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSA9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IGVhNTQ0 YmRkYzI5Yi4uNjI5NmFlNmU2YWZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpA QCAtNzAsOCArNzAsOCBAQCBkcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9jaGFuZ2VkKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3Rh dGU7CiAKIAlpZiAob2xkX3BsYW5lX3N0YXRlLT5jcnRjKSB7Ci0JCWNydGNfc3RhdGUgPSBkcm1f YXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLAotCQkJCQkJCQlvbGRfcGxhbmVf c3RhdGUtPmNydGMpOworCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3Rh dGUoc3RhdGUsCisJCQkJCQkJICAgb2xkX3BsYW5lX3N0YXRlLT5jcnRjKTsKIAogCQlpZiAoV0FS Tl9PTighY3J0Y19zdGF0ZSkpCiAJCQlyZXR1cm47CkBAIC04MCw4ICs4MCw3IEBAIGRybV9hdG9t aWNfaGVscGVyX3BsYW5lX2NoYW5nZWQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAog CX0KIAogCWlmIChwbGFuZV9zdGF0ZS0+Y3J0YykgewotCQljcnRjX3N0YXRlID0gZHJtX2F0b21p Y19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwKLQkJCQkJCQkJcGxhbmVfc3RhdGUtPmNy dGMpOworCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUs IHBsYW5lX3N0YXRlLT5jcnRjKTsKIAogCQlpZiAoV0FSTl9PTighY3J0Y19zdGF0ZSkpCiAJCQly ZXR1cm47CkBAIC0xNTAsNyArMTQ5LDcgQEAgc3RhdGljIGludCBoYW5kbGVfY29uZmxpY3Rpbmdf ZW5jb2RlcnMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCWRybV9mb3JfZWFjaF9j b25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsKIAkJc3RydWN0IGRybV9jcnRj X3N0YXRlICpjcnRjX3N0YXRlOwogCi0JCWlmIChkcm1fYXRvbWljX2dldF9leGlzdGluZ19jb25u ZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3RvcikpCisJCWlmIChkcm1fYXRvbWljX2dldF9uZXdf Y29ubmVjdG9yX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IpKQogCQkJY29udGludWU7CiAKIAkJZW5j b2RlciA9IGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlcjsKQEAgLTE3OCw3ICsxNzcsNyBA QCBzdGF0aWMgaW50IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiAJCQkJIG5ld19jb25uX3N0YXRlLT5jcnRjLT5iYXNlLmlkLCBuZXdf Y29ubl9zdGF0ZS0+Y3J0Yy0+bmFtZSwKIAkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0 b3ItPm5hbWUpOwogCi0JCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRj X3N0YXRlKHN0YXRlLCBuZXdfY29ubl9zdGF0ZS0+Y3J0Yyk7CisJCWNydGNfc3RhdGUgPSBkcm1f YXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgbmV3X2Nvbm5fc3RhdGUtPmNydGMpOwog CiAJCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX2Nvbm5lY3RvcihuZXdfY29ubl9zdGF0 ZSwgTlVMTCk7CiAJCWlmIChyZXQpCkBAIC0yMTksNyArMjE4LDcgQEAgc2V0X2Jlc3RfZW5jb2Rl cihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCSAqLwogCQlXQVJOX09OKCFjcnRj ICYmIGVuY29kZXIgIT0gY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyKTsKIAkJaWYgKGNydGMpIHsK LQkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRl LCBjcnRjKTsKKwkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShz dGF0ZSwgY3J0Yyk7CiAKIAkJCWNydGNfc3RhdGUtPmVuY29kZXJfbWFzayAmPQogCQkJCX4oMSA8 PCBkcm1fZW5jb2Rlcl9pbmRleChjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpKTsKQEAgLTIzMCw3 ICsyMjksNyBAQCBzZXRfYmVzdF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKIAkJY3J0YyA9IGNvbm5fc3RhdGUtPmNydGM7CiAJCVdBUk5fT04oIWNydGMpOwogCQlpZiAo Y3J0YykgewotCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3Rh dGUoc3RhdGUsIGNydGMpOworCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRj X3N0YXRlKHN0YXRlLCBjcnRjKTsKIAogCQkJY3J0Y19zdGF0ZS0+ZW5jb2Rlcl9tYXNrIHw9CiAJ CQkJMSA8PCBkcm1fZW5jb2Rlcl9pbmRleChlbmNvZGVyKTsKQEAgLTI2Myw3ICsyNjIsNyBAQCBz dGVhbF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCQlzZXRfYmVz dF9lbmNvZGVyKHN0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLCBOVUxMKTsKIAotCQljcnRjX3N0 YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgZW5jb2Rlcl9j cnRjKTsKKwkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRl LCBlbmNvZGVyX2NydGMpOwogCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVl OwogCiAJCXJldHVybjsKQEAgLTI4NiwxMiArMjg1LDEyIEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91 dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAKIAlpZiAob2xkX2Nvbm5lY3Rv cl9zdGF0ZS0+Y3J0YyAhPSBuZXdfY29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7CiAJCWlmIChvbGRf Y29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7Ci0JCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf ZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgb2xkX2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CisJ CQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIG9sZF9j b25uZWN0b3Jfc3RhdGUtPmNydGMpOwogCQkJY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2Vk ID0gdHJ1ZTsKIAkJfQogCiAJCWlmIChuZXdfY29ubmVjdG9yX3N0YXRlLT5jcnRjKSB7Ci0JCQlj cnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgbmV3 X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CisJCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf bmV3X2NydGNfc3RhdGUoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpOwogCQkJY3J0 Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKIAkJfQogCX0KQEAgLTM1MCw3ICsz NDksNyBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlLAogCiAJc2V0X2Jlc3RfZW5jb2RlcihzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZSwg bmV3X2VuY29kZXIpOwogCi0JY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2Ny dGNfc3RhdGUoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpOworCWNydGNfc3RhdGUg PSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0 ZS0+Y3J0Yyk7CiAJY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKIAogCURS TV9ERUJVR19BVE9NSUMoIltDT05ORUNUT1I6JWQ6JXNdIHVzaW5nIFtFTkNPREVSOiVkOiVzXSBv biBbQ1JUQzolZDolc11cbiIsCkBAIC0zOTIsNyArMzkxLDcgQEAgbW9kZV9maXh1cChzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCQljb250aW51ZTsKIAogCQluZXdfY3J0Y19zdGF0 ZSA9Ci0JCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBuZXdfY29u bl9zdGF0ZS0+Y3J0Yyk7CisJCQlkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwg bmV3X2Nvbm5fc3RhdGUtPmNydGMpOwogCiAJCS8qCiAJCSAqIEVhY2ggZW5jb2RlciBoYXMgYXQg bW9zdCBvbmUgY29ubmVjdG9yIChzaW5jZSB3ZSBhbHdheXMgc3RlYWwKQEAgLTcwNCw4ICs3MDMs NyBAQCBkaXNhYmxlX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAkJaWYgKCFvbGRfY29ubl9zdGF0ZS0+Y3J0YykKIAkJ CWNvbnRpbnVlOwogCi0JCW9sZF9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3Rpbmdf Y3J0Y19zdGF0ZShvbGRfc3RhdGUsCi0JCQkJCQkJCSAgICBvbGRfY29ubl9zdGF0ZS0+Y3J0Yyk7 CisJCW9sZF9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUob2xkX3N0 YXRlLCBvbGRfY29ubl9zdGF0ZS0+Y3J0Yyk7CiAKIAkJaWYgKCFvbGRfY3J0Y19zdGF0ZS0+YWN0 aXZlIHx8CiAJCSAgICAhZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQob2xkX2Nvbm5fc3Rh dGUtPmNydGMtPnN0YXRlKSkKQEAgLTgzNCwxNCArODMyLDE3IEBAIGRybV9hdG9taWNfaGVscGVy X3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCS8q IHNldCBsZWdhY3kgc3RhdGUgaW4gdGhlIGNydGMgc3RydWN0dXJlICovCiAJZm9yX2VhY2hfbmV3 X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewogCQlz dHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+cHJpbWFyeTsKKwkJc3RydWN0IGRybV9w bGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlOwogCiAJCWNydGMtPm1vZGUgPSBuZXdfY3J0Y19z dGF0ZS0+bW9kZTsKIAkJY3J0Yy0+ZW5hYmxlZCA9IG5ld19jcnRjX3N0YXRlLT5lbmFibGU7CiAK LQkJaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJp bWFyeSkgJiYKLQkJICAgIHByaW1hcnktPnN0YXRlLT5jcnRjID09IGNydGMpIHsKLQkJCWNydGMt PnggPSBwcmltYXJ5LT5zdGF0ZS0+c3JjX3ggPj4gMTY7Ci0JCQljcnRjLT55ID0gcHJpbWFyeS0+ c3RhdGUtPnNyY195ID4+IDE2OworCQluZXdfcGxhbmVfc3RhdGUgPQorCQkJZHJtX2F0b21pY19n ZXRfbmV3X3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSk7CisKKwkJaWYgKG5ld19wbGFu ZV9zdGF0ZSAmJiBuZXdfcGxhbmVfc3RhdGUtPmNydGMgPT0gY3J0YykgeworCQkJY3J0Yy0+eCA9 IG5ld19wbGFuZV9zdGF0ZS0+c3JjX3ggPj4gMTY7CisJCQljcnRjLT55ID0gbmV3X3BsYW5lX3N0 YXRlLT5zcmNfeSA+PiAxNjsKIAkJfQogCiAJCWlmIChuZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlKQpA QCAtMTg0Myw3ICsxODQ0LDcgQEAgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9j cnRjKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAKIAlkcm1fZm9yX2Vh Y2hfcGxhbmVfbWFzayhwbGFuZSwgY3J0Yy0+ZGV2LCBwbGFuZV9tYXNrKSB7CiAJCXN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9Ci0JCQlkcm1fYXRvbWljX2dldF9leGlz dGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lKTsKKwkJCWRybV9hdG9taWNfZ2V0X29s ZF9wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lKTsKIAkJY29uc3Qgc3RydWN0IGRybV9wbGFu ZV9oZWxwZXJfZnVuY3MgKnBsYW5lX2Z1bmNzOwogCiAJCXBsYW5lX2Z1bmNzID0gcGxhbmUtPmhl bHBlcl9wcml2YXRlOwpAQCAtMjkxNCw3ICsyOTE1LDcgQEAgaW50IGRybV9hdG9taWNfaGVscGVy X3BhZ2VfZmxpcF90YXJnZXQoCiAJaWYgKHJldCAhPSAwKQogCQlnb3RvIGZhaWw7CiAKLQljcnRj X3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7 CisJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRj KTsKIAlpZiAoV0FSTl9PTighY3J0Y19zdGF0ZSkpIHsKIAkJcmV0ID0gLUVJTlZBTDsKIAkJZ290 byBmYWlsOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9ibGVuZC5jCmluZGV4IDY2NWFhZmM2YWQ2OC4uZDcwNTNiYjY3ZGI2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2JsZW5kLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9ibGVuZC5jCkBAIC0zODcsOCArMzg3LDcgQEAgaW50IGRybV9hdG9taWNfbm9ybWFs aXplX3pwb3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKCFjcnRjKQogCQkJY29udGlu dWU7CiAJCWlmIChwbGFuZS0+c3RhdGUtPnpwb3MgIT0gcGxhbmVfc3RhdGUtPnpwb3MpIHsKLQkJ CWNydGNfc3RhdGUgPQotCQkJCWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3Rh dGUsIGNydGMpOworCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRl KHN0YXRlLCBjcnRjKTsKIAkJCWNydGNfc3RhdGUtPnpwb3NfY2hhbmdlZCA9IHRydWU7CiAJCX0K IAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMKaW5kZXggMzVjNWQ5OTI5 NmI5Li4xNjc4OWZhYTkyOTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fc2ltcGxl X2ttc19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVscGVy LmMKQEAgLTg2LDggKzg2LDggQEAgc3RhdGljIGludCBkcm1fc2ltcGxlX2ttc19wbGFuZV9hdG9t aWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaW50IHJldDsKIAogCXBpcGUgPSBj b250YWluZXJfb2YocGxhbmUsIHN0cnVjdCBkcm1fc2ltcGxlX2Rpc3BsYXlfcGlwZSwgcGxhbmUp OwotCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHBsYW5l X3N0YXRlLT5zdGF0ZSwKLQkJCQkJCQkmcGlwZS0+Y3J0Yyk7CisJY3J0Y19zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHBsYW5lX3N0YXRlLT5zdGF0ZSwKKwkJCQkJCSAgICZw aXBlLT5jcnRjKTsKIAlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlICE9ICEhcGxhbmVfc3RhdGUtPmNy dGMpCiAJCXJldHVybiAtRUlOVkFMOyAvKiBwbGFuZSBtdXN0IG1hdGNoIGNydGMgZW5hYmxlIHN0 YXRlICovCiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK