From: Tvrtko Ursulin Subject: [PATCH 1/2] drm/i915: Infrastructure for supporting different GGTT views per object Date: Fri, 5 Dec 2014 12:11:45 +0000 Message-ID: <1417781506-1730-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1417618766-14845-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1417781506-1730-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 95BB46E711 for ; Fri, 5 Dec 2014 04:12:20 -0800 (PST) In-Reply-To: <1417781506-1730-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 IG9iamVjdHMgb25jZSB0aGUgbGFzdCBWTUEgaXMgdW5ib3VuZC4KCnY0OgogICAgKiBLZWVwIHNj YXR0ZXItZ2F0aGVyIHRhYmxlIGZvciBhbHRlcm5hdGl2ZSB2aWV3cyBwZXJzaXN0ZW50IGZvciB0 aGUKICAgICAgbGlmZXRpbWUgb2YgdGhlIFZNQS4KICAgICogUHJvcGFnYXRlIGJpbmRpbmcgZXJy b3JzIHRvIGNhbGxlcnMgYW5kIGhhbmRsZSBhcHByb3ByaWF0ZWx5LgoKRm9yOiBWSVotNDU0NApT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpD YzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgfCAgIDUgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICB8ICA0NiArKysrKysrKysrKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgfCAxMDEgKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAg ICB8ICAxMSArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMg fCAgIDkgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgICAgfCAg NzAgKysrKysrKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oICAgICAgICB8ICAyMiArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5jICAgICAgfCAgIDggKy0tCiA4IGZpbGVzIGNoYW5nZWQsIDIwNiBpbnNlcnRpb25zKCsp LCA2NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDZj MTY5MzkuLmJkMDgyODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xNTIs OCArMTUyLDkgQEAgZGVzY3JpYmVfb2JqKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaikKIAkJCXNlcV9wdXRzKG0sICIgKHBwIik7CiAJCWVsc2UKIAkJ CXNlcV9wdXRzKG0sICIgKGciKTsKLQkJc2VxX3ByaW50ZihtLCAiZ3R0IG9mZnNldDogJTA4bHgs IHNpemU6ICUwOGx4KSIsCi0JCQkgICB2bWEtPm5vZGUuc3RhcnQsIHZtYS0+bm9kZS5zaXplKTsK KwkJc2VxX3ByaW50ZihtLCAiZ3R0IG9mZnNldDogJTA4bHgsIHNpemU6ICUwOGx4LCB0eXBlOiAl dSkiLAorCQkJICAgdm1hLT5ub2RlLnN0YXJ0LCB2bWEtPm5vZGUuc2l6ZSwKKwkJCSAgIHZtYS0+ Z2d0dF92aWV3LnR5cGUpOwogCX0KIAlpZiAob2JqLT5zdG9sZW4pCiAJCXNlcV9wcmludGYobSwg IiAoc3RvbGVuOiAlMDhseCkiLCBvYmotPnN0b2xlbi0+c3RhcnQpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKaW5kZXggMDQ5NDgyZi4uYjJmNmY3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0yNTE0LDEwICsyNTE0LDIzIEBAIHZvaWQgaTkxNV9nZW1fdm1hX2Rlc3Ryb3koc3RydWN0IGk5 MTVfdm1hICp2bWEpOwogI2RlZmluZSBQSU5fR0xPQkFMIDB4NAogI2RlZmluZSBQSU5fT0ZGU0VU X0JJQVMgMHg4CiAjZGVmaW5lIFBJTl9PRkZTRVRfTUFTSyAofjQwOTUpCitpbnQgX19tdXN0X2No ZWNrIGk5MTVfZ2VtX29iamVjdF9waW5fdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLAorCQkJCQkgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCQkgIHVpbnQz Ml90IGFsaWdubWVudCwKKwkJCQkJICB1aW50NjRfdCBmbGFncywKKwkJCQkJICBjb25zdCBzdHJ1 Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpOworc3RhdGljIGlubGluZQogaW50IF9fbXVzdF9jaGVj ayBpOTE1X2dlbV9vYmplY3RfcGluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJ CQkJICAgICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHVpbnQzMl90 IGFsaWdubWVudCwKLQkJCQkgICAgIHVpbnQ2NF90IGZsYWdzKTsKKwkJCQkgICAgIHVpbnQ2NF90 IGZsYWdzKQoreworCXJldHVybiBpOTE1X2dlbV9vYmplY3RfcGluX3ZpZXcob2JqLCB2bSwgYWxp Z25tZW50LCBmbGFncywKKwkJCQkJCSZpOTE1X2dndHRfdmlld19ub3JtYWwpOworfQorCitpbnQg aTkxNV92bWFfYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgZW51bSBpOTE1X2NhY2hlX2xldmVs IGNhY2hlX2xldmVsLAorCQkgIHUzMiBmbGFncyk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfdm1h X3VuYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSk7CiBpbnQgaTkxNV9nZW1fb2JqZWN0X3B1dF9w YWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIHZvaWQgaTkxNV9nZW1fcmVs ZWFzZV9hbGxfbW1hcHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKQEAgLTI2 NzksMTggKzI2OTIsNDMgQEAgc3RydWN0IGRtYV9idWYgKmk5MTVfZ2VtX3ByaW1lX2V4cG9ydChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCit1bnNpZ25lZCBsb25nIGk5MTVfZ2VtX29ial9vZmZz ZXRfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbywKKwkJCQkgICAgICAgc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgIGVudW0gaTkxNV9nZ3R0X3ZpZXdf dHlwZSB2aWV3KTsKK3N0YXRpYyBpbmxpbmUKIHVuc2lnbmVkIGxvbmcgaTkxNV9nZW1fb2JqX29m ZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbywKLQkJCQkgIHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtKTsKKwkJCQkgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQor eworCXJldHVybiBpOTE1X2dlbV9vYmpfb2Zmc2V0X3ZpZXcobywgdm0sIEk5MTVfR0dUVF9WSUVX X05PUk1BTCk7Cit9CiBib29sIGk5MTVfZ2VtX29ial9ib3VuZF9hbnkoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm8pOwogYm9vbCBpOTE1X2dlbV9vYmpfYm91bmQoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm8sCiAJCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSk7CiB1bnNp Z25lZCBsb25nIGk5MTVfZ2VtX29ial9zaXplKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv LAogCQkJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKTsKK3N0cnVjdCBpOTE1X3ZtYSAq aTkxNV9nZW1fb2JqX3RvX3ZtYV92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CisJCQkJCSAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJCSAgY29uc3Qgc3Ry dWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KTsKK3N0YXRpYyBpbmxpbmUKIHN0cnVjdCBpOTE1X3Zt YSAqaTkxNV9nZW1fb2JqX3RvX3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAot CQkJCSAgICAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOworCQkJCSAgICAgc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCit7CisJcmV0dXJuIGk5MTVfZ2VtX29ial90b192bWFf dmlldyhvYmosIHZtLCAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKK30KKworc3RydWN0IGk5MTVf dm1hICoKK2k5MTVfZ2VtX29ial9sb29rdXBfb3JfY3JlYXRlX3ZtYV92aWV3KHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJICAgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAorCQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpOwor CitzdGF0aWMgaW5saW5lCiBzdHJ1Y3QgaTkxNV92bWEgKgogaTkxNV9nZW1fb2JqX2xvb2t1cF9v cl9jcmVhdGVfdm1hKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkJICBzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSk7CisJCQkJICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSkKK3sKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX2xvb2t1cF9vcl9jcmVhdGVfdm1hX3Zp ZXcob2JqLCB2bSwKKwkJCQkJCSZpOTE1X2dndHRfdmlld19ub3JtYWwpOworfQogCiBzdHJ1Y3Qg aTkxNV92bWEgKmk5MTVfZ2VtX29ial90b19nZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopOwogc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX29ial9pc19waW5uZWQoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg YzFjMTE0MS4uOTI0NGYwYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMDg3LDggKzIw ODcsNyBAQCBpOTE1X2dlbV9zaHJpbmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCQkJLyogRm9yIHRoZSB1bmJvdW5kIHBoYXNlLCB0aGlzIHNob3VsZCBiZSBhIG5vLW9wISAq LwogCQkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgdiwKIAkJCQkJCSAmb2JqLT52bWFf bGlzdCwgdm1hX2xpbmspCi0JCQkJaWYgKGk5MTVfdm1hX3VuYmluZCh2bWEpKQotCQkJCQlicmVh azsKKwkJCQlpOTE1X3ZtYV91bmJpbmQodm1hKTsKIAogCQkJaWYgKGk5MTVfZ2VtX29iamVjdF9w dXRfcGFnZXMob2JqKSA9PSAwKQogCQkJCWNvdW50ICs9IG9iai0+YmFzZS5zaXplID4+IFBBR0Vf U0hJRlQ7CkBAIC0yMjk3LDE3ICsyMjk2LDE0IEBAIHZvaWQgaTkxNV92bWFfbW92ZV90b19hY3Rp dmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X21v dmVfdG9faW5hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBvYmotPmJhc2UuZGV2LT5kZXZfcHJpdmF0 ZTsKLQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZt YTsKIAogCUJVR19PTihvYmotPmJhc2Uud3JpdGVfZG9tYWluICYgfkk5MTVfR0VNX0dQVV9ET01B SU5TKTsKIAlCVUdfT04oIW9iai0+YWN0aXZlKTsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnkodm0s ICZkZXZfcHJpdi0+dm1fbGlzdCwgZ2xvYmFsX2xpbmspIHsKLQkJdm1hID0gaTkxNV9nZW1fb2Jq X3RvX3ZtYShvYmosIHZtKTsKLQkJaWYgKHZtYSAmJiAhbGlzdF9lbXB0eSgmdm1hLT5tbV9saXN0 KSkKLQkJCWxpc3RfbW92ZV90YWlsKCZ2bWEtPm1tX2xpc3QsICZ2bS0+aW5hY3RpdmVfbGlzdCk7 CisJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCB2bWFfbGluaykgewor CQlpZiAoIWxpc3RfZW1wdHkoJnZtYS0+bW1fbGlzdCkpCisJCQlsaXN0X21vdmVfdGFpbCgmdm1h LT5tbV9saXN0LCAmdm1hLT52bS0+aW5hY3RpdmVfbGlzdCk7CiAJfQogCiAJaW50ZWxfZmJfb2Jq X2ZsdXNoKG9iaiwgdHJ1ZSk7CkBAIC0zMDYyLDEwICszMDU4LDggQEAgaW50IGk5MTVfdm1hX3Vu YmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAkgKiBjYXVzZSBtZW1vcnkgY29ycnVwdGlvbiB0 aHJvdWdoIHVzZS1hZnRlci1mcmVlLgogCSAqLwogCi0JLyogVGhyb3cgYXdheSB0aGUgYWN0aXZl IHJlZmVyZW5jZSBiZWZvcmUgbW92aW5nIHRvIHRoZSB1bmJvdW5kIGxpc3QgKi8KLQlpOTE1X2dl bV9vYmplY3RfcmV0aXJlKG9iaik7Ci0KLQlpZiAoaTkxNV9pc19nZ3R0KHZtYS0+dm0pKSB7CisJ aWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSAmJgorCSAgICB2bWEtPmdndHRfdmlldy50eXBlID09 IEk5MTVfR0dUVF9WSUVXX05PUk1BTCkgewogCQlpOTE1X2dlbV9vYmplY3RfZmluaXNoX2d0dChv YmopOwogCiAJCS8qIHJlbGVhc2UgdGhlIGZlbmNlIHJlZyBfYWZ0ZXJfIGZsdXNoaW5nICovCkBA IC0zMDc5LDggKzMwNzMsMTUgQEAgaW50IGk5MTVfdm1hX3VuYmluZChzdHJ1Y3QgaTkxNV92bWEg KnZtYSkKIAl2bWEtPnVuYmluZF92bWEodm1hKTsKIAogCWxpc3RfZGVsX2luaXQoJnZtYS0+bW1f bGlzdCk7Ci0JaWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSkKLQkJb2JqLT5tYXBfYW5kX2ZlbmNl YWJsZSA9IGZhbHNlOworCWlmIChpOTE1X2lzX2dndHQodm1hLT52bSkpIHsKKwkJaWYgKHZtYS0+ Z2d0dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfTk9STUFMKSB7CisJCQlvYmotPm1hcF9h bmRfZmVuY2VhYmxlID0gZmFsc2U7CisJCX0gZWxzZSBpZiAodm1hLT5nZ3R0X3ZpZXcucGFnZXMp IHsKKwkJCXNnX2ZyZWVfdGFibGUodm1hLT5nZ3R0X3ZpZXcucGFnZXMpOworCQkJa2ZyZWUodm1h LT5nZ3R0X3ZpZXcucGFnZXMpOworCQkJdm1hLT5nZ3R0X3ZpZXcucGFnZXMgPSBOVUxMOworCQl9 CisJfQogCiAJZHJtX21tX3JlbW92ZV9ub2RlKCZ2bWEtPm5vZGUpOwogCWk5MTVfZ2VtX3ZtYV9k ZXN0cm95KHZtYSk7CkBAIC0zMDg4LDYgKzMwODksMTAgQEAgaW50IGk5MTVfdm1hX3VuYmluZChz dHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAkvKiBTaW5jZSB0aGUgdW5ib3VuZCBsaXN0IGlzIGdsb2Jh bCwgb25seSBtb3ZlIHRvIHRoYXQgbGlzdCBpZgogCSAqIG5vIG1vcmUgVk1BcyBleGlzdC4gKi8K IAlpZiAobGlzdF9lbXB0eSgmb2JqLT52bWFfbGlzdCkpIHsKKwkJLyogVGhyb3cgYXdheSB0aGUg YWN0aXZlIHJlZmVyZW5jZSBiZWZvcmUKKwkJICogbW92aW5nIHRvIHRoZSB1bmJvdW5kIGxpc3Qu ICovCisJCWk5MTVfZ2VtX29iamVjdF9yZXRpcmUob2JqKTsKKwogCQlpOTE1X2dlbV9ndHRfZmlu aXNoX29iamVjdChvYmopOwogCQlsaXN0X21vdmVfdGFpbCgmb2JqLT5nbG9iYWxfbGlzdCwgJmRl dl9wcml2LT5tbS51bmJvdW5kX2xpc3QpOwogCX0KQEAgLTM0OTgsNyArMzUwMyw4IEBAIHN0YXRp YyBzdHJ1Y3QgaTkxNV92bWEgKgogaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0oc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCQkJICAgdW5zaWduZWQgYWxpZ25tZW50LAotCQkJICAgdWludDY0X3QgZmxhZ3MpCisJ CQkgICB1aW50NjRfdCBmbGFncywKKwkJCSAgIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyAq dmlldykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMzU0 OCw3ICszNTU0LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0oc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKIAogCWk5MTVfZ2VtX29iamVjdF9waW5fcGFnZXMob2JqKTsKIAot CXZtYSA9IGk5MTVfZ2VtX29ial9sb29rdXBfb3JfY3JlYXRlX3ZtYShvYmosIHZtKTsKKwl2bWEg PSBpOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0ZV92bWFfdmlldyhvYmosIHZtLCB2aWV3KTsK IAlpZiAoSVNfRVJSKHZtYSkpCiAJCWdvdG8gZXJyX3VucGluOwogCkBAIC0zNTc4LDE1ICszNTg0 LDE5IEBAIHNlYXJjaF9mcmVlOgogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3JlbW92ZV9ub2RlOwog CisJdHJhY2VfaTkxNV92bWFfYmluZCh2bWEsIGZsYWdzKTsKKwlyZXQgPSBpOTE1X3ZtYV9iaW5k KHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwKKwkJCSAgICBmbGFncyAmIFBJTl9HTE9CQUwgPyBHTE9C QUxfQklORCA6IDApOworCWlmIChyZXQpCisJCWdvdG8gZXJyX2ZpbmlzaF9ndHQ7CisKIAlsaXN0 X21vdmVfdGFpbCgmb2JqLT5nbG9iYWxfbGlzdCwgJmRldl9wcml2LT5tbS5ib3VuZF9saXN0KTsK IAlsaXN0X2FkZF90YWlsKCZ2bWEtPm1tX2xpc3QsICZ2bS0+aW5hY3RpdmVfbGlzdCk7CiAKLQl0 cmFjZV9pOTE1X3ZtYV9iaW5kKHZtYSwgZmxhZ3MpOwotCXZtYS0+YmluZF92bWEodm1hLCBvYmot PmNhY2hlX2xldmVsLAotCQkgICAgICBmbGFncyAmIFBJTl9HTE9CQUwgPyBHTE9CQUxfQklORCA6 IDApOwotCiAJcmV0dXJuIHZtYTsKIAorZXJyX2ZpbmlzaF9ndHQ6CisJaTkxNV9nZW1fZ3R0X2Zp bmlzaF9vYmplY3Qob2JqKTsKIGVycl9yZW1vdmVfbm9kZToKIAlkcm1fbW1fcmVtb3ZlX25vZGUo JnZtYS0+bm9kZSk7CiBlcnJfZnJlZV92bWE6CkBAIC0zNzg5LDkgKzM3OTksMTIgQEAgaW50IGk5 MTVfZ2VtX29iamVjdF9zZXRfY2FjaGVfbGV2ZWwoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKIAkJfQogCiAJCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwg dm1hX2xpbmspCi0JCQlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKQotCQkJ CXZtYS0+YmluZF92bWEodm1hLCBjYWNoZV9sZXZlbCwKLQkJCQkJCXZtYS0+Ym91bmQgJiBHTE9C QUxfQklORCk7CisJCQlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKSB7CisJ CQkJcmV0ID0gaTkxNV92bWFfYmluZCh2bWEsIGNhY2hlX2xldmVsLAorCQkJCQkJICAgIHZtYS0+ Ym91bmQgJiBHTE9CQUxfQklORCk7CisJCQkJaWYgKHJldCk7CisJCQkJCXJldHVybiByZXQ7CisJ CQl9CiAJfQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCB2bWFf bGluaykKQEAgLTQxNDQsMTAgKzQxNTcsMTEgQEAgaTkxNV92bWFfbWlzcGxhY2VkKHN0cnVjdCBp OTE1X3ZtYSAqdm1hLCB1aW50MzJfdCBhbGlnbm1lbnQsIHVpbnQ2NF90IGZsYWdzKQogfQogCiBp bnQKLWk5MTVfZ2VtX29iamVjdF9waW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwK LQkJICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAotCQkgICAgdWludDMyX3QgYWxp Z25tZW50LAotCQkgICAgdWludDY0X3QgZmxhZ3MpCitpOTE1X2dlbV9vYmplY3RfcGluX3ZpZXco c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCSBzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKKwkJCSB1aW50MzJfdCBhbGlnbm1lbnQsCisJCQkgdWludDY0X3QgZmxhZ3Ms CisJCQkgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG9iai0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hOwpAQCAtNDE2Myw3ICs0MTc3LDcgQEAgaTkxNV9nZW1fb2JqZWN0 X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmIChXQVJOX09OKChmbGFn cyAmIChQSU5fTUFQUEFCTEUgfCBQSU5fR0xPQkFMKSkgPT0gUElOX01BUFBBQkxFKSkKIAkJcmV0 dXJuIC1FSU5WQUw7CiAKLQl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fdm1hKG9iaiwgdm0pOworCXZt YSA9IGk5MTVfZ2VtX29ial90b192bWFfdmlldyhvYmosIHZtLCB2aWV3KTsKIAlpZiAodm1hKSB7 CiAJCWlmIChXQVJOX09OKHZtYS0+cGluX2NvdW50ID09IERSTV9JOTE1X0dFTV9PQkpFQ1RfTUFY X1BJTl9DT1VOVCkpCiAJCQlyZXR1cm4gLUVCVVNZOwpAQCAtNDE3Myw3ICs0MTg3LDggQEAgaTkx NV9nZW1fb2JqZWN0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJICAg ICAiYm8gaXMgYWxyZWFkeSBwaW5uZWQgd2l0aCBpbmNvcnJlY3QgYWxpZ25tZW50OiIKIAkJCSAg ICAgIiBvZmZzZXQ9JWx4LCByZXEuYWxpZ25tZW50PSV4LCByZXEubWFwX2FuZF9mZW5jZWFibGU9 JWQsIgogCQkJICAgICAiIG9iai0+bWFwX2FuZF9mZW5jZWFibGU9JWRcbiIsCi0JCQkgICAgIGk5 MTVfZ2VtX29ial9vZmZzZXQob2JqLCB2bSksIGFsaWdubWVudCwKKwkJCSAgICAgaTkxNV9nZW1f b2JqX29mZnNldF92aWV3KG9iaiwgdm0sIHZpZXctPnR5cGUpLAorCQkJICAgICBhbGlnbm1lbnQs CiAJCQkgICAgICEhKGZsYWdzICYgUElOX01BUFBBQkxFKSwKIAkJCSAgICAgb2JqLT5tYXBfYW5k X2ZlbmNlYWJsZSk7CiAJCQlyZXQgPSBpOTE1X3ZtYV91bmJpbmQodm1hKTsKQEAgLTQxODYsMTMg KzQyMDEsMTcgQEAgaTkxNV9nZW1fb2JqZWN0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAogCiAJYm91bmQgPSB2bWEgPyB2bWEtPmJvdW5kIDogMDsKIAlpZiAodm1hID09IE5V TEwgfHwgIWRybV9tbV9ub2RlX2FsbG9jYXRlZCgmdm1hLT5ub2RlKSkgewotCQl2bWEgPSBpOTE1 X2dlbV9vYmplY3RfYmluZF90b192bShvYmosIHZtLCBhbGlnbm1lbnQsIGZsYWdzKTsKKwkJdm1h ID0gaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0ob2JqLCB2bSwgYWxpZ25tZW50LAorCQkJCQkJ IGZsYWdzLCB2aWV3KTsKIAkJaWYgKElTX0VSUih2bWEpKQogCQkJcmV0dXJuIFBUUl9FUlIodm1h KTsKIAl9CiAKLQlpZiAoZmxhZ3MgJiBQSU5fR0xPQkFMICYmICEodm1hLT5ib3VuZCAmIEdMT0JB TF9CSU5EKSkKLQkJdm1hLT5iaW5kX3ZtYSh2bWEsIG9iai0+Y2FjaGVfbGV2ZWwsIEdMT0JBTF9C SU5EKTsKKwlpZiAoZmxhZ3MgJiBQSU5fR0xPQkFMICYmICEodm1hLT5ib3VuZCAmIEdMT0JBTF9C SU5EKSkgeworCQlyZXQgPSBpOTE1X3ZtYV9iaW5kKHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwgR0xP QkFMX0JJTkQpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CiAKIAlpZiAoKGJvdW5k IF4gdm1hLT5ib3VuZCkgJiBHTE9CQUxfQklORCkgewogCQlib29sIG1hcHBhYmxlLCBmZW5jZWFi bGU7CkBAIC00NTI4LDEyICs0NTQ3LDEzIEBAIHZvaWQgaTkxNV9nZW1fZnJlZV9vYmplY3Qoc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpnZW1fb2JqKQogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9w cml2KTsKIH0KIAotc3RydWN0IGk5MTVfdm1hICppOTE1X2dlbV9vYmpfdG9fdm1hKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkJICAgICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSkKK3N0cnVjdCBpOTE1X3ZtYSAqaTkxNV9nZW1fb2JqX3RvX3ZtYV92aWV3KHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJCSAgc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCisJCQkJCSAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogewog CXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52 bWFfbGlzdCwgdm1hX2xpbmspCi0JCWlmICh2bWEtPnZtID09IHZtKQorCQlpZiAodm1hLT52bSA9 PSB2bSAmJiB2bWEtPmdndHRfdmlldy50eXBlID09IHZpZXctPnR5cGUpCiAJCQlyZXR1cm4gdm1h OwogCiAJcmV0dXJuIE5VTEw7CkBAIC01MTQ3LDggKzUxNjcsOSBAQCBpOTE1X2dlbV9zaHJpbmtl cl9jb3VudChzdHJ1Y3Qgc2hyaW5rZXIgKnNocmlua2VyLCBzdHJ1Y3Qgc2hyaW5rX2NvbnRyb2wg KnNjKQogfQogCiAvKiBBbGwgdGhlIG5ldyBWTSBzdHVmZiAqLwotdW5zaWduZWQgbG9uZyBpOTE1 X2dlbV9vYmpfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvLAotCQkJCSAgc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCit1bnNpZ25lZCBsb25nIGk5MTVfZ2VtX29ial9v ZmZzZXRfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbywKKwkJCQkgICAgICAgc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgIGVudW0gaTkxNV9nZ3R0X3Zp ZXdfdHlwZSB2aWV3KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG8t PmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKQEAgLTUxNTYs NyArNTE3Nyw3IEBAIHVuc2lnbmVkIGxvbmcgaTkxNV9nZW1fb2JqX29mZnNldChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqbywKIAlXQVJOX09OKHZtID09ICZkZXZfcHJpdi0+bW0uYWxpYXNp bmdfcHBndHQtPmJhc2UpOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvLT52bWFfbGlz dCwgdm1hX2xpbmspIHsKLQkJaWYgKHZtYS0+dm0gPT0gdm0pCisJCWlmICh2bWEtPnZtID09IHZt ICYmIHZtYS0+Z2d0dF92aWV3LnR5cGUgPT0gdmlldykKIAkJCXJldHVybiB2bWEtPm5vZGUuc3Rh cnQ7CiAKIAl9CkBAIC01MzA3LDcgKzUzMjgsOSBAQCBzdHJ1Y3QgaTkxNV92bWEgKmk5MTVfZ2Vt X29ial90b19nZ3R0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJc3RydWN0IGk5 MTVfdm1hICp2bWE7CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm9iai0+dm1hX2xpc3Qs IHZtYV9saW5rKSB7Ci0JCWlmICh2bWEtPnZtID09IGdndHQpCisJCWlmICh2bWEtPnZtICE9IGdn dHQpCisJCQljb250aW51ZTsKKwkJaWYgKHZtYS0+Z2d0dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RU X1ZJRVdfTk9STUFMKQogCQkJcmV0dXJuIHZtYTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYwppbmRleCA1Y2QyYjk3Li40ZWY4ODE1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC01OTAsOSArNTkwLDE0IEBAIHN0YXRpYyBpbnQg ZG9fc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCWdvdG8gdW5waW5fb3V0 OwogCiAJdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQodG8tPmxlZ2FjeV9od19jdHgucmNzX3N0 YXRlKTsKLQlpZiAoISh2bWEtPmJvdW5kICYgR0xPQkFMX0JJTkQpKQotCQl2bWEtPmJpbmRfdm1h KHZtYSwgdG8tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5jYWNoZV9sZXZlbCwKLQkJCQlHTE9C QUxfQklORCk7CisJaWYgKCEodm1hLT5ib3VuZCAmIEdMT0JBTF9CSU5EKSkgeworCQlyZXQgPSBp OTE1X3ZtYV9iaW5kKHZtYSwKKwkJCQkgICAgdG8tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5j YWNoZV9sZXZlbCwKKwkJCQkgICAgR0xPQkFMX0JJTkQpOworCQkvKiBUaGlzIHNob3VsZG4ndCBl dmVyIGZhaWwuICovCisJCWlmIChXQVJOX09OQ0UocmV0LCAiR0dUVCBjb250ZXh0IGJpbmQgZmFp bGVkISIpKQorCQkJZ290byB1bnBpbl9vdXQ7CisJfQogCiAJaWYgKCF0by0+bGVnYWN5X2h3X2N0 eC5pbml0aWFsaXplZCB8fCBpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQodG8pKQogCQlod19m bGFncyB8PSBNSV9SRVNUT1JFX0lOSElCSVQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKaW5kZXggMGMyNWY2Mi4uMzkyN2Q5MyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMzYwLDkgKzM2MCwxMiBAQCBpOTE1X2dl bV9leGVjYnVmZmVyX3JlbG9jYXRlX2VudHJ5KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmosCiAJICogdGhyb3VnaCB0aGUgcHBndHQgZm9yIG5vbl9zZWN1cmUgYmF0Y2hidWZmZXJzLiAq LwogCWlmICh1bmxpa2VseShJU19HRU42KGRldikgJiYKIAkgICAgcmVsb2MtPndyaXRlX2RvbWFp biA9PSBJOTE1X0dFTV9ET01BSU5fSU5TVFJVQ1RJT04gJiYKLQkgICAgISh0YXJnZXRfdm1hLT5i b3VuZCAmIEdMT0JBTF9CSU5EKSkpCi0JCXRhcmdldF92bWEtPmJpbmRfdm1hKHRhcmdldF92bWEs IHRhcmdldF9pOTE1X29iai0+Y2FjaGVfbGV2ZWwsCi0JCQkJR0xPQkFMX0JJTkQpOworCSAgICAh KHRhcmdldF92bWEtPmJvdW5kICYgR0xPQkFMX0JJTkQpKSkgeworCQlyZXQgPSBpOTE1X3ZtYV9i aW5kKHRhcmdldF92bWEsIHRhcmdldF9pOTE1X29iai0+Y2FjaGVfbGV2ZWwsCisJCQkJICAgIEdM T0JBTF9CSU5EKTsKKwkJaWYgKFdBUk5fT05DRShyZXQsICJVbmV4cGVjdGVkIGZhaWx1cmUgdG8g YmluZCB0YXJnZXQgVk1BISIpKQorCQkJcmV0dXJuIHJldDsKKwl9CiAKIAkvKiBWYWxpZGF0ZSB0 aGF0IHRoZSB0YXJnZXQgaXMgaW4gYSB2YWxpZCByL3cgR1BVIGRvbWFpbiAqLwogCWlmICh1bmxp a2VseShyZWxvYy0+d3JpdGVfZG9tYWluICYgKHJlbG9jLT53cml0ZV9kb21haW4gLSAxKSkpIHsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggYWMwM2EzOC4uNzNjMWMwYiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTMwLDYgKzMwLDggQEAKICNpbmNsdWRl ICJpOTE1X3RyYWNlLmgiCiAjaW5jbHVkZSAiaW50ZWxfZHJ2LmgiCiAKK2NvbnN0IHN0cnVjdCBp OTE1X2dndHRfdmlldyBpOTE1X2dndHRfdmlld19ub3JtYWw7CisKIHN0YXRpYyB2b2lkIGJkd19z ZXR1cF9wcml2YXRlX3BwYXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHN0 YXRpYyB2b2lkIGNodl9zZXR1cF9wcml2YXRlX3BwYXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIApAQCAtMTM0MSw5ICsxMzQzLDEyIEBAIHZvaWQgaTkxNV9nZW1fcmVzdG9y ZV9ndHRfbWFwcGluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJLyogVGhlIGJpbmRfdm1h IGNvZGUgdHJpZXMgdG8gYmUgc21hcnQgYWJvdXQgdHJhY2tpbmcgbWFwcGluZ3MuCiAJCSAqIFVu Zm9ydHVuYXRlbHkgYWJvdmUsIHdlJ3ZlIGp1c3Qgd2lwZWQgb3V0IHRoZSBtYXBwaW5ncwogCQkg KiB3aXRob3V0IHRlbGxpbmcgb3VyIG9iamVjdCBhYm91dCBpdC4gU28gd2UgbmVlZCB0byBmYWtl IGl0LgorCQkgKgorCQkgKiBCaW5kIGlzIG5vdCBleHBlY3RlZCB0byBmYWlsIHNpbmNlIHRoaXMg aXMgb25seSBjYWxsZWQgb24KKwkJICogcmVzdW1lIGFuZCBhc3N1bXB0aW9uIGlzIGFsbCByZXF1 aXJlbWVudHMgZXhpc3QgYWxyZWFkeS4KIAkJICovCiAJCXZtYS0+Ym91bmQgJj0gfkdMT0JBTF9C SU5EOwotCQl2bWEtPmJpbmRfdm1hKHZtYSwgb2JqLT5jYWNoZV9sZXZlbCwgR0xPQkFMX0JJTkQp OworCQlXQVJOX09OKGk5MTVfdm1hX2JpbmQodm1hLCBvYmotPmNhY2hlX2xldmVsLCBHTE9CQUxf QklORCkpOwogCX0KIAogCkBAIC0xNTM4LDcgKzE1NDMsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dn dHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCUFHUF9VU0VSX01FTU9SWSA6IEFH UF9VU0VSX0NBQ0hFRF9NRU1PUlk7CiAKIAlCVUdfT04oIWk5MTVfaXNfZ2d0dCh2bWEtPnZtKSk7 Ci0JaW50ZWxfZ3R0X2luc2VydF9zZ19lbnRyaWVzKHZtYS0+b2JqLT5wYWdlcywgZW50cnksIGZs YWdzKTsKKwlpbnRlbF9ndHRfaW5zZXJ0X3NnX2VudHJpZXModm1hLT5nZ3R0X3ZpZXcucGFnZXMs IGVudHJ5LCBmbGFncyk7CiAJdm1hLT5ib3VuZCA9IEdMT0JBTF9CSU5EOwogfQogCkBAIC0xNTg4 LDcgKzE1OTMsNyBAQCBzdGF0aWMgdm9pZCBnZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLAogCWlmICghZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0IHx8IGZsYWdzICYgR0xPQkFM X0JJTkQpIHsKIAkJaWYgKCEodm1hLT5ib3VuZCAmIEdMT0JBTF9CSU5EKSB8fAogCQkgICAgKGNh Y2hlX2xldmVsICE9IG9iai0+Y2FjaGVfbGV2ZWwpKSB7Ci0JCQl2bWEtPnZtLT5pbnNlcnRfZW50 cmllcyh2bWEtPnZtLCBvYmotPnBhZ2VzLAorCQkJdm1hLT52bS0+aW5zZXJ0X2VudHJpZXModm1h LT52bSwgdm1hLT5nZ3R0X3ZpZXcucGFnZXMsCiAJCQkJCQl2bWEtPm5vZGUuc3RhcnQsCiAJCQkJ CQljYWNoZV9sZXZlbCwgZmxhZ3MpOwogCQkJdm1hLT5ib3VuZCB8PSBHTE9CQUxfQklORDsKQEAg LTE2MDAsNyArMTYwNSw3IEBAIHN0YXRpYyB2b2lkIGdndHRfYmluZF92bWEoc3RydWN0IGk5MTVf dm1hICp2bWEsCiAJICAgICAoY2FjaGVfbGV2ZWwgIT0gb2JqLT5jYWNoZV9sZXZlbCkpKSB7CiAJ CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICphcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBn dHQ7CiAJCWFwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcygmYXBwZ3R0LT5iYXNlLAotCQkJCQkg ICAgdm1hLT5vYmotPnBhZ2VzLAorCQkJCQkgICAgdm1hLT5nZ3R0X3ZpZXcucGFnZXMsCiAJCQkJ CSAgICB2bWEtPm5vZGUuc3RhcnQsCiAJCQkJCSAgICBjYWNoZV9sZXZlbCwgZmxhZ3MpOwogCQl2 bWEtPmJvdW5kIHw9IExPQ0FMX0JJTkQ7CkBAIC0yMTY1LDcgKzIxNzAsOCBAQCBpbnQgaTkxNV9n ZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIH0KIAogc3RhdGljIHN0cnVjdCBp OTE1X3ZtYSAqX19pOTE1X2dlbV92bWFfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCi0JCQkJCSAgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQorCQkJCQkg ICAgICBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkJICAgICAgY29uc3Qgc3Ry dWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogewogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hID0ga3ph bGxvYyhzaXplb2YoKnZtYSksIEdGUF9LRVJORUwpOwogCWlmICh2bWEgPT0gTlVMTCkKQEAgLTIx NzYsNiArMjE4Miw3IEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV92bWEgKl9faTkxNV9nZW1fdm1hX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCUlOSVRfTElTVF9IRUFEKCZ2 bWEtPmV4ZWNfbGlzdCk7CiAJdm1hLT52bSA9IHZtOwogCXZtYS0+b2JqID0gb2JqOworCXZtYS0+ Z2d0dF92aWV3ID0gKnZpZXc7CiAKIAlzd2l0Y2ggKElOVEVMX0lORk8odm0tPmRldiktPmdlbikg ewogCWNhc2UgOToKQEAgLTIyMTAsMTQgKzIyMTcsNTkgQEAgc3RhdGljIHN0cnVjdCBpOTE1X3Zt YSAqX19pOTE1X2dlbV92bWFfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiB9CiAKIHN0cnVjdCBpOTE1X3ZtYSAqCi1pOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0ZV92 bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJCQkgIHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtKQoraTkxNV9nZW1fb2JqX2xvb2t1cF9vcl9jcmVhdGVfdm1hX3ZpZXco c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCQkgICAgICAgc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmll dyAqdmlldykKIHsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAotCXZtYSA9IGk5MTVfZ2VtX29i al90b192bWEob2JqLCB2bSk7CisJdm1hID0gaTkxNV9nZW1fb2JqX3RvX3ZtYV92aWV3KG9iaiwg dm0sIHZpZXcpOwogCWlmICghdm1hKQotCQl2bWEgPSBfX2k5MTVfZ2VtX3ZtYV9jcmVhdGUob2Jq LCB2bSk7CisJCXZtYSA9IF9faTkxNV9nZW1fdm1hX2NyZWF0ZShvYmosIHZtLCB2aWV3KTsKIAog CXJldHVybiB2bWE7CiB9CisKK3N0YXRpYyBpbmxpbmUKK2ludCBpOTE1X2dldF92bWFfcGFnZXMo c3RydWN0IGk5MTVfdm1hICp2bWEpCit7CisJaWYgKHZtYS0+Z2d0dF92aWV3LnBhZ2VzKQorCQly ZXR1cm4gMDsKKworCWlmICh2bWEtPmdndHRfdmlldy50eXBlID09IEk5MTVfR0dUVF9WSUVXX05P Uk1BTCkKKwkJdm1hLT5nZ3R0X3ZpZXcucGFnZXMgPSB2bWEtPm9iai0+cGFnZXM7CisJZWxzZQor CQlXQVJOX09OQ0UoMSwgIkdHVFQgdmlldyAldSBub3QgaW1wbGVtZW50ZWQhXG4iLAorCQkJICB2 bWEtPmdndHRfdmlldy50eXBlKTsKKworCWlmICghdm1hLT5nZ3R0X3ZpZXcucGFnZXMpIHsKKwkJ RFJNX0VSUk9SKCJGYWlsZWQgdG8gZ2V0IHBhZ2VzIGZvciBWTUEgdmlldyB0eXBlICV1IVxuIiwK KwkJCSAgdm1hLT5nZ3R0X3ZpZXcudHlwZSk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCXJl dHVybiAwOworfQorCisvKioKKyAqIGk5MTVfdm1hX2JpbmQgLSBTZXRzIHVwIFBURXMgZm9yIGFu IFZNQSBpbiBpdCdzIGNvcnJlc3BvbmRpbmcgYWRkcmVzcyBzcGFjZS4KKyAqIEB2bWE6IFZNQSB0 byBtYXAKKyAqIEBjYWNoZV9sZXZlbDogbWFwcGluZyBjYWNoZSBsZXZlbAorICogQGZsYWdzOiBm bGFncyBsaWtlIGdsb2JhbCBvciBsb2NhbCBtYXBwaW5nCisgKgorICogRE1BIGFkZHJlc3NlcyBh cmUgdGFrZW4gZnJvbSB0aGUgc2NhdHRlci1nYXRoZXIgdGFibGUgb2YgdGhpcyBvYmplY3QgKG9y IG9mCisgKiB0aGlzIFZNQSBpbiBjYXNlIG9mIG5vbi1kZWZhdWx0IEdHVFQgdmlld3MpIGFuZCBQ VEUgZW50cmllcyBzZXQgdXAuCisgKiBOb3RlIHRoYXQgRE1BIGFkZHJlc3NlcyBhcmUgYWxzbyB0 aGUgb25seSBwYXJ0IG9mIHRoZSBTRyB0YWJsZSB3ZSBjYXJlIGFib3V0LgorICovCitpbnQgaTkx NV92bWFfYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNh Y2hlX2xldmVsLAorCQkgIHUzMiBmbGFncykKK3sKKwlpbnQgcmV0ID0gaTkxNV9nZXRfdm1hX3Bh Z2VzKHZtYSk7CisKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJdm1hLT5iaW5kX3ZtYSh2 bWEsIGNhY2hlX2xldmVsLCBmbGFncyk7CisKKwlyZXR1cm4gMDsKK30KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmgKaW5kZXggZGQ4NDlkZi4uZTM3N2M3ZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmgKQEAgLTEwOSw3ICsxMDksMjAgQEAgdHlwZWRlZiBnZW44X2d0dF9wdGVf dCBnZW44X3BwZ3R0X3BkZV90OwogI2RlZmluZSBHRU44X1BQQVRfRUxMQ19PVkVSUklERQkJKDA8 PDIpCiAjZGVmaW5lIEdFTjhfUFBBVChpLCB4KQkJCSgodWludDY0X3QpICh4KSA8PCAoKGkpICog OCkpCiAKK2VudW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB7CisJSTkxNV9HR1RUX1ZJRVdfTk9STUFM ID0gMCwKK307CisKK3N0cnVjdCBpOTE1X2dndHRfdmlldyB7CisJZW51bSBpOTE1X2dndHRfdmll d190eXBlIHR5cGU7CisKKwlzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzOworfTsKKworZXh0ZXJuIGNv bnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyBpOTE1X2dndHRfdmlld19ub3JtYWw7CisKIGVudW0g aTkxNV9jYWNoZV9sZXZlbDsKKwogLyoqCiAgKiBBIFZNQSByZXByZXNlbnRzIGEgR0VNIEJPIHRo YXQgaXMgYm91bmQgaW50byBhbiBhZGRyZXNzIHNwYWNlLiBUaGVyZWZvcmUsIGEKICAqIFZNQSdz IHByZXNlbmNlIGNhbm5vdCBiZSBndWFyYW50ZWVkIGJlZm9yZSBiaW5kaW5nLCBvciBhZnRlciB1 bmJpbmRpbmcgdGhlCkBAIC0xMjksNiArMTQyLDE1IEBAIHN0cnVjdCBpOTE1X3ZtYSB7CiAjZGVm aW5lIFBURV9SRUFEX09OTFkJKDE8PDIpCiAJdW5zaWduZWQgaW50IGJvdW5kIDogNDsKIAorCS8q KgorCSAqIFN1cHBvcnQgZGlmZmVyZW50IEdHVFQgdmlld3MgaW50byB0aGUgc2FtZSBvYmplY3Qu CisJICogVGhpcyBtZWFucyB0aGVyZSBjYW4gYmUgbXVsdGlwbGUgVk1BIG1hcHBpbmdzIHBlciBv YmplY3QgYW5kIHBlciBWTS4KKwkgKiBpOTE1X2dndHRfdmlld190eXBlIGlzIHVzZWQgdG8gZGlz dGluZ3Vpc2ggYmV0d2VlbiB0aG9zZSBlbnRyaWVzLgorCSAqIFRoZSBkZWZhdWx0IG9uZSBvZiB6 ZXJvIChJOTE1X0dHVFRfVklFV19OT1JNQUwpIGlzIGRlZmF1bHQgYW5kIGFsc28KKwkgKiBhc3N1 bWVkIGluIEdFTSBmdW5jdGlvbnMgd2hpY2ggdGFrZSBubyBnZ3R0IHZpZXcgcGFyYW1ldGVyLgor CSAqLworCXN0cnVjdCBpOTE1X2dndHRfdmlldyBnZ3R0X3ZpZXc7CisKIAkvKiogVGhpcyBvYmpl Y3QncyBwbGFjZSBvbiB0aGUgYWN0aXZlL2luYWN0aXZlIGxpc3RzICovCiAJc3RydWN0IGxpc3Rf aGVhZCBtbV9saXN0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCBj NDUzNmUxLi5mOTc0NzlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAg LTcxOCwxMCArNzE4LDggQEAgc3RhdGljIHUzMiBjYXB0dXJlX3Bpbm5lZF9ibyhzdHJ1Y3QgZHJt X2k5MTVfZXJyb3JfYnVmZmVyICplcnIsCiAJCQlicmVhazsKIAogCQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KHZtYSwgJm9iai0+dm1hX2xpc3QsIHZtYV9saW5rKQotCQkJaWYgKHZtYS0+dm0gPT0gdm0g JiYgdm1hLT5waW5fY291bnQgPiAwKSB7CisJCQlpZiAodm1hLT52bSA9PSB2bSAmJiB2bWEtPnBp bl9jb3VudCA+IDApCiAJCQkJY2FwdHVyZV9ibyhlcnIrKywgdm1hKTsKLQkJCQlicmVhazsKLQkJ CX0KIAl9CiAKIAlyZXR1cm4gZXJyIC0gZmlyc3Q7CkBAIC0xMDk2LDEwICsxMDk0LDggQEAgc3Rh dGljIHZvaWQgaTkxNV9nZW1fY2FwdHVyZV92bShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS5ib3VuZF9s aXN0LCBnbG9iYWxfbGlzdCkgewogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm9iai0+dm1h X2xpc3QsIHZtYV9saW5rKQotCQkJaWYgKHZtYS0+dm0gPT0gdm0gJiYgdm1hLT5waW5fY291bnQg PiAwKSB7CisJCQlpZiAodm1hLT52bSA9PSB2bSAmJiB2bWEtPnBpbl9jb3VudCA+IDApCiAJCQkJ aSsrOwotCQkJCWJyZWFrOwotCQkJfQogCX0KIAllcnJvci0+cGlubmVkX2JvX2NvdW50W25keF0g PSBpIC0gZXJyb3ItPmFjdGl2ZV9ib19jb3VudFtuZHhdOwogCi0tIAoyLjEuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK