From: Tvrtko Ursulin Subject: [PATCH 2/3] drm/i915: Infrastructure for supporting different GGTT views per object Date: Wed, 3 Dec 2014 14:59:25 +0000 Message-ID: <1417618766-14845-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1417618766-14845-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BC286E100 for ; Wed, 3 Dec 2014 11:24:05 -0800 (PST) In-Reply-To: <1417618766-14845-1-git-send-email-tvrtko.ursulin@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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaW5ncyBs aWtlIHJlbGlhYmxlIEdHVFQgbWFwcGluZ3MgYW5kIG1pcnJvcmVkIDJkLW9uLTNkIGRpc3BsYXkg d2lsbCBuZWVkCnRvIG1hcCBvYmplY3RzIGludG8gdGhlIHNhbWUgYWRkcmVzcyBzcGFjZSBtdWx0 aXBsZSB0aW1lcy4KCkFkZGVkIGEgR0dUVCB2aWV3IGNvbmNlcHQgYW5kIGxpbmtlZCBpdCB3aXRo IHRoZSBWTUEgdG8gZGlzdGluZ3Vpc2ggYmV0d2VlbgptdWx0aXBsZSBpbnN0YW5jZXMgcGVyIGFk ZHJlc3Mgc3BhY2UuCgpOZXcgb2JqZWN0cyBhbmQgR0VNIGZ1bmN0aW9ucyB3aGljaCBkbyBub3Qg dGFrZSB0aGlzIG5ldyB2aWV3IGFzIGEgcGFyYW1ldGVyCmFzc3VtZSB0aGUgZGVmYXVsdCBvZiB6 ZXJvIChJOTE1X0dHVFRfVklFV19OT1JNQUwpIHdoaWNoIHByZXNlcnZlcyB0aGUKcHJldmlvdXMg YmVoYXZpb3VyLgoKVGhpcyBub3cgbWVhbnMgdGhhdCBvYmplY3RzIGNhbiBoYXZlIG11bHRpcGxl IFZNQSBlbnRyaWVzIHNvIHRoZSBjb2RlIHdoaWNoCmFzc3VtZWQgdGhlcmUgd2lsbCBvbmx5IGJl IG9uZSBhbHNvIGhhZCB0byBiZSBtb2RpZmllZC4KCkFsdGVybmF0aXZlIEdHVFQgdmlld3MgYXJl IHN1cHBvc2VkIHRvIGJvcnJvdyBETUEgYWRkcmVzc2VzIGZyb20gb2JqLT5wYWdlcwp3aGljaCBp cyBETUEgbWFwcGVkIG9uIGZpcnN0IFZNQSBpbnN0YW50aWF0aW9uIGFuZCB1bm1hcHBlZCBvbiB0 aGUgbGFzdCBvbmUKZ29pbmcgYXdheS4KCnYyOgogICAgKiBSZW1vdmVkIHBlciB2aWV3IHNwZWNp YWwgY2FzaW5nIGluIGk5MTVfZ2VtX2dndHRfcHJlcGFyZSAvCiAgICAgIGZpbmlzaF9vYmplY3Qg aW4gZmF2b3VyIG9mIGNyZWF0aW5nIGFuZCBkZXN0cm95aW5nIERNQSBtYXBwaW5ncwogICAgICBv biBmaXJzdCBWTUEgaW5zdGFudGlhdGlvbiBhbmQgbGFzdCBWTUEgZGVzdHJ1Y3Rpb24uIChEYW5p ZWwgVmV0dGVyKQogICAgKiBTaW1wbGlmaWVkIGk5MTVfdm1hX3VuYmluZCB3aGljaCBkb2VzIG5v dCBuZWVkIHRvIGNvdW50IHRoZSBHR1RUIHZpZXdzLgogICAgICAoRGFuaWVsIFZldHRlcikKICAg ICogQWxzbyBtb3ZlZCBvYmotPm1hcF9hbmRfZmVuY2VhYmxlIHJlc2V0IHVuZGVyIHRoZSBzYW1l IGNoZWNrLgogICAgKiBDaGVja3BhdGNoIGNsZWFudXBzLgoKdjM6CiAgICAqIE9ubHkgcmV0aXJl IG9iamVjdHMgb25jZSB0aGUgbGFzdCBWTUEgaXMgdW5ib3VuZC4KCkZvcjogVklaLTQ1NDQKU2ln bmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6 IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAgIHwgIDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgICAgICAgICB8IDQ2ICsrKysrKysrKysrKysrKysrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8IDczICsrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j ICAgIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8 ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgICAgfCA2MSAr KysrKysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaCAgICAgICAgfCAyMiArKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1 X2Vycm9yLmMgICAgICB8ICA4ICstLS0KIDggZmlsZXMgY2hhbmdlZCwgMTU5IGluc2VydGlvbnMo KyksIDY0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXgg NmMxNjkzOS4uYmQwODI4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTE1 Miw4ICsxNTIsOSBAQCBkZXNjcmliZV9vYmooc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQkJc2VxX3B1dHMobSwgIiAocHAiKTsKIAkJZWxzZQog CQkJc2VxX3B1dHMobSwgIiAoZyIpOwotCQlzZXFfcHJpbnRmKG0sICJndHQgb2Zmc2V0OiAlMDhs eCwgc2l6ZTogJTA4bHgpIiwKLQkJCSAgIHZtYS0+bm9kZS5zdGFydCwgdm1hLT5ub2RlLnNpemUp OworCQlzZXFfcHJpbnRmKG0sICJndHQgb2Zmc2V0OiAlMDhseCwgc2l6ZTogJTA4bHgsIHR5cGU6 ICV1KSIsCisJCQkgICB2bWEtPm5vZGUuc3RhcnQsIHZtYS0+bm9kZS5zaXplLAorCQkJICAgdm1h LT5nZ3R0X3ZpZXcudHlwZSk7CiAJfQogCWlmIChvYmotPnN0b2xlbikKIAkJc2VxX3ByaW50Ziht LCAiIChzdG9sZW46ICUwOGx4KSIsIG9iai0+c3RvbGVuLT5zdGFydCk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAppbmRleCAwNDk0ODJmLi4wM2M4MTMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK QEAgLTI1MTQsMTAgKzI1MTQsMjMgQEAgdm9pZCBpOTE1X2dlbV92bWFfZGVzdHJveShzdHJ1Y3Qg aTkxNV92bWEgKnZtYSk7CiAjZGVmaW5lIFBJTl9HTE9CQUwgMHg0CiAjZGVmaW5lIFBJTl9PRkZT RVRfQklBUyAweDgKICNkZWZpbmUgUElOX09GRlNFVF9NQVNLICh+NDA5NSkKK2ludCBfX211c3Rf Y2hlY2sgaTkxNV9nZW1fb2JqZWN0X3Bpbl92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCisJCQkJCSAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJCSAgdWlu dDMyX3QgYWxpZ25tZW50LAorCQkJCQkgIHVpbnQ2NF90IGZsYWdzLAorCQkJCQkgIGNvbnN0IHN0 cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldyk7CitzdGF0aWMgaW5saW5lCiBpbnQgX19tdXN0X2No ZWNrIGk5MTVfZ2VtX29iamVjdF9waW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwK IAkJCQkgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgICAgdWludDMy X3QgYWxpZ25tZW50LAotCQkJCSAgICAgdWludDY0X3QgZmxhZ3MpOworCQkJCSAgICAgdWludDY0 X3QgZmxhZ3MpCit7CisJcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9waW5fdmlldyhvYmosIHZtLCBh bGlnbm1lbnQsIGZsYWdzLAorCQkJCQkJJmk5MTVfZ2d0dF92aWV3X25vcm1hbCk7Cit9CisKK3Zv aWQgaTkxNV92bWFfYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGNhY2hlX2xldmVsLAorCQkgICB1MzIgZmxhZ3MpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1 X3ZtYV91bmJpbmQoc3RydWN0IGk5MTVfdm1hICp2bWEpOwogaW50IGk5MTVfZ2VtX29iamVjdF9w dXRfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CiB2b2lkIGk5MTVfZ2Vt X3JlbGVhc2VfYWxsX21tYXBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CkBA IC0yNjc5LDE4ICsyNjkyLDQzIEBAIHN0cnVjdCBkbWFfYnVmICppOTE1X2dlbV9wcmltZV9leHBv cnQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2ZlbmNl cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAordW5zaWduZWQgbG9uZyBpOTE1X2dlbV9vYmpf b2Zmc2V0X3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCisJCQkJICAgICAgIHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCSAgICAgICBlbnVtIGk5MTVfZ2d0dF92 aWV3X3R5cGUgdmlldyk7CitzdGF0aWMgaW5saW5lCiB1bnNpZ25lZCBsb25nIGk5MTVfZ2VtX29i al9vZmZzZXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCi0JCQkJICBzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSk7CisJCQkJICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSkKK3sKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX29mZnNldF92aWV3KG8sIHZtLCBJOTE1X0dHVFRf VklFV19OT1JNQUwpOworfQogYm9vbCBpOTE1X2dlbV9vYmpfYm91bmRfYW55KHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvKTsKIGJvb2wgaTkxNV9nZW1fb2JqX2JvdW5kKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvLAogCQkJc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOwog dW5zaWduZWQgbG9uZyBpOTE1X2dlbV9vYmpfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqbywKIAkJCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSk7CitzdHJ1Y3QgaTkxNV92 bWEgKmk5MTVfZ2VtX29ial90b192bWFfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLAorCQkJCQkgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCQkgIGNvbnN0 IHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldyk7CitzdGF0aWMgaW5saW5lCiBzdHJ1Y3QgaTkx NV92bWEgKmk5MTVfZ2VtX29ial90b192bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aiwKLQkJCQkgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKTsKKwkJCQkgICAgIHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQoreworCXJldHVybiBpOTE1X2dlbV9vYmpfdG9f dm1hX3ZpZXcob2JqLCB2bSwgJmk5MTVfZ2d0dF92aWV3X25vcm1hbCk7Cit9CisKK3N0cnVjdCBp OTE1X3ZtYSAqCitpOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0ZV92bWFfdmlldyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJCSAgICAgICBzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKKwkJCQkgICAgICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3 KTsKKworc3RhdGljIGlubGluZQogc3RydWN0IGk5MTVfdm1hICoKIGk5MTVfZ2VtX29ial9sb29r dXBfb3JfY3JlYXRlX3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAotCQkJCSAg c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOworCQkJCSAgc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0pCit7CisJcmV0dXJuIGk5MTVfZ2VtX29ial9sb29rdXBfb3JfY3JlYXRlX3Zt YV92aWV3KG9iaiwgdm0sCisJCQkJCQkmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKK30KIAogc3Ry dWN0IGk5MTVfdm1hICppOTE1X2dlbV9vYmpfdG9fZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqKTsKIHN0YXRpYyBpbmxpbmUgYm9vbCBpOTE1X2dlbV9vYmpfaXNfcGlubmVkKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IGMxYzExNDEuLjk3NjU5N2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjA4Nyw4 ICsyMDg3LDcgQEAgaTkxNV9nZW1fc2hyaW5rKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJCS8qIEZvciB0aGUgdW5ib3VuZCBwaGFzZSwgdGhpcyBzaG91bGQgYmUgYSBuby1v cCEgKi8KIAkJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEsIHYsCiAJCQkJCQkgJm9iai0+ dm1hX2xpc3QsIHZtYV9saW5rKQotCQkJCWlmIChpOTE1X3ZtYV91bmJpbmQodm1hKSkKLQkJCQkJ YnJlYWs7CisJCQkJaTkxNV92bWFfdW5iaW5kKHZtYSk7CiAKIAkJCWlmIChpOTE1X2dlbV9vYmpl Y3RfcHV0X3BhZ2VzKG9iaikgPT0gMCkKIAkJCQljb3VudCArPSBvYmotPmJhc2Uuc2l6ZSA+PiBQ QUdFX1NISUZUOwpAQCAtMjI5NywxNyArMjI5NiwxNCBAQCB2b2lkIGk5MTVfdm1hX21vdmVfdG9f YWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogc3RhdGljIHZvaWQKIGk5MTVfZ2VtX29iamVj dF9tb3ZlX3RvX2luYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gb2JqLT5iYXNlLmRldi0+ZGV2X3By aXZhdGU7Ci0Jc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm07CiAJc3RydWN0IGk5MTVfdm1h ICp2bWE7CiAKIAlCVUdfT04ob2JqLT5iYXNlLndyaXRlX2RvbWFpbiAmIH5JOTE1X0dFTV9HUFVf RE9NQUlOUyk7CiAJQlVHX09OKCFvYmotPmFjdGl2ZSk7CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHZtLCAmZGV2X3ByaXYtPnZtX2xpc3QsIGdsb2JhbF9saW5rKSB7Ci0JCXZtYSA9IGk5MTVfZ2Vt X29ial90b192bWEob2JqLCB2bSk7Ci0JCWlmICh2bWEgJiYgIWxpc3RfZW1wdHkoJnZtYS0+bW1f bGlzdCkpCi0JCQlsaXN0X21vdmVfdGFpbCgmdm1hLT5tbV9saXN0LCAmdm0tPmluYWN0aXZlX2xp c3QpOworCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmsp IHsKKwkJaWYgKCFsaXN0X2VtcHR5KCZ2bWEtPm1tX2xpc3QpKQorCQkJbGlzdF9tb3ZlX3RhaWwo JnZtYS0+bW1fbGlzdCwgJnZtYS0+dm0tPmluYWN0aXZlX2xpc3QpOwogCX0KIAogCWludGVsX2Zi X29ial9mbHVzaChvYmosIHRydWUpOwpAQCAtMzA2MiwxMCArMzA1OCw4IEBAIGludCBpOTE1X3Zt YV91bmJpbmQoc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJICogY2F1c2UgbWVtb3J5IGNvcnJ1cHRp b24gdGhyb3VnaCB1c2UtYWZ0ZXItZnJlZS4KIAkgKi8KIAotCS8qIFRocm93IGF3YXkgdGhlIGFj dGl2ZSByZWZlcmVuY2UgYmVmb3JlIG1vdmluZyB0byB0aGUgdW5ib3VuZCBsaXN0ICovCi0JaTkx NV9nZW1fb2JqZWN0X3JldGlyZShvYmopOwotCi0JaWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSkg eworCWlmIChpOTE1X2lzX2dndHQodm1hLT52bSkgJiYKKwkgICAgdm1hLT5nZ3R0X3ZpZXcudHlw ZSA9PSBJOTE1X0dHVFRfVklFV19OT1JNQUwpIHsKIAkJaTkxNV9nZW1fb2JqZWN0X2ZpbmlzaF9n dHQob2JqKTsKIAogCQkvKiByZWxlYXNlIHRoZSBmZW5jZSByZWcgX2FmdGVyXyBmbHVzaGluZyAq LwpAQCAtMzA3OSw3ICszMDczLDggQEAgaW50IGk5MTVfdm1hX3VuYmluZChzdHJ1Y3QgaTkxNV92 bWEgKnZtYSkKIAl2bWEtPnVuYmluZF92bWEodm1hKTsKIAogCWxpc3RfZGVsX2luaXQoJnZtYS0+ bW1fbGlzdCk7Ci0JaWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSkKKwlpZiAoaTkxNV9pc19nZ3R0 KHZtYS0+dm0pICYmCisJICAgIHZtYS0+Z2d0dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdf Tk9STUFMKQogCQlvYmotPm1hcF9hbmRfZmVuY2VhYmxlID0gZmFsc2U7CiAKIAlkcm1fbW1fcmVt b3ZlX25vZGUoJnZtYS0+bm9kZSk7CkBAIC0zMDg4LDYgKzMwODMsMTAgQEAgaW50IGk5MTVfdm1h X3VuYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAkvKiBTaW5jZSB0aGUgdW5ib3VuZCBsaXN0 IGlzIGdsb2JhbCwgb25seSBtb3ZlIHRvIHRoYXQgbGlzdCBpZgogCSAqIG5vIG1vcmUgVk1BcyBl eGlzdC4gKi8KIAlpZiAobGlzdF9lbXB0eSgmb2JqLT52bWFfbGlzdCkpIHsKKwkJLyogVGhyb3cg YXdheSB0aGUgYWN0aXZlIHJlZmVyZW5jZSBiZWZvcmUKKwkJICogbW92aW5nIHRvIHRoZSB1bmJv dW5kIGxpc3QuICovCisJCWk5MTVfZ2VtX29iamVjdF9yZXRpcmUob2JqKTsKKwogCQlpOTE1X2dl bV9ndHRfZmluaXNoX29iamVjdChvYmopOwogCQlsaXN0X21vdmVfdGFpbCgmb2JqLT5nbG9iYWxf bGlzdCwgJmRldl9wcml2LT5tbS51bmJvdW5kX2xpc3QpOwogCX0KQEAgLTM0OTgsNyArMzQ5Nyw4 IEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV92bWEgKgogaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0o c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSAgIHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogCQkJICAgdW5zaWduZWQgYWxpZ25tZW50LAotCQkJICAgdWludDY0X3Qg ZmxhZ3MpCisJCQkgICB1aW50NjRfdCBmbGFncywKKwkJCSAgIGNvbnN0IHN0cnVjdCBpOTE1X2dn dHRfdmlldyAqdmlldykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRl djsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwpAQCAtMzU0OCw3ICszNTQ4LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0oc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAogCWk5MTVfZ2VtX29iamVjdF9waW5fcGFnZXMo b2JqKTsKIAotCXZtYSA9IGk5MTVfZ2VtX29ial9sb29rdXBfb3JfY3JlYXRlX3ZtYShvYmosIHZt KTsKKwl2bWEgPSBpOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0ZV92bWFfdmlldyhvYmosIHZt LCB2aWV3KTsKIAlpZiAoSVNfRVJSKHZtYSkpCiAJCWdvdG8gZXJyX3VucGluOwogCkBAIC0zNTgy LDcgKzM1ODIsNyBAQCBzZWFyY2hfZnJlZToKIAlsaXN0X2FkZF90YWlsKCZ2bWEtPm1tX2xpc3Qs ICZ2bS0+aW5hY3RpdmVfbGlzdCk7CiAKIAl0cmFjZV9pOTE1X3ZtYV9iaW5kKHZtYSwgZmxhZ3Mp OwotCXZtYS0+YmluZF92bWEodm1hLCBvYmotPmNhY2hlX2xldmVsLAorCWk5MTVfdm1hX2JpbmQo dm1hLCBvYmotPmNhY2hlX2xldmVsLAogCQkgICAgICBmbGFncyAmIFBJTl9HTE9CQUwgPyBHTE9C QUxfQklORCA6IDApOwogCiAJcmV0dXJuIHZtYTsKQEAgLTM3OTAsOCArMzc5MCw4IEBAIGludCBp OTE1X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xldmVsKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAKIAkJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCB2bWFf bGluaykKIAkJCWlmIChkcm1fbW1fbm9kZV9hbGxvY2F0ZWQoJnZtYS0+bm9kZSkpCi0JCQkJdm1h LT5iaW5kX3ZtYSh2bWEsIGNhY2hlX2xldmVsLAotCQkJCQkJdm1hLT5ib3VuZCAmIEdMT0JBTF9C SU5EKTsKKwkJCQlpOTE1X3ZtYV9iaW5kKHZtYSwgY2FjaGVfbGV2ZWwsCisJCQkJCSAgICAgIHZt YS0+Ym91bmQgJiBHTE9CQUxfQklORCk7CiAJfQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEs ICZvYmotPnZtYV9saXN0LCB2bWFfbGluaykKQEAgLTQxNDQsMTAgKzQxNDQsMTEgQEAgaTkxNV92 bWFfbWlzcGxhY2VkKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCB1aW50MzJfdCBhbGlnbm1lbnQsIHVp bnQ2NF90IGZsYWdzKQogfQogCiBpbnQKLWk5MTVfZ2VtX29iamVjdF9waW4oc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAotCQkgICAgdWludDMyX3QgYWxpZ25tZW50LAotCQkgICAgdWludDY0X3QgZmxhZ3MpCitpOTE1 X2dlbV9vYmplY3RfcGluX3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJ CSBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCSB1aW50MzJfdCBhbGlnbm1lbnQs CisJCQkgdWludDY0X3QgZmxhZ3MsCisJCQkgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2 aWV3KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG9iai0+YmFzZS5k ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwpAQCAtNDE2Myw3ICs0MTY0 LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq LAogCWlmIChXQVJOX09OKChmbGFncyAmIChQSU5fTUFQUEFCTEUgfCBQSU5fR0xPQkFMKSkgPT0g UElOX01BUFBBQkxFKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQl2bWEgPSBpOTE1X2dlbV9vYmpf dG9fdm1hKG9iaiwgdm0pOworCXZtYSA9IGk5MTVfZ2VtX29ial90b192bWFfdmlldyhvYmosIHZt LCB2aWV3KTsKIAlpZiAodm1hKSB7CiAJCWlmIChXQVJOX09OKHZtYS0+cGluX2NvdW50ID09IERS TV9JOTE1X0dFTV9PQkpFQ1RfTUFYX1BJTl9DT1VOVCkpCiAJCQlyZXR1cm4gLUVCVVNZOwpAQCAt NDE3Myw3ICs0MTc0LDggQEAgaTkxNV9nZW1fb2JqZWN0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAogCQkJICAgICAiYm8gaXMgYWxyZWFkeSBwaW5uZWQgd2l0aCBpbmNvcnJl Y3QgYWxpZ25tZW50OiIKIAkJCSAgICAgIiBvZmZzZXQ9JWx4LCByZXEuYWxpZ25tZW50PSV4LCBy ZXEubWFwX2FuZF9mZW5jZWFibGU9JWQsIgogCQkJICAgICAiIG9iai0+bWFwX2FuZF9mZW5jZWFi bGU9JWRcbiIsCi0JCQkgICAgIGk5MTVfZ2VtX29ial9vZmZzZXQob2JqLCB2bSksIGFsaWdubWVu dCwKKwkJCSAgICAgaTkxNV9nZW1fb2JqX29mZnNldF92aWV3KG9iaiwgdm0sIHZpZXctPnR5cGUp LAorCQkJICAgICBhbGlnbm1lbnQsCiAJCQkgICAgICEhKGZsYWdzICYgUElOX01BUFBBQkxFKSwK IAkJCSAgICAgb2JqLT5tYXBfYW5kX2ZlbmNlYWJsZSk7CiAJCQlyZXQgPSBpOTE1X3ZtYV91bmJp bmQodm1hKTsKQEAgLTQxODYsMTMgKzQxODgsMTQgQEAgaTkxNV9nZW1fb2JqZWN0X3BpbihzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiAJYm91bmQgPSB2bWEgPyB2bWEtPmJvdW5k IDogMDsKIAlpZiAodm1hID09IE5VTEwgfHwgIWRybV9tbV9ub2RlX2FsbG9jYXRlZCgmdm1hLT5u b2RlKSkgewotCQl2bWEgPSBpOTE1X2dlbV9vYmplY3RfYmluZF90b192bShvYmosIHZtLCBhbGln bm1lbnQsIGZsYWdzKTsKKwkJdm1hID0gaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0ob2JqLCB2 bSwgYWxpZ25tZW50LAorCQkJCQkJIGZsYWdzLCB2aWV3KTsKIAkJaWYgKElTX0VSUih2bWEpKQog CQkJcmV0dXJuIFBUUl9FUlIodm1hKTsKIAl9CiAKIAlpZiAoZmxhZ3MgJiBQSU5fR0xPQkFMICYm ICEodm1hLT5ib3VuZCAmIEdMT0JBTF9CSU5EKSkKLQkJdm1hLT5iaW5kX3ZtYSh2bWEsIG9iai0+ Y2FjaGVfbGV2ZWwsIEdMT0JBTF9CSU5EKTsKKwkJaTkxNV92bWFfYmluZCh2bWEsIG9iai0+Y2Fj aGVfbGV2ZWwsIEdMT0JBTF9CSU5EKTsKIAogCWlmICgoYm91bmQgXiB2bWEtPmJvdW5kKSAmIEdM T0JBTF9CSU5EKSB7CiAJCWJvb2wgbWFwcGFibGUsIGZlbmNlYWJsZTsKQEAgLTQ1MjgsMTIgKzQ1 MzEsMTMgQEAgdm9pZCBpOTE1X2dlbV9mcmVlX29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdlbV9vYmopCiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogfQogCi1zdHJ1Y3Qg aTkxNV92bWEgKmk5MTVfZ2VtX29ial90b192bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKLQkJCQkgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQorc3RydWN0IGk5 MTVfdm1hICppOTE1X2dlbV9vYmpfdG9fdm1hX3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKKwkJCQkJICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkJICBj b25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CiAJc3RydWN0IGk5MTVfdm1hICp2 bWE7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCB2bWFfbGluaykK LQkJaWYgKHZtYS0+dm0gPT0gdm0pCisJCWlmICh2bWEtPnZtID09IHZtICYmIHZtYS0+Z2d0dF92 aWV3LnR5cGUgPT0gdmlldy0+dHlwZSkKIAkJCXJldHVybiB2bWE7CiAKIAlyZXR1cm4gTlVMTDsK QEAgLTUxNDcsOCArNTE1MSw5IEBAIGk5MTVfZ2VtX3Nocmlua2VyX2NvdW50KHN0cnVjdCBzaHJp bmtlciAqc2hyaW5rZXIsIHN0cnVjdCBzaHJpbmtfY29udHJvbCAqc2MpCiB9CiAKIC8qIEFsbCB0 aGUgbmV3IFZNIHN0dWZmICovCi11bnNpZ25lZCBsb25nIGk5MTVfZ2VtX29ial9vZmZzZXQoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCi0JCQkJICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSkKK3Vuc2lnbmVkIGxvbmcgaTkxNV9nZW1fb2JqX29mZnNldF92aWV3KHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvLAorCQkJCSAgICAgICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKKwkJCQkgICAgICAgZW51bSBpOTE1X2dndHRfdmlld190eXBlIHZpZXcpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gby0+YmFzZS5kZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwpAQCAtNTE1Niw3ICs1MTYxLDcgQEAgdW5zaWdu ZWQgbG9uZyBpOTE1X2dlbV9vYmpfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv LAogCVdBUk5fT04odm0gPT0gJmRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dC0+YmFzZSk7CiAK IAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm8tPnZtYV9saXN0LCB2bWFfbGluaykgewotCQlp ZiAodm1hLT52bSA9PSB2bSkKKwkJaWYgKHZtYS0+dm0gPT0gdm0gJiYgdm1hLT5nZ3R0X3ZpZXcu dHlwZSA9PSB2aWV3KQogCQkJcmV0dXJuIHZtYS0+bm9kZS5zdGFydDsKIAogCX0KQEAgLTUzMDcs NyArNTMxMiw5IEBAIHN0cnVjdCBpOTE1X3ZtYSAqaTkxNV9nZW1fb2JqX3RvX2dndHQoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAogCWxp c3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmspIHsKLQkJaWYg KHZtYS0+dm0gPT0gZ2d0dCkKKwkJaWYgKHZtYS0+dm0gIT0gZ2d0dCkKKwkJCWNvbnRpbnVlOwor CQlpZiAodm1hLT5nZ3R0X3ZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19OT1JNQUwpCiAJCQly ZXR1cm4gdm1hOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmlu ZGV4IDVjZDJiOTcuLmMyZTZmMmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMKQEAgLTU5MSw4ICs1OTEsOCBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQodG8tPmxl Z2FjeV9od19jdHgucmNzX3N0YXRlKTsKIAlpZiAoISh2bWEtPmJvdW5kICYgR0xPQkFMX0JJTkQp KQotCQl2bWEtPmJpbmRfdm1hKHZtYSwgdG8tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5jYWNo ZV9sZXZlbCwKLQkJCQlHTE9CQUxfQklORCk7CisJCWk5MTVfdm1hX2JpbmQodm1hLCB0by0+bGVn YWN5X2h3X2N0eC5yY3Nfc3RhdGUtPmNhY2hlX2xldmVsLAorCQkJICAgICAgR0xPQkFMX0JJTkQp OwogCiAJaWYgKCF0by0+bGVnYWN5X2h3X2N0eC5pbml0aWFsaXplZCB8fCBpOTE1X2dlbV9jb250 ZXh0X2lzX2RlZmF1bHQodG8pKQogCQlod19mbGFncyB8PSBNSV9SRVNUT1JFX0lOSElCSVQ7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggMGMyNWY2Mi4u NTZhYzQ4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpA QCAtMzYxLDggKzM2MSw4IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVsb2NhdGVfZW50cnkoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlpZiAodW5saWtlbHkoSVNfR0VONihkZXYp ICYmCiAJICAgIHJlbG9jLT53cml0ZV9kb21haW4gPT0gSTkxNV9HRU1fRE9NQUlOX0lOU1RSVUNU SU9OICYmCiAJICAgICEodGFyZ2V0X3ZtYS0+Ym91bmQgJiBHTE9CQUxfQklORCkpKQotCQl0YXJn ZXRfdm1hLT5iaW5kX3ZtYSh0YXJnZXRfdm1hLCB0YXJnZXRfaTkxNV9vYmotPmNhY2hlX2xldmVs LAotCQkJCUdMT0JBTF9CSU5EKTsKKwkJaTkxNV92bWFfYmluZCh0YXJnZXRfdm1hLCB0YXJnZXRf aTkxNV9vYmotPmNhY2hlX2xldmVsLAorCQkJICAgICAgR0xPQkFMX0JJTkQpOwogCiAJLyogVmFs aWRhdGUgdGhhdCB0aGUgdGFyZ2V0IGlzIGluIGEgdmFsaWQgci93IEdQVSBkb21haW4gKi8KIAlp ZiAodW5saWtlbHkocmVsb2MtPndyaXRlX2RvbWFpbiAmIChyZWxvYy0+d3JpdGVfZG9tYWluIC0g MSkpKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGFjMDNhMzguLjAyZWFi ZjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMCw2ICszMCw4IEBACiAj aW5jbHVkZSAiaTkxNV90cmFjZS5oIgogI2luY2x1ZGUgImludGVsX2Rydi5oIgogCitjb25zdCBz dHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsOworCiBzdGF0aWMgdm9p ZCBiZHdfc2V0dXBfcHJpdmF0ZV9wcGF0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CiBzdGF0aWMgdm9pZCBjaHZfc2V0dXBfcHJpdmF0ZV9wcGF0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiAKQEAgLTc2LDcgKzc4LDcgQEAgc3RhdGljIGludCBzYW5pdGl6 ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVuYWJsZV9wcGd0dCkK IH0KIAogCi1zdGF0aWMgdm9pZCBwcGd0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwK K3N0YXRpYyB2b2lkIHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBzdHJ1Y3Qg c2dfdGFibGUgKnBhZ2VzLAogCQkJICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVs LAogCQkJICAgdTMyIGZsYWdzKTsKIHN0YXRpYyB2b2lkIHBwZ3R0X3VuYmluZF92bWEoc3RydWN0 IGk5MTVfdm1hICp2bWEpOwpAQCAtMTIwMCw3ICsxMjAyLDcgQEAgdm9pZCAgaTkxNV9wcGd0dF9y ZWxlYXNlKHN0cnVjdCBrcmVmICprcmVmKQogfQogCiBzdGF0aWMgdm9pZAotcHBndHRfYmluZF92 bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCitwcGd0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEg KnZtYSwgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkgICAgICAgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGNhY2hlX2xldmVsLAogCSAgICAgICB1MzIgZmxhZ3MpCiB7CkBAIC0xMjA4LDcgKzEyMTAs NyBAQCBwcGd0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAlpZiAodm1hLT5vYmot Pmd0X3JvKQogCQlmbGFncyB8PSBQVEVfUkVBRF9PTkxZOwogCi0Jdm1hLT52bS0+aW5zZXJ0X2Vu dHJpZXModm1hLT52bSwgdm1hLT5vYmotPnBhZ2VzLCB2bWEtPm5vZGUuc3RhcnQsCisJdm1hLT52 bS0+aW5zZXJ0X2VudHJpZXModm1hLT52bSwgcGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKIAkJCQlj YWNoZV9sZXZlbCwgZmxhZ3MpOwogfQogCkBAIC0xMzQzLDcgKzEzNDUsNyBAQCB2b2lkIGk5MTVf Z2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAqIHdp dGhvdXQgdGVsbGluZyBvdXIgb2JqZWN0IGFib3V0IGl0LiBTbyB3ZSBuZWVkIHRvIGZha2UgaXQu CiAJCSAqLwogCQl2bWEtPmJvdW5kICY9IH5HTE9CQUxfQklORDsKLQkJdm1hLT5iaW5kX3ZtYSh2 bWEsIG9iai0+Y2FjaGVfbGV2ZWwsIEdMT0JBTF9CSU5EKTsKKwkJaTkxNV92bWFfYmluZCh2bWEs IG9iai0+Y2FjaGVfbGV2ZWwsIEdMT0JBTF9CSU5EKTsKIAl9CiAKIApAQCAtMTUyOSw3ICsxNTMx LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogfQogCiAKLXN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9iaW5kX3ZtYShzdHJ1 Y3QgaTkxNV92bWEgKnZtYSwKK3N0YXRpYyB2b2lkIGk5MTVfZ2d0dF9iaW5kX3ZtYShzdHJ1Y3Qg aTkxNV92bWEgKnZtYSwgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJCSAgICAgICBlbnVtIGk5 MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkgICAgICAgdTMyIHVudXNlZCkKIHsKQEAg LTE1MzgsNyArMTU0MCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9iaW5kX3ZtYShzdHJ1Y3Qg aTkxNV92bWEgKnZtYSwKIAkJQUdQX1VTRVJfTUVNT1JZIDogQUdQX1VTRVJfQ0FDSEVEX01FTU9S WTsKIAogCUJVR19PTighaTkxNV9pc19nZ3R0KHZtYS0+dm0pKTsKLQlpbnRlbF9ndHRfaW5zZXJ0 X3NnX2VudHJpZXModm1hLT5vYmotPnBhZ2VzLCBlbnRyeSwgZmxhZ3MpOworCWludGVsX2d0dF9p bnNlcnRfc2dfZW50cmllcyhwYWdlcywgZW50cnksIGZsYWdzKTsKIAl2bWEtPmJvdW5kID0gR0xP QkFMX0JJTkQ7CiB9CiAKQEAgLTE1NjIsNyArMTU2NCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2d0 dF91bmJpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWludGVsX2d0dF9jbGVhcl9yYW5n ZShmaXJzdCwgc2l6ZSk7CiB9CiAKLXN0YXRpYyB2b2lkIGdndHRfYmluZF92bWEoc3RydWN0IGk5 MTVfdm1hICp2bWEsCitzdGF0aWMgdm9pZCBnZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLCBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAogCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwg Y2FjaGVfbGV2ZWwsCiAJCQkgIHUzMiBmbGFncykKIHsKQEAgLTE1ODgsNyArMTU5MCw3IEBAIHN0 YXRpYyB2b2lkIGdndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJaWYgKCFkZXZf cHJpdi0+bW0uYWxpYXNpbmdfcHBndHQgfHwgZmxhZ3MgJiBHTE9CQUxfQklORCkgewogCQlpZiAo ISh2bWEtPmJvdW5kICYgR0xPQkFMX0JJTkQpIHx8CiAJCSAgICAoY2FjaGVfbGV2ZWwgIT0gb2Jq LT5jYWNoZV9sZXZlbCkpIHsKLQkJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIG9i ai0+cGFnZXMsCisJCQl2bWEtPnZtLT5pbnNlcnRfZW50cmllcyh2bWEtPnZtLCBwYWdlcywKIAkJ CQkJCXZtYS0+bm9kZS5zdGFydCwKIAkJCQkJCWNhY2hlX2xldmVsLCBmbGFncyk7CiAJCQl2bWEt PmJvdW5kIHw9IEdMT0JBTF9CSU5EOwpAQCAtMTYwMCw3ICsxNjAyLDcgQEAgc3RhdGljIHZvaWQg Z2d0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkgICAgIChjYWNoZV9sZXZlbCAh PSBvYmotPmNhY2hlX2xldmVsKSkpIHsKIAkJc3RydWN0IGk5MTVfaHdfcHBndHQgKmFwcGd0dCA9 IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKIAkJYXBwZ3R0LT5iYXNlLmluc2VydF9lbnRy aWVzKCZhcHBndHQtPmJhc2UsCi0JCQkJCSAgICB2bWEtPm9iai0+cGFnZXMsCisJCQkJCSAgICBw YWdlcywKIAkJCQkJICAgIHZtYS0+bm9kZS5zdGFydCwKIAkJCQkJICAgIGNhY2hlX2xldmVsLCBm bGFncyk7CiAJCXZtYS0+Ym91bmQgfD0gTE9DQUxfQklORDsKQEAgLTIxNjUsNyArMjE2Nyw4IEBA IGludCBpOTE1X2dlbV9ndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogfQogCiBzdGF0 aWMgc3RydWN0IGk5MTVfdm1hICpfX2k5MTVfZ2VtX3ZtYV9jcmVhdGUoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKLQkJCQkJICAgICAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0pCisJCQkJCSAgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCQkgICAg ICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CiAJc3RydWN0IGk5MTVfdm1h ICp2bWEgPSBremFsbG9jKHNpemVvZigqdm1hKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHZtYSA9PSBO VUxMKQpAQCAtMjE3Niw2ICsyMTc5LDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X3ZtYSAqX19pOTE1 X2dlbV92bWFfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJSU5JVF9M SVNUX0hFQUQoJnZtYS0+ZXhlY19saXN0KTsKIAl2bWEtPnZtID0gdm07CiAJdm1hLT5vYmogPSBv Ymo7CisJdm1hLT5nZ3R0X3ZpZXcgPSAqdmlldzsKIAogCXN3aXRjaCAoSU5URUxfSU5GTyh2bS0+ ZGV2KS0+Z2VuKSB7CiAJY2FzZSA5OgpAQCAtMjIxMCwxNCArMjIxNCw0MyBAQCBzdGF0aWMgc3Ry dWN0IGk5MTVfdm1hICpfX2k5MTVfZ2VtX3ZtYV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwKIH0KIAogc3RydWN0IGk5MTVfdm1hICoKLWk5MTVfZ2VtX29ial9sb29rdXBf b3JfY3JlYXRlX3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAotCQkJCSAgc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCitpOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0 ZV92bWFfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJCSAgICAgICBz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgICAgICAgY29uc3Qgc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICp2aWV3KQogewogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCi0Jdm1hID0g aTkxNV9nZW1fb2JqX3RvX3ZtYShvYmosIHZtKTsKKwl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fdm1h X3ZpZXcob2JqLCB2bSwgdmlldyk7CiAJaWYgKCF2bWEpCi0JCXZtYSA9IF9faTkxNV9nZW1fdm1h X2NyZWF0ZShvYmosIHZtKTsKKwkJdm1hID0gX19pOTE1X2dlbV92bWFfY3JlYXRlKG9iaiwgdm0s IHZpZXcpOwogCiAJcmV0dXJuIHZtYTsKIH0KKworc3RhdGljIGlubGluZQorc3RydWN0IHNnX3Rh YmxlICppOTE1X2dndHRfdmlld19wYWdlcyhzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3sKKwlzdHJ1 Y3Qgc2dfdGFibGUgKnBhZ2VzID0gRVJSX1BUUigtRUlOVkFMKTsKKworCWlmICh2bWEtPmdndHRf dmlldy50eXBlID09IEk5MTVfR0dUVF9WSUVXX05PUk1BTCkKKwkJcGFnZXMgPSB2bWEtPm9iai0+ cGFnZXM7CisJZWxzZQorCQlXQVJOKDEsICJOb3QgaW1wbGVtZW50ZWQhXG4iKTsKKworCXJldHVy biBwYWdlczsKK30KKwordm9pZCBpOTE1X3ZtYV9iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBl bnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCisJCSAgIHUzMiBmbGFncykKK3sKKwlz dHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzID0gaTkxNV9nZ3R0X3ZpZXdfcGFnZXModm1hKTsKKworCWlm IChwYWdlcyAmJiAhSVNfRVJSKHBhZ2VzKSkgeworCQl2bWEtPmJpbmRfdm1hKHZtYSwgcGFnZXMs IGNhY2hlX2xldmVsLCBmbGFncyk7CisKKwkJaWYgKHZtYS0+Z2d0dF92aWV3LnR5cGUgIT0gSTkx NV9HR1RUX1ZJRVdfTk9STUFMKSB7CisJCQlzZ19mcmVlX3RhYmxlKHBhZ2VzKTsKKwkJCWtmcmVl KHBhZ2VzKTsKKwkJfQorCX0KK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXgg ZGQ4NDlkZi4uYTZhMGUyNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTEw OSw3ICsxMDksMTggQEAgdHlwZWRlZiBnZW44X2d0dF9wdGVfdCBnZW44X3BwZ3R0X3BkZV90Owog I2RlZmluZSBHRU44X1BQQVRfRUxMQ19PVkVSUklERQkJKDA8PDIpCiAjZGVmaW5lIEdFTjhfUFBB VChpLCB4KQkJCSgodWludDY0X3QpICh4KSA8PCAoKGkpICogOCkpCiAKK2VudW0gaTkxNV9nZ3R0 X3ZpZXdfdHlwZSB7CisJSTkxNV9HR1RUX1ZJRVdfTk9STUFMID0gMCwKK307CisKK3N0cnVjdCBp OTE1X2dndHRfdmlldyB7CisJZW51bSBpOTE1X2dndHRfdmlld190eXBlIHR5cGU7Cit9OworCitl eHRlcm4gY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3IGk5MTVfZ2d0dF92aWV3X25vcm1hbDsK KwogZW51bSBpOTE1X2NhY2hlX2xldmVsOworCiAvKioKICAqIEEgVk1BIHJlcHJlc2VudHMgYSBH RU0gQk8gdGhhdCBpcyBib3VuZCBpbnRvIGFuIGFkZHJlc3Mgc3BhY2UuIFRoZXJlZm9yZSwgYQog ICogVk1BJ3MgcHJlc2VuY2UgY2Fubm90IGJlIGd1YXJhbnRlZWQgYmVmb3JlIGJpbmRpbmcsIG9y IGFmdGVyIHVuYmluZGluZyB0aGUKQEAgLTEyOSw2ICsxNDAsMTUgQEAgc3RydWN0IGk5MTVfdm1h IHsKICNkZWZpbmUgUFRFX1JFQURfT05MWQkoMTw8MikKIAl1bnNpZ25lZCBpbnQgYm91bmQgOiA0 OwogCisJLyoqCisJICogU3VwcG9ydCBkaWZmZXJlbnQgR0dUVCB2aWV3cyBpbnRvIHRoZSBzYW1l IG9iamVjdC4KKwkgKiBUaGlzIG1lYW5zIHRoZXJlIGNhbiBiZSBtdWx0aXBsZSBWTUEgbWFwcGlu Z3MgcGVyIG9iamVjdCBhbmQgcGVyIFZNLgorCSAqIGk5MTVfZ2d0dF92aWV3X3R5cGUgaXMgdXNl ZCB0byBkaXN0aW5ndWlzaCBiZXR3ZWVuIHRob3NlIGVudHJpZXMuCisJICogVGhlIGRlZmF1bHQg b25lIG9mIHplcm8gKEk5MTVfR0dUVF9WSUVXX05PUk1BTCkgaXMgZGVmYXVsdCBhbmQgYWxzbwor CSAqIGFzc3VtZWQgaW4gR0VNIGZ1bmN0aW9ucyB3aGljaCB0YWtlIG5vIGdndHQgdmlldyBwYXJh bWV0ZXIuCisJICovCisJc3RydWN0IGk5MTVfZ2d0dF92aWV3IGdndHRfdmlldzsKKwogCS8qKiBU aGlzIG9iamVjdCdzIHBsYWNlIG9uIHRoZSBhY3RpdmUvaW5hY3RpdmUgbGlzdHMgKi8KIAlzdHJ1 Y3QgbGlzdF9oZWFkIG1tX2xpc3Q7CiAKQEAgLTE2MCw3ICsxODAsNyBAQCBzdHJ1Y3QgaTkxNV92 bWEgewogCSAqIHNldHRpbmcgdGhlIHZhbGlkIFBURSBlbnRyaWVzIHRvIGEgcmVzZXJ2ZWQgc2Ny YXRjaCBwYWdlLiAqLwogCXZvaWQgKCp1bmJpbmRfdm1hKShzdHJ1Y3QgaTkxNV92bWEgKnZtYSk7 CiAJLyogTWFwIGFuIG9iamVjdCBpbnRvIGFuIGFkZHJlc3Mgc3BhY2Ugd2l0aCB0aGUgZ2l2ZW4g Y2FjaGUgZmxhZ3MuICovCi0Jdm9pZCAoKmJpbmRfdm1hKShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwK Kwl2b2lkICgqYmluZF92bWEpKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBzdHJ1Y3Qgc2dfdGFibGUg KnBhZ2VzLAogCQkJIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKIAkJCSB1MzIg ZmxhZ3MpOwogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IGM0NTM2 ZTEuLmY5NzQ3OWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNzE4 LDEwICs3MTgsOCBAQCBzdGF0aWMgdTMyIGNhcHR1cmVfcGlubmVkX2JvKHN0cnVjdCBkcm1faTkx NV9lcnJvcl9idWZmZXIgKmVyciwKIAkJCWJyZWFrOwogCiAJCWxpc3RfZm9yX2VhY2hfZW50cnko dm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmspCi0JCQlpZiAodm1hLT52bSA9PSB2bSAmJiB2 bWEtPnBpbl9jb3VudCA+IDApIHsKKwkJCWlmICh2bWEtPnZtID09IHZtICYmIHZtYS0+cGluX2Nv dW50ID4gMCkKIAkJCQljYXB0dXJlX2JvKGVycisrLCB2bWEpOwotCQkJCWJyZWFrOwotCQkJfQog CX0KIAogCXJldHVybiBlcnIgLSBmaXJzdDsKQEAgLTEwOTYsMTAgKzEwOTQsOCBAQCBzdGF0aWMg dm9pZCBpOTE1X2dlbV9jYXB0dXJlX3ZtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAogCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3Qs IGdsb2JhbF9saXN0KSB7CiAJCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlz dCwgdm1hX2xpbmspCi0JCQlpZiAodm1hLT52bSA9PSB2bSAmJiB2bWEtPnBpbl9jb3VudCA+IDAp IHsKKwkJCWlmICh2bWEtPnZtID09IHZtICYmIHZtYS0+cGluX2NvdW50ID4gMCkKIAkJCQlpKys7 Ci0JCQkJYnJlYWs7Ci0JCQl9CiAJfQogCWVycm9yLT5waW5uZWRfYm9fY291bnRbbmR4XSA9IGkg LSBlcnJvci0+YWN0aXZlX2JvX2NvdW50W25keF07CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=