From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 04/22] drm/i915: Pass proper old/new states to intel_plane_atomic_check_with_state() Date: Mon, 10 Jul 2017 17:59:44 +0300 Message-ID: <20170710145944.29252-1-ville.syrjala@linux.intel.com> References: <20170706202442.5394-5-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: <20170706202442.5394-5-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkVs aW1pbmF0ZSBwbGFuZS0+c3RhdGUgYW5kIGNydGMtPnN0YXRlIHVzYWdlIGZyb20KaW50ZWxfcGxh bmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUoKSBhbmQgaXRzIGNhbGxlcnMuIEluc3RlYWQgcGFz cyB0aGUKcHJvcGVyIHN0YXRlcyBpbiBvciBkaWcgdGhlbSB1cCBmcm9tIHRoZSB0b3AgbGV2ZWwg YXRvbWljIHN0YXRlLgoKTm90ZSB0aGF0IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0 YXRlKCkgaXRzZWxmIGlzbid0IGFsbG93ZWQgdG8KdXNlIHRoZSB0b3AgbGV2ZWwgYXRvbWljIHN0 YXRlIGFzIHRoZXJlIGlzIG5vbmUgd2hlbiBpdCBnZXRzIGNhbGxlZCBmcm9tCnRoZSBsZWdhY3kg Y3Vyc29yIHNob3J0IGNpcmN1aXQgcGF0aC4KCnYyOiBSZW5hbWUgc29tZSB2YXJpYWJsZXMgZm9y IGVhc2llciBjb21wcmVoZW5zaW9uIChNYWFydGVuKQoKQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCA0OSArKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8IDEy ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8IDE2 ICsrKysrKysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCBl ZTc2ZmFiN2JiNmYuLjhlNmRjMTU5ZjY0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMKQEAgLTEwNyw3ICsxMDcsOSBAQCBpbnRlbF9wbGFuZV9kZXN0cm95X3N0 YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWRybV9hdG9taWNfaGVscGVyX3BsYW5lX2Rl c3Ryb3lfc3RhdGUocGxhbmUsIHN0YXRlKTsKIH0KIAotaW50IGludGVsX3BsYW5lX2F0b21pY19j aGVja193aXRoX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAoraW50 IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCisJCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3Bs YW5lX3N0YXRlLAogCQkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3N0YXRlKQog ewogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gaW50ZWxfc3RhdGUtPmJhc2UucGxhbmU7CkBA IC0xMjQsNyArMTI2LDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCSAqIGFueXRoaW5nIGRyaXZl ci1zcGVjaWZpYyB3ZSBuZWVkIHRvIHRlc3QgaW4gdGhhdCBjYXNlLCBzbwogCSAqIGp1c3QgcmV0 dXJuIHN1Y2Nlc3MuCiAJICovCi0JaWYgKCFpbnRlbF9zdGF0ZS0+YmFzZS5jcnRjICYmICFwbGFu ZS0+c3RhdGUtPmNydGMpCisJaWYgKCFpbnRlbF9zdGF0ZS0+YmFzZS5jcnRjICYmICFvbGRfcGxh bmVfc3RhdGUtPmJhc2UuY3J0YykKIAkJcmV0dXJuIDA7CiAKIAkvKiBDbGlwIGFsbCBwbGFuZXMg dG8gQ1JUQyBzaXplLCBvciAweDAgaWYgQ1JUQyBpcyBkaXNhYmxlZCAqLwpAQCAtMTk0LDE2ICsx OTYsMjEgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCWVsc2UKIAkJY3J0Y19zdGF0ZS0+YWN0aXZl X3BsYW5lcyAmPSB+QklUKGludGVsX3BsYW5lLT5pZCk7CiAKLQlyZXR1cm4gaW50ZWxfcGxhbmVf YXRvbWljX2NhbGNfY2hhbmdlcygmY3J0Y19zdGF0ZS0+YmFzZSwgc3RhdGUpOworCXJldHVybiBp bnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKG9sZF9jcnRjX3N0YXRlLAorCQkJCQkgICAg ICAgJmNydGNfc3RhdGUtPmJhc2UsCisJCQkJCSAgICAgICBvbGRfcGxhbmVfc3RhdGUsCisJCQkJ CSAgICAgICBzdGF0ZSk7CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNr KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpzdGF0ZSkKKwkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRl KQogewotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjOwotCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqZHJtX2NydGNfc3RhdGU7Ci0KLQljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFu ZS0+c3RhdGUtPmNydGM7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gbmV3X3Bs YW5lX3N0YXRlLT5zdGF0ZTsKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxh bmVfc3RhdGUgPQorCQlkcm1fYXRvbWljX2dldF9vbGRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5l KTsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBuZXdfcGxhbmVfc3RhdGUtPmNydGMgPzogb2xk X3BsYW5lX3N0YXRlLT5jcnRjOworCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKIAogCS8q CiAJICogQm90aCBjcnRjIGFuZCBwbGFuZS0+Y3J0YyBjb3VsZCBiZSBOVUxMIGlmIHdlJ3JlIHVw ZGF0aW5nIGEKQEAgLTIxNCwyOSArMjIxLDMzIEBAIHN0YXRpYyBpbnQgaW50ZWxfcGxhbmVfYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICghY3J0YykKIAkJcmV0dXJu IDA7CiAKLQlkcm1fY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3Rh dGUoc3RhdGUtPnN0YXRlLCBjcnRjKTsKLQlpZiAoV0FSTl9PTighZHJtX2NydGNfc3RhdGUpKQot CQlyZXR1cm4gLUVJTlZBTDsKKwlvbGRfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X29sZF9j cnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwluZXdfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0 X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAotCXJldHVybiBpbnRlbF9wbGFuZV9hdG9t aWNfY2hlY2tfd2l0aF9zdGF0ZSh0b19pbnRlbF9jcnRjX3N0YXRlKGRybV9jcnRjX3N0YXRlKSwK LQkJCQkJCSAgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKSk7CisJcmV0dXJuIGludGVsX3Bs YW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKHRvX2ludGVsX2NydGNfc3RhdGUob2xkX2NydGNf c3RhdGUpLAorCQkJCQkJICAgdG9faW50ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSksCisJ CQkJCQkgICB0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcGxhbmVfc3RhdGUpLAorCQkJCQkJICAg dG9faW50ZWxfcGxhbmVfc3RhdGUobmV3X3BsYW5lX3N0YXRlKSk7CiB9CiAKIHN0YXRpYyB2b2lk IGludGVsX3BsYW5lX2F0b21pY191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJ ICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3N0YXRlKQogeworCXN0cnVjdCBpbnRl bF9hdG9taWNfc3RhdGUgKnN0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKG9sZF9zdGF0ZS0+ c3RhdGUpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShwbGFuZSk7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZSA9Ci0JCXRv X2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRj ID0gcGxhbmUtPnN0YXRlLT5jcnRjID86IG9sZF9zdGF0ZS0+Y3J0YzsKKwljb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSA9CisJCWludGVsX2F0b21pY19nZXRf bmV3X3BsYW5lX3N0YXRlKHN0YXRlLCBpbnRlbF9wbGFuZSk7CisJc3RydWN0IGRybV9jcnRjICpj cnRjID0gbmV3X3BsYW5lX3N0YXRlLT5iYXNlLmNydGMgPzogb2xkX3N0YXRlLT5jcnRjOworCisJ aWYgKG5ld19wbGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlKSB7CisJCWNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSA9CisJCQlpbnRlbF9hdG9taWNfZ2V0X25ld19j cnRjX3N0YXRlKHN0YXRlLCB0b19pbnRlbF9jcnRjKGNydGMpKTsKIAotCWlmIChpbnRlbF9zdGF0 ZS0+YmFzZS52aXNpYmxlKSB7CiAJCXRyYWNlX2ludGVsX3VwZGF0ZV9wbGFuZShwbGFuZSwKIAkJ CQkJIHRvX2ludGVsX2NydGMoY3J0YykpOwogCiAJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUo aW50ZWxfcGxhbmUsCi0JCQkJCSAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksCi0J CQkJCSAgaW50ZWxfc3RhdGUpOworCQkJCQkgIG5ld19jcnRjX3N0YXRlLCBuZXdfcGxhbmVfc3Rh dGUpOwogCX0gZWxzZSB7CiAJCXRyYWNlX2ludGVsX2Rpc2FibGVfcGxhbmUocGxhbmUsCiAJCQkJ CSAgdG9faW50ZWxfY3J0YyhjcnRjKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggY2RmYTk1YmU0YjhlLi42NDQwNDc5ZDZmZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTExMDExLDcgKzExMDExLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfd21f bmVlZF91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJcmV0dXJuIGZhbHNlOwogfQog Ci1zdGF0aWMgYm9vbCBuZWVkc19zY2FsaW5nKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Rh dGUpCitzdGF0aWMgYm9vbCBuZWVkc19zY2FsaW5nKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqc3RhdGUpCiB7CiAJaW50IHNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5iYXNl LnNyYykgPj4gMTY7CiAJaW50IHNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+YmFzZS5z cmMpID4+IDE2OwpAQCAtMTEwMjEsNyArMTEwMjEsOSBAQCBzdGF0aWMgYm9vbCBuZWVkc19zY2Fs aW5nKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiAJcmV0dXJuIChzcmNfdyAhPSBk c3RfdyB8fCBzcmNfaCAhPSBkc3RfaCk7CiB9CiAKLWludCBpbnRlbF9wbGFuZV9hdG9taWNfY2Fs Y19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKK2ludCBpbnRlbF9w bGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZSwKKwkJCQkgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAorCQkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0 ZSwKIAkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CiAJc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjX3N0YXRlKTsKQEAgLTExMDMwLDEwICsxMTAzMiw4IEBAIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPnBsYW5l KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9Ci0JCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5i YXNlLnN0YXRlKTsKIAlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0 ZSk7Ci0JYm9vbCB3YXNfY3J0Y19lbmFibGVkID0gY3J0Yy0+c3RhdGUtPmFjdGl2ZTsKKwlib29s IHdhc19jcnRjX2VuYWJsZWQgPSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmU7CiAJYm9vbCBp c19jcnRjX2VuYWJsZWQgPSBjcnRjX3N0YXRlLT5hY3RpdmU7CiAJYm9vbCB0dXJuX29mZiwgdHVy bl9vbiwgdmlzaWJsZSwgd2FzX3Zpc2libGU7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg PSBwbGFuZV9zdGF0ZS0+ZmI7CkBAIC0xMzY2MCw2ICsxMzY2MCw4IEBAIGludGVsX2xlZ2FjeV9j dXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCW5ld19wbGFuZV9zdGF0ZS0+ Y3J0Y19oID0gY3J0Y19oOwogCiAJcmV0ID0gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhf c3RhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSksCisJCQkJCQkgIHRvX2ludGVs X2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpLCAvKiBGSVhNRSBuZWVkIGEgbmV3IGNydGMgc3RhdGU/ ICovCisJCQkJCQkgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSksCiAJCQkJCQkg IHRvX2ludGVsX3BsYW5lX3N0YXRlKG5ld19wbGFuZV9zdGF0ZSkpOwogCWlmIChyZXQpCiAJCWdv dG8gb3V0X2ZyZWU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGU5ZDYxYTAzYzQ2ZS4u ZWEzNmQxYTYxZTg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTIwNyw2ICsxMjA3 LDE0IEBAIGhkbWlfdG9fZGlnX3BvcnQoc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkpCiAJ cmV0dXJuIGNvbnRhaW5lcl9vZihpbnRlbF9oZG1pLCBzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 LCBoZG1pKTsKIH0KIAorc3RhdGljIGlubGluZSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKgor aW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUoc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUsCisJCQkJIHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7CisJcmV0dXJuIHRv X2ludGVsX3BsYW5lX3N0YXRlKGRybV9hdG9taWNfZ2V0X25ld19wbGFuZV9zdGF0ZSgmc3RhdGUt PmJhc2UsCisJCQkJCQkJCSAgICZwbGFuZS0+YmFzZSkpOworfQorCiBzdGF0aWMgaW5saW5lIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICoKIGludGVsX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUo c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkJc3RydWN0IGludGVsX2NydGMg KmNydGMpCkBAIC0xNDM5LDcgKzE0NDcsOSBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX3NldF9w cm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCQkgICAgc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqc3RhdGUsCiAJCQkJICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAog CQkJCSAgICB1aW50NjRfdCB2YWwpOwotaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5n ZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAoraW50IGludGVsX3BsYW5lX2F0 b21pY19jYWxjX2NoYW5nZXMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRj X3N0YXRlLAorCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkJ ICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlLAogCQkJ CSAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiAKIHZvaWQgYXNzZXJ0 X3BjaF90cmFuc2NvZGVyX2Rpc2FibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKQEAgLTE5OTAsNyArMjAwMCw5IEBAIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKmludGVsX3Bs YW5lX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CiB2b2lkIGludGVs X3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgICAg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpOwogZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfaGVscGVyX2Z1bmNzIGludGVsX3BsYW5lX2hlbHBlcl9mdW5jczsKLWludCBpbnRlbF9w bGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKK2ludCBpbnRlbF9wbGFuZV9hdG9taWNfY2hlY2tfd2l0aF9zdGF0ZShjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCisJCQkJCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwKIAkJCQkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpp bnRlbF9zdGF0ZSk7CiAKIC8qIGludGVsX2NvbG9yLmMgKi8KLS0gCjIuMTMuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==