From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/atomic: pass old crtc state to atomic_begin/flush. Date: Fri, 12 Jun 2015 11:18:22 +0200 Message-ID: <1434100702-15754-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: 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: intel-gfx@lists.freedesktop.org SW4gaW50ZWwgaXQncyB1c2VmdWwgdG8ga2VlcCB0cmFjayBvZiBzb21lIHN0YXRlIGNoYW5nZXMg d2l0aCBvbGQKY3J0YyBzdGF0ZSB2cyBuZXcgc3RhdGUsIGZvciBleGFtcGxlIHRvIGRpc2FibGUg aW5pdGlhbCBwbGFuZXMgb3IKd2hlbiBhIG1vZGVzZXQncyBwcmV2ZW50ZWQgZHVyaW5nIGZhc3Ri b290LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0 QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRtZWxf aGxjZGNfY3J0Yy5jIHwgIDYgKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxw ZXIuYyAgICAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVf aGVscGVyLmMgICAgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgICAgICAgICAgIHwgMTAgKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL21z bS9tZHAvbWRwNC9tZHA0X2NydGMuYyAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJt L21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYyAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUv ZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMgICAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9n cHUvZHJtL3N0aS9zdGlfZHJtX2NydGMuYyAgICAgICAgICAgICB8ICA2ICsrKystLQogZHJpdmVy cy9ncHUvZHJtL3RlZ3JhL2RjLmMgICAgICAgICAgICAgICAgICAgICB8ICA2ICsrKystLQogaW5j bHVkZS9kcm0vZHJtX2NydGNfaGVscGVyLmggICAgICAgICAgICAgICAgICB8ICA2ICsrKystLQog MTAgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2NydGMuYyBi L2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19jcnRjLmMKaW5kZXggZjY5 YjkyNTM1NTA1Li44YjhmZTM3NjJjYTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hdG1l bC1obGNkYy9hdG1lbF9obGNkY19jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2F0bWVsLWhs Y2RjL2F0bWVsX2hsY2RjX2NydGMuYwpAQCAtMjM5LDcgKzIzOSw4IEBAIHN0YXRpYyBpbnQgYXRt ZWxfaGxjZGNfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjLAogCXJldHVybiBh dG1lbF9obGNkY19wbGFuZV9wcmVwYXJlX2Rpc2NfYXJlYShzKTsKIH0KIAotc3RhdGljIHZvaWQg YXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjKQorc3RhdGlj IHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjLAor CQkJCQkgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX3MpCiB7CiAJc3RydWN0IGF0bWVsX2hs Y2RjX2NydGMgKmNydGMgPSBkcm1fY3J0Y190b19hdG1lbF9obGNkY19jcnRjKGMpOwogCkBAIC0y NTMsNyArMjU0LDggQEAgc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfYmVnaW4o c3RydWN0IGRybV9jcnRjICpjKQogCX0KIH0KIAotc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0 Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgYXRtZWxf aGxjZGNfY3J0Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCQkgIHN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX3MpCiB7CiAJLyogVE9ETzogd3JpdGUgY29tbW9uIHBs YW5lIGNvbnRyb2wgcmVnaXN0ZXIgaWYgYXZhaWxhYmxlICovCiB9CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljX2hlbHBlci5jCmluZGV4IDUzNmFlNGRhNDY2NS4uNTBhZWYxZDkzN2U1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMTE0NCw3ICsxMTQ0LDcgQEAgdm9pZCBkcm1fYXRv bWljX2hlbHBlcl9jb21taXRfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICgh ZnVuY3MgfHwgIWZ1bmNzLT5hdG9taWNfYmVnaW4pCiAJCQljb250aW51ZTsKIAotCQlmdW5jcy0+ YXRvbWljX2JlZ2luKGNydGMpOworCQlmdW5jcy0+YXRvbWljX2JlZ2luKGNydGMsIG9sZF9jcnRj X3N0YXRlKTsKIAl9CiAKIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShvbGRfc3RhdGUsIHBsYW5l LCBvbGRfcGxhbmVfc3RhdGUsIGkpIHsKQEAgLTExNzQsNyArMTE3NCw3IEBAIHZvaWQgZHJtX2F0 b21pY19oZWxwZXJfY29tbWl0X3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAo IWZ1bmNzIHx8ICFmdW5jcy0+YXRvbWljX2ZsdXNoKQogCQkJY29udGludWU7CiAKLQkJZnVuY3Mt PmF0b21pY19mbHVzaChjcnRjKTsKKwkJZnVuY3MtPmF0b21pY19mbHVzaChjcnRjLCBvbGRfY3J0 Y19zdGF0ZSk7CiAJfQogfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9jb21taXRf cGxhbmVzKTsKQEAgLTEyMTAsNyArMTIxMCw3IEBAIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9w bGFuZXNfb25fY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCiAJ Y3J0Y19mdW5jcyA9IGNydGMtPmhlbHBlcl9wcml2YXRlOwogCWlmIChjcnRjX2Z1bmNzICYmIGNy dGNfZnVuY3MtPmF0b21pY19iZWdpbikKLQkJY3J0Y19mdW5jcy0+YXRvbWljX2JlZ2luKGNydGMp OworCQljcnRjX2Z1bmNzLT5hdG9taWNfYmVnaW4oY3J0Yywgb2xkX2NydGNfc3RhdGUpOwogCiAJ ZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsIGNydGMtPmRldiwgcGxhbmVfbWFzaykgewog CQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQpAQCAtMTIzMyw3ICsx MjMzLDcgQEAgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJfQogCiAJaWYgKGNydGNfZnVuY3MgJiYg Y3J0Y19mdW5jcy0+YXRvbWljX2ZsdXNoKQotCQljcnRjX2Z1bmNzLT5hdG9taWNfZmx1c2goY3J0 Yyk7CisJCWNydGNfZnVuY3MtPmF0b21pY19mbHVzaChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7CiB9 CiBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0Yyk7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCmluZGV4IDJmMGVkMTEwMjRlYi4uZGEyN2Zj NmY4ZTRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMKQEAgLTQzNiw3ICs0MzYsNyBA QCBpbnQgZHJtX3BsYW5lX2hlbHBlcl9jb21taXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAK IAlmb3IgKGkgPSAwOyBpIDwgMjsgaSsrKSB7CiAJCWlmIChjcnRjX2Z1bmNzW2ldICYmIGNydGNf ZnVuY3NbaV0tPmF0b21pY19iZWdpbikKLQkJCWNydGNfZnVuY3NbaV0tPmF0b21pY19iZWdpbihj cnRjW2ldKTsKKwkJCWNydGNfZnVuY3NbaV0tPmF0b21pY19iZWdpbihjcnRjW2ldLCBjcnRjW2ld LT5zdGF0ZSk7CiAJfQogCiAJLyoKQEAgLTQ1MSw3ICs0NTEsNyBAQCBpbnQgZHJtX3BsYW5lX2hl bHBlcl9jb21taXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAlmb3IgKGkgPSAwOyBpIDwg MjsgaSsrKSB7CiAJCWlmIChjcnRjX2Z1bmNzW2ldICYmIGNydGNfZnVuY3NbaV0tPmF0b21pY19m bHVzaCkKLQkJCWNydGNfZnVuY3NbaV0tPmF0b21pY19mbHVzaChjcnRjW2ldKTsKKwkJCWNydGNf ZnVuY3NbaV0tPmF0b21pY19mbHVzaChjcnRjW2ldLCBjcnRjW2ldLT5zdGF0ZSk7CiAJfQogCiAJ LyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhZmU5MWE4ZjdlMzYuLjU5 OWMzZDA3OGZhYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAzLDgg KzEwMyw4IEBAIHN0YXRpYyB2b2lkIHZsdl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcp Owogc3RhdGljIHZvaWQgY2h2X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CQkJICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7Ci1zdGF0 aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwot c3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7CitzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMg Kiwgc3RydWN0IGRybV9jcnRjX3N0YXRlICopOworc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2Ny dGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqLCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKik7CiBz dGF0aWMgdm9pZCBza2xfaW5pdF9zY2FsZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKTsKIHN0YXRpYyBpbnQgaTl4eF9nZXRfcmVmY2xrKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLApAQCAtMTM2OTcsNyArMTM2OTcsOCBAQCBpbnRlbF9kaXNh YmxlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJZGV2X3ByaXYtPmRp c3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUoY3J0YywgTlVMTCwgMCwgMCk7CiB9CiAKLXN0YXRp YyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0 YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK KwkJCQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMzc1Miw3ICsxMzc1Myw4IEBAIHN0 YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAkJCQkJCSZpbnRlbF9jcnRjLT5hdG9taWMuc3RhcnRfdmJsX2NvdW50KTsKIH0KIAotc3RhdGlj IHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0 YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CisJCQkJICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9tc20vbWRwL21kcDQvbWRwNF9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9t ZHA0L21kcDRfY3J0Yy5jCmluZGV4IDczYWZhMjE4MjJiNC4uNWFlNTc4ZDU2OWUyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA0L21kcDRfY3J0Yy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9tc20vbWRwL21kcDQvbWRwNF9jcnRjLmMKQEAgLTMyNywxMyArMzI3LDE1IEBA IHN0YXRpYyBpbnQgbWRwNF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIG1kcDRfY3J0Y19hdG9taWNfYmVnaW4oc3Ry dWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgbWRwNF9jcnRjX2F0b21pY19iZWdpbihz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkJICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRf Y3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgbWRwNF9jcnRjICptZHA0X2NydGMgPSB0b19tZHA0X2Ny dGMoY3J0Yyk7CiAJREJHKCIlczogYmVnaW4iLCBtZHA0X2NydGMtPm5hbWUpOwogfQogCi1zdGF0 aWMgdm9pZCBtZHA0X2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0 YXRpYyB2b2lkIG1kcDRfY3J0Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAor CQkJCSAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CiAJc3RydWN0 IG1kcDRfY3J0YyAqbWRwNF9jcnRjID0gdG9fbWRwNF9jcnRjKGNydGMpOwogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNt L21kcC9tZHA1L21kcDVfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1 X2NydGMuYwppbmRleCBjMTUzMDc3MjE4N2QuLjA2ODAxYzE0MmEwNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vbXNtL21kcC9tZHA1L21kcDVfY3J0Yy5jCkBAIC0zNjcsMTMgKzM2NywxNSBAQCBzdGF0aWMg aW50IG1kcDVfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXJldHVy biAwOwogfQogCi1zdGF0aWMgdm9pZCBtZHA1X2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIG1kcDVfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRy bV9jcnRjICpjcnRjLAorCQkJCSAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGUpCiB7CiAJc3RydWN0IG1kcDVfY3J0YyAqbWRwNV9jcnRjID0gdG9fbWRwNV9jcnRjKGNydGMp OwogCURCRygiJXM6IGJlZ2luIiwgbWRwNV9jcnRjLT5uYW1lKTsKIH0KIAotc3RhdGljIHZvaWQg bWRwNV9jcnRjX2F0b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9p ZCBtZHA1X2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogCXN0cnVjdCBtZHA1X2Ny dGMgKm1kcDVfY3J0YyA9IHRvX21kcDVfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+ZGV2OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNh cl9kdV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYwppbmRl eCBlNmEzMmM0ZTQwNDAuLjRkNDRjNjljMmYzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3JjYXItZHUvcmNhcl9kdV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNh cl9kdV9jcnRjLmMKQEAgLTQ4Myw3ICs0ODMsOCBAQCBzdGF0aWMgYm9vbCByY2FyX2R1X2NydGNf bW9kZV9maXh1cChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0 YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRj KQorc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX2F0b21pY19iZWdpbihzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCisJCQkJICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkK IHsKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudCA9IGNydGMtPnN0YXRl LT5ldmVudDsKIAlzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0YyA9IHRvX3JjYXJfY3J0YyhjcnRj KTsKQEAgLTQ5OSw3ICs1MDAsOCBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRvbWljX2Jl Z2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIHJjYXJfZHVf Y3J0Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgcmNh cl9kdV9jcnRjX2F0b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkJICAgICAg c3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgcmNhcl9k dV9jcnRjICpyY3J0YyA9IHRvX3JjYXJfY3J0YyhjcnRjKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3N0aS9zdGlfZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2Ry bV9jcnRjLmMKaW5kZXggNmI2NDFjNWEyZWM3Li4yNmU2M2JmMTRlZmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9zdGkvc3RpX2RybV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N0 aS9zdGlfZHJtX2NydGMuYwpAQCAtMTY0LDcgKzE2NCw4IEBAIHN0aV9kcm1fY3J0Y19tb2RlX3Nl dF9ub2ZiKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdGlfZHJtX2NydGNfbW9kZV9zZXQoY3J0 YywgJmNydGMtPnN0YXRlLT5hZGp1c3RlZF9tb2RlKTsKIH0KIAotc3RhdGljIHZvaWQgc3RpX2Ry bV9hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgc3RpX2Ry bV9hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSBzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogCXN0cnVjdCBzdGlfbWl4ZXIgKm1peGVyID0g dG9fc3RpX21peGVyKGNydGMpOwogCkBAIC0xNzgsNyArMTc5LDggQEAgc3RhdGljIHZvaWQgc3Rp X2RybV9hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0KIH0KIAotc3RhdGlj IHZvaWQgc3RpX2RybV9hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGlj IHZvaWQgc3RpX2RybV9hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogfQogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kYy5j CmluZGV4IGEyODdlNGZlYzg2NS4uYmY4ZWYzMTMzZTViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vdGVncmEvZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYwpAQCAtMTI3 Nyw3ICsxMjc3LDggQEAgc3RhdGljIGludCB0ZWdyYV9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIHRlZ3JhX2NydGNf YXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIHRlZ3JhX2Ny dGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAgc3RydWN0IGRy bV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgdGVncmFfZGMgKmRjID0g dG9fdGVncmFfZGMoY3J0Yyk7CiAKQEAgLTEyOTEsNyArMTI5Miw4IEBAIHN0YXRpYyB2b2lkIHRl Z3JhX2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKLXN0 YXRpYyB2b2lkIHRlZ3JhX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK K3N0YXRpYyB2b2lkIHRlZ3JhX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKKwkJCQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlz dHJ1Y3QgdGVncmFfZGNfc3RhdGUgKnN0YXRlID0gdG9fZGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwog CXN0cnVjdCB0ZWdyYV9kYyAqZGMgPSB0b190ZWdyYV9kYyhjcnRjKTsKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvZHJtL2RybV9jcnRjX2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGNfaGVscGVy LmgKaW5kZXggYzhmYzE4NzA2MWRlLi4wMWNhZmNiZTdkZWIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUv ZHJtL2RybV9jcnRjX2hlbHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9jcnRjX2hlbHBlci5o CkBAIC0xMDgsOCArMTA4LDEwIEBAIHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgewogCS8q IGF0b21pYyBoZWxwZXJzICovCiAJaW50ICgqYXRvbWljX2NoZWNrKShzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSk7Ci0Jdm9pZCAoKmF0 b21pY19iZWdpbikoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKLQl2b2lkICgqYXRvbWljX2ZsdXNo KShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOworCXZvaWQgKCphdG9taWNfYmVnaW4pKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKKwkJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19z dGF0ZSk7CisJdm9pZCAoKmF0b21pY19mbHVzaCkoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJ ICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKTsKIH07CiAKIC8qKgot LSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==