From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/6] drm/atomic: pass old crtc state to atomic_begin/flush. Date: Tue, 21 Jul 2015 13:28:58 +0200 Message-ID: <1437478142-416-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1437478142-416-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: <1437478142-416-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: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SW4gaW50ZWwgaXQncyB1c2VmdWwgdG8ga2VlcCB0cmFjayBvZiBzb21lIHN0YXRlIGNoYW5nZXMg d2l0aCBvbGQKY3J0YyBzdGF0ZSB2cyBuZXcgc3RhdGUsIGZvciBleGFtcGxlIHRvIGRpc2FibGUg aW5pdGlhbCBwbGFuZXMgb3IKd2hlbiBhIG1vZGVzZXQncyBwcmV2ZW50ZWQgZHVyaW5nIGZhc3Ri b290LgoKQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRtZWxfaGxjZGNfY3J0Yy5jIHwgIDYgKysr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyAgICAgICAgICAgIHwgIDgg KysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgICAgICAgICAgICAg fCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICAgICAg IHwgMTAgKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNC9tZHA0X2NydGMu YyAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2Ny dGMuYyAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9j cnRjLmMgICAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfZHJtX2Ny dGMuYyAgICAgICAgICAgICB8ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMg ICAgICAgICAgICAgICAgICAgICB8ICA2ICsrKystLQogaW5jbHVkZS9kcm0vZHJtX2NydGNfaGVs cGVyLmggICAgICAgICAgICAgICAgICB8ICA2ICsrKystLQogMTAgZmlsZXMgY2hhbmdlZCwgNDAg aW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hdG1l bC1obGNkYy9hdG1lbF9obGNkY19jcnRjLmMKaW5kZXggZjY5YjkyNTM1NTA1Li44YjhmZTM3NjJj YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19j cnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2NydGMu YwpAQCAtMjM5LDcgKzIzOSw4IEBAIHN0YXRpYyBpbnQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNf Y2hlY2soc3RydWN0IGRybV9jcnRjICpjLAogCXJldHVybiBhdG1lbF9obGNkY19wbGFuZV9wcmVw YXJlX2Rpc2NfYXJlYShzKTsKIH0KIAotc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9t aWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjKQorc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0 Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjLAorCQkJCQkgIHN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqb2xkX3MpCiB7CiAJc3RydWN0IGF0bWVsX2hsY2RjX2NydGMgKmNydGMgPSBkcm1f Y3J0Y190b19hdG1lbF9obGNkY19jcnRjKGMpOwogCkBAIC0yNTMsNyArMjU0LDggQEAgc3RhdGlj IHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjKQog CX0KIH0KIAotc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfZmx1c2goc3RydWN0 IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgYXRtZWxfaGxjZGNfY3J0Y19hdG9taWNfZmx1 c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCQkgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq b2xkX3MpCiB7CiAJLyogVE9ETzogd3JpdGUgY29tbW9uIHBsYW5lIGNvbnRyb2wgcmVnaXN0ZXIg aWYgYXZhaWxhYmxlICovCiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IGFj NjYwMTA3MTQxNC4uNGE0OGQ3NmM0ZmIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YwpAQCAtMTE3MCw3ICsxMTcwLDcgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxh bmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghZnVuY3MgfHwgIWZ1bmNzLT5hdG9t aWNfYmVnaW4pCiAJCQljb250aW51ZTsKIAotCQlmdW5jcy0+YXRvbWljX2JlZ2luKGNydGMpOwor CQlmdW5jcy0+YXRvbWljX2JlZ2luKGNydGMsIG9sZF9jcnRjX3N0YXRlKTsKIAl9CiAKIAlmb3Jf ZWFjaF9wbGFuZV9pbl9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIGkp IHsKQEAgLTEyMDAsNyArMTIwMCw3IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3Bs YW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIWZ1bmNzIHx8ICFmdW5jcy0+YXRv bWljX2ZsdXNoKQogCQkJY29udGludWU7CiAKLQkJZnVuY3MtPmF0b21pY19mbHVzaChjcnRjKTsK KwkJZnVuY3MtPmF0b21pY19mbHVzaChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7CiAJfQogfQogRVhQ T1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzKTsKQEAgLTEyMzYsNyAr MTIzNiw3IEBAIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyhzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCiAJY3J0Y19mdW5jcyA9IGNydGMtPmhl bHBlcl9wcml2YXRlOwogCWlmIChjcnRjX2Z1bmNzICYmIGNydGNfZnVuY3MtPmF0b21pY19iZWdp bikKLQkJY3J0Y19mdW5jcy0+YXRvbWljX2JlZ2luKGNydGMpOworCQljcnRjX2Z1bmNzLT5hdG9t aWNfYmVnaW4oY3J0Yywgb2xkX2NydGNfc3RhdGUpOwogCiAJZHJtX2Zvcl9lYWNoX3BsYW5lX21h c2socGxhbmUsIGNydGMtPmRldiwgcGxhbmVfbWFzaykgewogCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpvbGRfcGxhbmVfc3RhdGUgPQpAQCAtMTI1OSw3ICsxMjU5LDcgQEAgZHJtX2F0b21pY19o ZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGUpCiAJfQogCiAJaWYgKGNydGNfZnVuY3MgJiYgY3J0Y19mdW5jcy0+YXRvbWljX2Zs dXNoKQotCQljcnRjX2Z1bmNzLT5hdG9taWNfZmx1c2goY3J0Yyk7CisJCWNydGNfZnVuY3MtPmF0 b21pY19mbHVzaChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9h dG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0Yyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5l X2hlbHBlci5jCmluZGV4IDAzYjdhZmU0NTVlNi4uY2I1ZGFiNGM0MzM3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fcGxhbmVfaGVscGVyLmMKQEAgLTQzNiw3ICs0MzYsNyBAQCBpbnQgZHJtX3BsYW5lX2hlbHBl cl9jb21taXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAlmb3IgKGkgPSAwOyBpIDwgMjsg aSsrKSB7CiAJCWlmIChjcnRjX2Z1bmNzW2ldICYmIGNydGNfZnVuY3NbaV0tPmF0b21pY19iZWdp bikKLQkJCWNydGNfZnVuY3NbaV0tPmF0b21pY19iZWdpbihjcnRjW2ldKTsKKwkJCWNydGNfZnVu Y3NbaV0tPmF0b21pY19iZWdpbihjcnRjW2ldLCBjcnRjW2ldLT5zdGF0ZSk7CiAJfQogCiAJLyoK QEAgLTQ1MSw3ICs0NTEsNyBAQCBpbnQgZHJtX3BsYW5lX2hlbHBlcl9jb21taXQoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAKIAlmb3IgKGkgPSAwOyBpIDwgMjsgaSsrKSB7CiAJCWlmIChjcnRj X2Z1bmNzW2ldICYmIGNydGNfZnVuY3NbaV0tPmF0b21pY19mbHVzaCkKLQkJCWNydGNfZnVuY3Nb aV0tPmF0b21pY19mbHVzaChjcnRjW2ldKTsKKwkJCWNydGNfZnVuY3NbaV0tPmF0b21pY19mbHVz aChjcnRjW2ldLCBjcnRjW2ldLT5zdGF0ZSk7CiAJfQogCiAJLyoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCA2NzFjYTI4MjBmODIuLmRlZjk0NDRlZWFlMiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAyLDggKzEwMiw4IEBAIHN0YXRpYyB2b2lk IHZsdl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogc3RhdGljIHZvaWQgY2h2X3By ZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7Ci1zdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9j cnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotc3RhdGljIHZvaWQgaW50ZWxfZmlu aXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CitzdGF0aWMgdm9pZCBpbnRl bF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKiwgc3RydWN0IGRybV9jcnRjX3N0 YXRlICopOworc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqLCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKik7CiBzdGF0aWMgdm9pZCBza2xfaW5pdF9z Y2FsZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjLAogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIHN0YXRpYyBpbnQg aTl4eF9nZXRfcmVmY2xrKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LApAQCAtMTM0NDAsNyArMTM0NDAsOCBAQCBpbnRlbF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlf cGxhbmUoY3J0YywgTlVMTCwgMCwgMCk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2Ny dGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGludGVsX2JlZ2lu X2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAgc3RydWN0IGRybV9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g Y3J0Yy0+ZGV2OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKQEAgLTEzNDU2LDcgKzEzNDU3LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5f Y3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlza2xfZGV0YWNoX3NjYWxlcnMo aW50ZWxfY3J0Yyk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21t aXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoY3J0Yyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbWRw L21kcDQvbWRwNF9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA0L21kcDRfY3J0 Yy5jCmluZGV4IGM0YmI5ZDljNzY2Ny4uNGRjMTU4ZWQyZTk1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbXNtL21kcC9tZHA0L21kcDRfY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9t c20vbWRwL21kcDQvbWRwNF9jcnRjLmMKQEAgLTMzNCwxMyArMzM0LDE1IEBAIHN0YXRpYyBpbnQg bWRwNF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIDA7 CiB9CiAKLXN0YXRpYyB2b2lkIG1kcDRfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRj ICpjcnRjKQorc3RhdGljIHZvaWQgbWRwNF9jcnRjX2F0b21pY19iZWdpbihzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCisJCQkJICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkK IHsKIAlzdHJ1Y3QgbWRwNF9jcnRjICptZHA0X2NydGMgPSB0b19tZHA0X2NydGMoY3J0Yyk7CiAJ REJHKCIlczogYmVnaW4iLCBtZHA0X2NydGMtPm5hbWUpOwogfQogCi1zdGF0aWMgdm9pZCBtZHA0 X2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIG1k cDRfY3J0Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSAgIHN0cnVj dCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CiAJc3RydWN0IG1kcDRfY3J0YyAq bWRwNF9jcnRjID0gdG9fbWRwNF9jcnRjKGNydGMpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21k cDVfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYwppbmRl eCBkZWEzZDJlNTU5YjEuLjRjMWRmNGU2ZTViYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9t ZHA1L21kcDVfY3J0Yy5jCkBAIC0zODgsMTMgKzM4OCwxNSBAQCBzdGF0aWMgaW50IG1kcDVfY3J0 Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXJldHVybiAwOwogfQogCi1z dGF0aWMgdm9pZCBtZHA1X2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK K3N0YXRpYyB2b2lkIG1kcDVfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRj LAorCQkJCSAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CiAJc3Ry dWN0IG1kcDVfY3J0YyAqbWRwNV9jcnRjID0gdG9fbWRwNV9jcnRjKGNydGMpOwogCURCRygiJXM6 IGJlZ2luIiwgbWRwNV9jcnRjLT5uYW1lKTsKIH0KIAotc3RhdGljIHZvaWQgbWRwNV9jcnRjX2F0 b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBtZHA1X2NydGNf YXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICBzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogCXN0cnVjdCBtZHA1X2NydGMgKm1kcDVfY3J0 YyA9IHRvX21kcDVfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2NydGMuYwppbmRleCA2NWQ2YmE2NjIx YWMuLjQ4Y2IxOTk0OWNhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNh cl9kdV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmMK QEAgLTQ5Niw3ICs0OTYsOCBAQCBzdGF0aWMgYm9vbCByY2FyX2R1X2NydGNfbW9kZV9maXh1cChz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyB2b2lkIHJj YXJfZHVfY3J0Y19hdG9taWNfYmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZv aWQgcmNhcl9kdV9jcnRjX2F0b21pY19iZWdpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkJ ICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3Qg ZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudCA9IGNydGMtPnN0YXRlLT5ldmVudDsKIAlz dHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0YyA9IHRvX3JjYXJfY3J0YyhjcnRjKTsKQEAgLTUxMiw3 ICs1MTMsOCBAQCBzdGF0aWMgdm9pZCByY2FyX2R1X2NydGNfYXRvbWljX2JlZ2luKHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIHJjYXJfZHVfY3J0Y19hdG9taWNf Zmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgcmNhcl9kdV9jcnRjX2F0 b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkJICAgICAgc3RydWN0IGRybV9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgcmNhcl9kdV9jcnRjICpyY3J0 YyA9IHRvX3JjYXJfY3J0YyhjcnRjKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0 aS9zdGlfZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2RybV9jcnRjLmMKaW5k ZXggNmI2NDFjNWEyZWM3Li4yNmU2M2JmMTRlZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9zdGkvc3RpX2RybV9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfZHJtX2Ny dGMuYwpAQCAtMTY0LDcgKzE2NCw4IEBAIHN0aV9kcm1fY3J0Y19tb2RlX3NldF9ub2ZiKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIAlzdGlfZHJtX2NydGNfbW9kZV9zZXQoY3J0YywgJmNydGMtPnN0 YXRlLT5hZGp1c3RlZF9tb2RlKTsKIH0KIAotc3RhdGljIHZvaWQgc3RpX2RybV9hdG9taWNfYmVn aW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgc3RpX2RybV9hdG9taWNfYmVn aW4oc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9s ZF9jcnRjX3N0YXRlKQogewogCXN0cnVjdCBzdGlfbWl4ZXIgKm1peGVyID0gdG9fc3RpX21peGVy KGNydGMpOwogCkBAIC0xNzgsNyArMTc5LDggQEAgc3RhdGljIHZvaWQgc3RpX2RybV9hdG9taWNf YmVnaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0KIH0KIAotc3RhdGljIHZvaWQgc3RpX2Ry bV9hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgc3RpX2Ry bV9hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSBzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogewogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdGVncmEvZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS90ZWdyYS9kYy5jCmluZGV4IGQ0NDc3 MDExNzNlNi4uMjRiMzgwOTBkZmQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEv ZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYwpAQCAtMTI3NSw3ICsxMjc1LDgg QEAgc3RhdGljIGludCB0ZWdyYV9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIHRlZ3JhX2NydGNfYXRvbWljX2JlZ2lu KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIHRlZ3JhX2NydGNfYXRvbWljX2Jl Z2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRl ICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgdGVncmFfZGMgKmRjID0gdG9fdGVncmFfZGMo Y3J0Yyk7CiAKQEAgLTEyODksNyArMTI5MCw4IEBAIHN0YXRpYyB2b2lkIHRlZ3JhX2NydGNfYXRv bWljX2JlZ2luKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIHRl Z3JhX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lk IHRlZ3JhX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICAg c3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgdGVncmFf ZGNfc3RhdGUgKnN0YXRlID0gdG9fZGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwogCXN0cnVjdCB0ZWdy YV9kYyAqZGMgPSB0b190ZWdyYV9kYyhjcnRjKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2Ry bV9jcnRjX2hlbHBlci5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGNfaGVscGVyLmgKaW5kZXggNDU2 MmJkMTJiYjRhLi44MDBlMGQxY2YzMmMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jcnRj X2hlbHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9jcnRjX2hlbHBlci5oCkBAIC0xMDgsOCAr MTA4LDEwIEBAIHN0cnVjdCBkcm1fY3J0Y19oZWxwZXJfZnVuY3MgewogCS8qIGF0b21pYyBoZWxw ZXJzICovCiAJaW50ICgqYXRvbWljX2NoZWNrKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkg ICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSk7Ci0Jdm9pZCAoKmF0b21pY19iZWdpbiko c3RydWN0IGRybV9jcnRjICpjcnRjKTsKLQl2b2lkICgqYXRvbWljX2ZsdXNoKShzdHJ1Y3QgZHJt X2NydGMgKmNydGMpOworCXZvaWQgKCphdG9taWNfYmVnaW4pKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKKwkJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSk7CisJdm9p ZCAoKmF0b21pY19mbHVzaCkoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJICAgICBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKTsKIH07CiAKIC8qKgotLSAKMi4xLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==