From: Tvrtko Ursulin Subject: [PATCH 3/5] drm/i915/skl: Support secondary (rotated) frame buffer mapping Date: Mon, 2 Mar 2015 14:43:50 +0000 Message-ID: <1425307432-4955-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425307432-4955-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 A28FE6E473 for ; Mon, 2 Mar 2015 06:44:06 -0800 (PST) In-Reply-To: <1425307432-4955-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCjkwLzI3MCBy b3RhdGVkIHNjYW5vdXQgbmVlZHMgYSByb3RhdGVkIEdUVCB2aWV3IG9mIHRoZSBmcmFtZWJ1ZmZl ci4KClRoaXMgaXMgcHV0IGluIGEgc2VwYXJhdGUgVk1BIHdpdGggYSBkZWRpY2F0ZWQgZ2d0dF92 aWV3IGFuZCB3aXJlZCBzdWNocyB0aGF0Cml0IGlzIGNyZWF0ZWQgd2hlbiBhIGZyYW1lYnVmZmVy IGlzIHBpbm5lZCB0byBhIDkwLzI3MCByb3RhdGVkIHBsYW5lLgoKUm90YXRpb24gaXMgb25seSBw b3NzaWJsZSB3aXRoIFliL1lmIGJ1ZmZlcnMgYW5kIGVycm9yIGlzIHByb3BhZ2F0ZWQgdG8KdXNl ciBzcGFjZSBpbiBjYXNlIG9mIGEgbWlzbWF0Y2guCgpTcGVjaWFsIHJvdGF0ZWQgcGFnZSB2aWV3 IGlzIGNvbnN0cnVjdGVkIGF0IHRoZSBWTUEgY3JlYXRpb24gdGltZSBieQpib3Jyb3dpbmcgdGhl IERNQSBhZGRyZXNzZXMgZnJvbSBvYmotPnBhZ2VzLgoKdjI6CiAgICAqIERvIG5vdCBib3RoZXIg d2l0aCBwYWdlcyBmb3Igcm90YXRlZCBzZyBsaXN0LCBqdXN0IHBvcHVsYXRlIHRoZSBETUEKICAg ICAgYWRkcmVzc2VzLiAoRGFuaWVsIFZldHRlcikKICAgICogQ2hlY2twYXRjaCBjbGVhbnVwLgoK djM6CiAgICAqIFJlYmFzZWQgb24gdG9wIG9mIG5ldyBwbGFuZSBoYW5kbGluZyAoY3JlYXRlIHJv dGF0ZWQgbWFwcGluZyB3aGVuCiAgICAgIHNldHRpbmcgdGhlIHJvdGF0aW9uIHByb3BlcnR5KS4K ICAgICogVW5waW4gcm90YXRlZCBWTUEgb24gdW5waW5uaW5nIGZyb20gZGlzcGxheSBwbGFuZS4K ICAgICogU2ltcGxpZnkgcm90YXRpb24gY2hlY2sgdXNpbmcgYml0d2lzZSBBTkQuIChDaHJpcyBX aWxzb24pCgp2NDoKICAgICogRml4IHVucGlubmluZyBvZiBvcHRpb25hbCByb3RhdGVkIG1hcHBp bmcgc28gaXQgaXMgcmVhbGx5IGNvbnNpZGVyZWQKICAgICAgdG8gYmUgb3B0aW9uYWwuCgp2NToK ICAgKiBSZWJhc2VkIGZvciBmYiBtb2RpZmllciBjaGFuZ2VzLgogICAqIFJlYmFzZWQgZm9yIGF0 b21pYyBjb21taXQuCiAgICogT25seSBwaW4gbmVlZGVkIHZpZXcgZm9yIGRpc3BsYXkuIChWaWxs ZSBTeXJqw6Rsw6QsIERhbmllbCBWZXR0ZXIpCgpGb3I6IFZJWi00NzI2ClNpZ25lZC1vZmYtYnk6 IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBN aWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjQpCi0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDMzICsrKysrLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgIHwgIDI3ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYyAgfCAgMTQgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaCAgfCAgMTIgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAyMDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgNCArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9mYmRldi5jICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXku YyB8ICAgMyArLQogOCBmaWxlcyBjaGFuZ2VkLCAyNjMgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZTA3YTFjYi4uNzlkM2YyYyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNzQzLDggKzI3NDMsMTAgQEAgaTkxNV9nZW1fb2Jq ZWN0X3NldF90b19jcHVfZG9tYWluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGJv b2wgd3JpdGUpOwogaW50IF9fbXVzdF9jaGVjawogaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNw bGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJICAgICB1MzIg YWxpZ25tZW50LAotCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKTsK LXZvaWQgaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnBpcGVsaW5lZCwKKwkJCQkgICAgIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldyk7 Cit2b2lkIGk5MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCQkJICAgICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0 dF92aWV3ICp2aWV3KTsKIGludCBpOTE1X2dlbV9vYmplY3RfYXR0YWNoX3BoeXMoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQlpbnQgYWxpZ24pOwogaW50IGk5MTVfZ2VtX29w ZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKQEAgLTI4 MTMsNyArMjgxNSwxMyBAQCBpOTE1X2dlbV9vYmpfbG9va3VwX29yX2NyZWF0ZV92bWEoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkJCSZpOTE1X2dndHRfdmlld19ub3JtYWwp OwogfQogCi1zdHJ1Y3QgaTkxNV92bWEgKmk5MTVfZ2VtX29ial90b19nZ3R0KHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmopOworc3RydWN0IGk5MTVfdm1hICppOTE1X2dlbV9vYmpfdG9f Z2d0dF92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJCSAgIGVudW0g aTkxNV9nZ3R0X3ZpZXdfdHlwZSB2aWV3KTsKK3N0YXRpYyBpbmxpbmUKK3N0cnVjdCBpOTE1X3Zt YSAqaTkxNV9nZW1fb2JqX3RvX2dndHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK K3sKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX3RvX2dndHRfdmlldyhvYmosIEk5MTVfR0dUVF9WSUVX X05PUk1BTCk7Cit9CiBzdGF0aWMgaW5saW5lIGJvb2wgaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKSB7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7 CiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCB2bWFfbGluaykKQEAg LTI4NjcsMTMgKzI4NzUsMzAgQEAgaTkxNV9nZW1fb2JqX2dndHRfcGluKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJICAgYWxpZ25tZW50LCBmbGFncyB8IFBJTl9HTE9CQUwp OwogfQogCitzdGF0aWMgaW5saW5lIGludCBfX211c3RfY2hlY2sKK2k5MTVfZ2VtX29ial9nZ3R0 X3Bpbl92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkgICB1aW50MzJf dCBhbGlnbm1lbnQsCisJCQkgICB1bnNpZ25lZCBmbGFncywKKwkJCSAgIGNvbnN0IHN0cnVjdCBp OTE1X2dndHRfdmlldyAqZ2d0dF92aWV3KQoreworCXJldHVybiBpOTE1X2dlbV9vYmplY3RfcGlu X3ZpZXcob2JqLCBpOTE1X29ial90b19nZ3R0KG9iaiksCisJCQkJCWFsaWdubWVudCwgZmxhZ3Mg fCBQSU5fR0xPQkFMLAorCQkJCQlnZ3R0X3ZpZXcpOworfQorCiBzdGF0aWMgaW5saW5lIGludAog aTkxNV9nZW1fb2JqZWN0X2dndHRfdW5iaW5kKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmopCiB7CiAJcmV0dXJuIGk5MTVfdm1hX3VuYmluZChpOTE1X2dlbV9vYmpfdG9fZ2d0dChvYmop KTsKIH0KIAotdm9pZCBpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKTsKK3ZvaWQgaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW5fdmlldyhz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJCSAgICAgZW51bSBpOTE1X2dndHRf dmlld190eXBlIHZpZXcpOworc3RhdGljIGlubGluZSB2b2lkCitpOTE1X2dlbV9vYmplY3RfZ2d0 dF91bnBpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCWk5MTVfZ2VtX29i amVjdF9nZ3R0X3VucGluX3ZpZXcob2JqLCBJOTE1X0dHVFRfVklFV19OT1JNQUwpOworfQogCiAv KiBpOTE1X2dlbV9jb250ZXh0LmMgKi8KIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY29udGV4 dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggMDEwN2MyYS4uMDRjMGNiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zOTM4LDcg KzM5MzgsOCBAQCBzdGF0aWMgYm9vbCBpc19waW5fZGlzcGxheShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqKQogaW50CiBpOTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUo c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkgICAgIHUzMiBhbGlnbm1lbnQs Ci0JCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQpCisJCQkJICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQsCisJCQkJICAgICBjb25zdCBzdHJ1Y3Qg aTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7CiAJdTMyIG9sZF9yZWFkX2RvbWFpbnMsIG9sZF93cml0 ZV9kb21haW47CiAJYm9vbCB3YXNfcGluX2Rpc3BsYXk7CkBAIC0zOTc0LDcgKzM5NzUsOSBAQCBp OTE1X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwKIAkgKiAoZS5nLiBsaWJrbXMgZm9yIHRoZSBib290dXAgc3BsYXNoKSwgd2Ug aGF2ZSB0byBlbnN1cmUgdGhhdCB3ZQogCSAqIGFsd2F5cyB1c2UgbWFwX2FuZF9mZW5jZWFibGUg Zm9yIGFsbCBzY2Fub3V0IGJ1ZmZlcnMuCiAJICovCi0JcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRf cGluKG9iaiwgYWxpZ25tZW50LCBQSU5fTUFQUEFCTEUpOworCXJldCA9IGk5MTVfZ2VtX29ial9n Z3R0X3Bpbl92aWV3KG9iaiwgYWxpZ25tZW50LAorCQkJCQkgdmlldy0+dHlwZSA9PSBJOTE1X0dH VFRfVklFV19OT1JNQUwgPworCQkJCQkgUElOX01BUFBBQkxFIDogMCwgdmlldyk7CiAJaWYgKHJl dCkKIAkJZ290byBlcnJfdW5waW5fZGlzcGxheTsKIApAQCAtNDAwMiw5ICs0MDA1LDExIEBAIGVy cl91bnBpbl9kaXNwbGF5OgogfQogCiB2b2lkCi1pOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9k aXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCitpOTE1X2dlbV9v YmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCisJCQkJCSBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7Ci0JaTkx NV9nZW1fb2JqZWN0X2dndHRfdW5waW4ob2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBp bl92aWV3KG9iaiwgdmlldy0+dHlwZSk7CisKIAlvYmotPnBpbl9kaXNwbGF5ID0gaXNfcGluX2Rp c3BsYXkob2JqKTsKIH0KIApAQCAtNDI0MSwxNSArNDI0NiwxNiBAQCBpOTE1X2dlbV9vYmplY3Rf cGluX3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIH0KIAogdm9pZAotaTkx NV9nZW1fb2JqZWN0X2dndHRfdW5waW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK K2k5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluX3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKKwkJCQllbnVtIGk5MTVfZ2d0dF92aWV3X3R5cGUgdmlldykKIHsKLQlzdHJ1Y3Qg aTkxNV92bWEgKnZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaik7CisJc3RydWN0IGk5MTVf dm1hICp2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dF92aWV3KG9iaiwgdmlldyk7CiAKIAlCVUdf T04oIXZtYSk7CiAJQlVHX09OKHZtYS0+cGluX2NvdW50ID09IDApOwotCUJVR19PTighaTkxNV9n ZW1fb2JqX2dndHRfYm91bmQob2JqKSk7CisJQlVHX09OKCFpOTE1X2dlbV9vYmpfYm91bmRfdmll dyhvYmosIGk5MTVfb2JqX3RvX2dndHQob2JqKSwgdmlldykpOwogCi0JaWYgKC0tdm1hLT5waW5f Y291bnQgPT0gMCkKKwlpZiAoLS12bWEtPnBpbl9jb3VudCA9PSAwICYmIHZpZXcgPT0gSTkxNV9H R1RUX1ZJRVdfTk9STUFMKQogCQlvYmotPnBpbl9tYXBwYWJsZSA9IGZhbHNlOwogfQogCkBAIC01 MzA2LDE0ICs1MzEyLDE1IEBAIGk5MTVfZ2VtX3Nocmlua2VyX29vbShzdHJ1Y3Qgbm90aWZpZXJf YmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIGV2ZW50LCB2b2lkICpwdHIpCiAJcmV0dXJuIE5PVElG WV9ET05FOwogfQogCi1zdHJ1Y3QgaTkxNV92bWEgKmk5MTVfZ2VtX29ial90b19nZ3R0KHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCitzdHJ1Y3QgaTkxNV92bWEgKmk5MTVfZ2VtX29i al90b19nZ3R0X3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCQkJICAg ZW51bSBpOTE1X2dndHRfdmlld190eXBlIHZpZXcpCiB7CiAJc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqZ2d0dCA9IGk5MTVfb2JqX3RvX2dndHQob2JqKTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZt YTsKIAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmsp CiAJCWlmICh2bWEtPnZtID09IGdndHQgJiYKLQkJICAgIHZtYS0+Z2d0dF92aWV3LnR5cGUgPT0g STkxNV9HR1RUX1ZJRVdfTk9STUFMKQorCQkgICAgdm1hLT5nZ3R0X3ZpZXcudHlwZSA9PSB2aWV3 KQogCQkJcmV0dXJuIHZtYTsKIAogCXJldHVybiBOVUxMOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYwppbmRleCBiZDk1Nzc2Li45MzM2MTQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYwpAQCAtMjM3NSwxMSArMjM3NSwxNiBAQCBpOTE1X2dlbV9vYmpfbG9va3VwX29yX2Ny ZWF0ZV92bWFfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogc3RhdGljIGlu bGluZQogaW50IGk5MTVfZ2V0X3ZtYV9wYWdlcyhzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIHsKKwlp bnQgcmV0ID0gMDsKKwogCWlmICh2bWEtPmdndHRfdmlldy5wYWdlcykKIAkJcmV0dXJuIDA7CiAK IAlpZiAodm1hLT5nZ3R0X3ZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19OT1JNQUwpCiAJCXZt YS0+Z2d0dF92aWV3LnBhZ2VzID0gdm1hLT5vYmotPnBhZ2VzOworCWVsc2UgaWYgKHZtYS0+Z2d0 dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfUk9UQVRFRCkKKwkJdm1hLT5nZ3R0X3ZpZXcu cGFnZXMgPQorCQkJaW50ZWxfcm90YXRlX2ZiX29ial9wYWdlcygmdm1hLT5nZ3R0X3ZpZXcsIHZt YS0+b2JqKTsKIAllbHNlCiAJCVdBUk5fT05DRSgxLCAiR0dUVCB2aWV3ICV1IG5vdCBpbXBsZW1l bnRlZCFcbiIsCiAJCQkgIHZtYS0+Z2d0dF92aWV3LnR5cGUpOwpAQCAtMjM4NywxMCArMjM5Miwx NSBAQCBpbnQgaTkxNV9nZXRfdm1hX3BhZ2VzKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWlmICgh dm1hLT5nZ3R0X3ZpZXcucGFnZXMpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZ2V0IHBhZ2Vz IGZvciBWTUEgdmlldyB0eXBlICV1IVxuIiwKIAkJCSAgdm1hLT5nZ3R0X3ZpZXcudHlwZSk7Ci0J CXJldHVybiAtRUlOVkFMOworCQlyZXQgPSAtRUlOVkFMOworCX0gZWxzZSBpZiAoSVNfRVJSKHZt YS0+Z2d0dF92aWV3LnBhZ2VzKSkgeworCQlyZXQgPSBQVFJfRVJSKHZtYS0+Z2d0dF92aWV3LnBh Z2VzKTsKKwkJdm1hLT5nZ3R0X3ZpZXcucGFnZXMgPSBOVUxMOworCQlEUk1fRVJST1IoIkZhaWxl ZCB0byBnZXQgcGFnZXMgZm9yIFZNQSB2aWV3IHR5cGUgJXUgKCVkKSFcbiIsCisJCQkgIHZtYS0+ Z2d0dF92aWV3LnR5cGUsIHJldCk7CiAJfQogCi0JcmV0dXJuIDA7CisJcmV0dXJuIHJldDsKIH0K IAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGM5ZTkzZjUuLjU2YTIz NTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0xMTEsMTIgKzExMSwyNCBA QCB0eXBlZGVmIGdlbjhfZ3R0X3B0ZV90IGdlbjhfcHBndHRfcGRlX3Q7CiAKIGVudW0gaTkxNV9n Z3R0X3ZpZXdfdHlwZSB7CiAJSTkxNV9HR1RUX1ZJRVdfTk9STUFMID0gMCwKKwlJOTE1X0dHVFRf VklFV19ST1RBVEVECit9OworCitzdHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyB7CisJdW5zaWdu ZWQgaW50IHBpeGVsX3NpemU7CisJdW5zaWduZWQgaW50IGhlaWdodDsKKwl1bnNpZ25lZCBpbnQg cGl0Y2g7CisJdWludDY0X3QgZmJfbW9kaWZpZXI7CiB9OwogCiBzdHJ1Y3QgaTkxNV9nZ3R0X3Zp ZXcgewogCWVudW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB0eXBlOwogCiAJc3RydWN0IHNnX3RhYmxl ICpwYWdlczsKKworCXVuaW9uIHsKKwkJc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gcm90YXRp b25faW5mbzsKKwl9OwogfTsKIAogZXh0ZXJuIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyBp OTE1X2dndHRfdmlld19ub3JtYWw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggN2E1ZDBhNy4uY2I0ZGFlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMjI0NCwxOCArMjI0NCwxNTEgQEAgaW50ZWxfZmJfYWxpZ25faGVpZ2h0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGludCBoZWlnaHQsIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwKIAkJCQkJCSAg ZmJfZm9ybWF0X21vZGlmaWVyKSk7CiB9CiAKLWludAotaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9v Ymooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiwKLQkJCSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCkKK3N0YXRpYwor dm9pZCByb3RhdGVfcGFnZXMoZG1hX2FkZHJfdCAqaW4sIHVuc2lnbmVkIGludCB3aWR0aCwgdW5z aWduZWQgaW50IGhlaWdodCwKKwkJICBzdHJ1Y3Qgc2dfdGFibGUgKnN0KQoreworCXVuc2lnbmVk IGludCBjb2x1bW4sIHJvdzsKKwl1bnNpZ25lZCBpbnQgc3JjX2lkeDsKKwlzdHJ1Y3Qgc2NhdHRl cmxpc3QgKnNnID0gc3QtPnNnbDsKKworCXN0LT5uZW50cyA9IDA7CisKKwlmb3IgKGNvbHVtbiA9 IDA7IGNvbHVtbiA8IHdpZHRoOyBjb2x1bW4rKykgeworCQlzcmNfaWR4ID0gd2lkdGggKiAoaGVp Z2h0IC0gMSkgKyBjb2x1bW47CisJCWZvciAocm93ID0gMDsgcm93IDwgaGVpZ2h0OyByb3crKykg eworCQkJc3QtPm5lbnRzKys7CisJCQkvKiBXZSBkb24ndCBuZWVkIHRoZSBwYWdlcywgYnV0IG5l ZWQgdG8gaW5pdGlhbGl6ZQorCQkJICogdGhlIGVudHJpZXMgc28gdGhlIHNnIGxpc3QgY2FuIGJl IGhhcHBpbHkgdHJhdmVyc2VkLgorCQkJICogVGhlIG9ubHkgdGhpbmcgd2UgbmVlZCBhcmUgRE1B IGFkZHJlc3Nlcy4KKwkJCSAqLworCQkJc2dfc2V0X3BhZ2Uoc2csIE5VTEwsIFBBR0VfU0laRSwg MCk7CisJCQlzZ19kbWFfYWRkcmVzcyhzZykgPSBpbltzcmNfaWR4XTsKKwkJCXNnX2RtYV9sZW4o c2cpID0gUEFHRV9TSVpFOworCQkJc2cgPSBzZ19uZXh0KHNnKTsKKwkJCXNyY19pZHggLT0gd2lk dGg7CisJCX0KKwl9Cit9CisKK3N0cnVjdCBzZ190YWJsZSAqaW50ZWxfcm90YXRlX2ZiX29ial9w YWdlcyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKmdndHRfdmlldywKKwkJCQkJICAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZmIt PmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwotCXUzMiBhbGlnbm1l bnQ7Ci0JaW50IHJldDsKKwlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICpnZ3R0ID0gJmRldl9w cml2LT5ndHQuYmFzZTsKKwlzdHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyAqcm90X2luZm8gPSAm Z2d0dF92aWV3LT5yb3RhdGlvbl9pbmZvOworCXVuc2lnbmVkIGxvbmcgc2l6ZSwgcGFnZXMsIHJv dF9wYWdlczsKKwlzdHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CisJdW5zaWduZWQgbG9uZyBp OworCWRtYV9hZGRyX3QgKnBhZ2VfYWRkcl9saXN0OworCXN0cnVjdCBzZ190YWJsZSAqc3Q7CisJ dW5zaWduZWQgaW50IHRpbGVfd2lkdGgsIHRpbGVfaGVpZ2h0OworCXVuc2lnbmVkIGludCB3aWR0 aF9wYWdlcywgaGVpZ2h0X3BhZ2VzOworCWludCByZXQgPSBFTk9NRU07CiAKLQlXQVJOX09OKCFt dXRleF9pc19sb2NrZWQoJmRldi0+c3RydWN0X211dGV4KSk7CisJcGFnZXMgPSBpOTE1X2dlbV9v Ympfc2l6ZShvYmosIGdndHQpIC8gUEFHRV9TSVpFOworCisJLyogQ2FsY3VsYXRlIHRpbGluZyBn ZW9tZXRyeS4gKi8KKwl0aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldiwgcm90X2lu Zm8tPnBpeGVsX3NpemUgKiA4LAorCQkJCQlyb3RfaW5mby0+ZmJfbW9kaWZpZXIpOworCXRpbGVf d2lkdGggPSBQQUdFX1NJWkUgLyByb3RfaW5mby0+cGl4ZWxfc2l6ZSAvIHRpbGVfaGVpZ2h0Owor CXdpZHRoX3BhZ2VzID0gRElWX1JPVU5EX1VQKHJvdF9pbmZvLT5waXRjaCAvIHJvdF9pbmZvLT5w aXhlbF9zaXplLAorCQkJCSAgIHRpbGVfd2lkdGgpOworCWhlaWdodF9wYWdlcyA9IERJVl9ST1VO RF9VUChyb3RfaW5mby0+aGVpZ2h0LCB0aWxlX2hlaWdodCk7CisJcm90X3BhZ2VzID0gd2lkdGhf cGFnZXMgKiBoZWlnaHRfcGFnZXM7CisJc2l6ZSA9IHJvdF9wYWdlcyAqIFBBR0VfU0laRTsKKwor CS8qIEFsbG9jYXRlIGEgdGVtcG9yYXJ5IGxpc3Qgb2Ygc291cmNlIHBhZ2VzIGZvciByYW5kb20g YWNjZXNzLiAqLworCXBhZ2VfYWRkcl9saXN0ID0gZHJtX21hbGxvY19hYihwYWdlcywgc2l6ZW9m KGRtYV9hZGRyX3QpKTsKKwlpZiAoIXBhZ2VfYWRkcl9saXN0KQorCQlyZXR1cm4gRVJSX1BUUihy ZXQpOworCisJLyogQWxsb2NhdGUgdGFyZ2V0IFNHIGxpc3QuICovCisJc3QgPSBrbWFsbG9jKHNp emVvZigqc3QpLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXN0KQorCQlnb3RvIGVycl9zdF9hbGxvYzsK KworCXJldCA9IHNnX2FsbG9jX3RhYmxlKHN0LCByb3RfcGFnZXMsIEdGUF9LRVJORUwpOworCWlm IChyZXQpCisJCWdvdG8gZXJyX3NnX2FsbG9jOworCisJLyogUG9wdWxhdGUgc291cmNlIHBhZ2Ug bGlzdCBmcm9tIHRoZSBvYmplY3QuICovCisJaSA9IDA7CisJZm9yX2VhY2hfc2dfcGFnZShvYmot PnBhZ2VzLT5zZ2wsICZzZ19pdGVyLCBvYmotPnBhZ2VzLT5uZW50cywgMCkgeworCQlwYWdlX2Fk ZHJfbGlzdFtpXSA9IHNnX3BhZ2VfaXRlcl9kbWFfYWRkcmVzcygmc2dfaXRlcik7CisJCWkrKzsK Kwl9CisKKwkvKiBSb3RhdGUgdGhlIHBhZ2VzLiAqLworCXJvdGF0ZV9wYWdlcyhwYWdlX2FkZHJf bGlzdCwgd2lkdGhfcGFnZXMsIGhlaWdodF9wYWdlcywgc3QpOworCisJRFJNX0RFQlVHX0tNUygK KwkJICAgICAgIkNyZWF0ZWQgcm90YXRlZCBwYWdlIG1hcHBpbmcgZm9yIG9iamVjdCBzaXplICVs dSAocGl0Y2g9JXUsIGhlaWdodD0ldSwgcGl4ZWxfc2l6ZT0ldSwgJXV4JXUgdGlsZXMsICVsdSBw YWdlcykuXG4iLAorCQkgICAgICBzaXplLCByb3RfaW5mby0+cGl0Y2gsIHJvdF9pbmZvLT5oZWln aHQsCisJCSAgICAgIHJvdF9pbmZvLT5waXhlbF9zaXplLCB3aWR0aF9wYWdlcywgaGVpZ2h0X3Bh Z2VzLAorCQkgICAgICByb3RfcGFnZXMpOworCisJZHJtX2ZyZWVfbGFyZ2UocGFnZV9hZGRyX2xp c3QpOworCisJcmV0dXJuIHN0OworCitlcnJfc2dfYWxsb2M6CisJa2ZyZWUoc3QpOworZXJyX3N0 X2FsbG9jOgorCWRybV9mcmVlX2xhcmdlKHBhZ2VfYWRkcl9saXN0KTsKKworCURSTV9ERUJVR19L TVMoCisJCSAgICAgICJGYWlsZWQgdG8gY3JlYXRlIHJvdGF0ZWQgbWFwcGluZyBmb3Igb2JqZWN0 IHNpemUgJWx1ISAoJWQpIChwaXRjaD0ldSwgaGVpZ2h0PSV1LCBwaXhlbF9zaXplPSV1LCAldXgl dSB0aWxlcywgJWx1IHBhZ2VzKVxuIiwKKwkJICAgICAgc2l6ZSwgcmV0LCByb3RfaW5mby0+cGl0 Y2gsIHJvdF9pbmZvLT5oZWlnaHQsCisJCSAgICAgIHJvdF9pbmZvLT5waXhlbF9zaXplLCB3aWR0 aF9wYWdlcywgaGVpZ2h0X3BhZ2VzLAorCQkgICAgICByb3RfcGFnZXMpOworCXJldHVybiBFUlJf UFRSKHJldCk7Cit9CisKK3N0YXRpYworY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3IGk5MTVf cm90YXRlZF9nZ3R0X3ZpZXdfdGVtcGxhdGUgPSB7CisJLnR5cGUgPSBJOTE1X0dHVFRfVklFV19S T1RBVEVELAorfTsKKworc3RhdGljCitpbnQgaW50ZWxfZmJfZ2d0dF92aWV3KHN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAorCQkgICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIsCisJCSAgICAgICBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCit7CisJc3RydWN0 IGludGVsX3JvdGF0aW9uX2luZm8gKmluZm8gPSAmdmlldy0+cm90YXRpb25faW5mbzsKKworCW1l bWNweSh2aWV3LCAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsLCBzaXplb2YoKnZpZXcpKTsKKworCWlm ICghcGxhbmVfc3RhdGUpCisJCXJldHVybiAwOworCisJaWYgKHBsYW5lX3N0YXRlLT5yb3RhdGlv biAmCisJICAgIChCSVQoRFJNX1JPVEFURV85MCkgfCBCSVQoRFJNX1JPVEFURV8yNzApKSkgPT0g MCkKKwkJcmV0dXJuIDA7CisKKwltZW1jcHkodmlldywgJmk5MTVfcm90YXRlZF9nZ3R0X3ZpZXdf dGVtcGxhdGUsIHNpemVvZigqdmlldykpOworCisJaW5mby0+aGVpZ2h0ID0gZmItPmhlaWdodDsK KwlpbmZvLT5waXhlbF9zaXplID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1h dCwgMCk7CisJaW5mby0+cGl0Y2ggPSBmYi0+cGl0Y2hlc1swXTsKKwlpbmZvLT5mYl9tb2RpZmll ciA9IGZiLT5tb2RpZmllclswXTsKKworCWlmICghKGluZm8tPmZiX21vZGlmaWVyID09IEk5MTVf Rk9STUFUX01PRF9ZX1RJTEVEIHx8CisJICAgICAgaW5mby0+ZmJfbW9kaWZpZXIgPT0gSTkxNV9G T1JNQVRfTU9EX1lmX1RJTEVEKSkgeworCQlEUk1fREVCVUdfS01TKAorCQkJICAgICAgIlkgb3Ig WWYgdGlsaW5nIGlzIG5lZWRlZCBmb3IgOTAvMjcwIHJvdGF0aW9uIVxuIik7CisJCXJldHVybiAt RUlOVkFMOworCX0KKworCXJldHVybiAxOworfQorCitzdGF0aWMKK3UzMiBpbnRlbF9kaXNwbGF5 X29ial9hbGlnbm1lbnQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQlzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYikKK3sKKwlpbnQgYWxpZ25tZW50OwogCiAJc3dpdGNoIChmYi0+bW9kaWZp ZXJbMF0pIHsKIAljYXNlIERSTV9GT1JNQVRfTU9EX05PTkU6CkBAIC0yMjk2LDYgKzI0MjksMzAg QEAgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ aWYgKG5lZWRfdnRkX3dhKGRldikgJiYgYWxpZ25tZW50IDwgMjU2ICogMTAyNCkKIAkJYWxpZ25t ZW50ID0gMjU2ICogMTAyNDsKIAorCXJldHVybiBhbGlnbm1lbnQ7Cit9CisKK2ludAoraW50ZWxf cGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICBzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJCSAgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBs YW5lX3N0YXRlLAorCQkJICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKQorewor CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBmYi0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CisJc3RydWN0IGk5MTVfZ2d0dF92aWV3IHZp ZXc7CisJdTMyIGFsaWdubWVudDsKKwlpbnQgcmV0OworCisJV0FSTl9PTighbXV0ZXhfaXNfbG9j a2VkKCZkZXYtPnN0cnVjdF9tdXRleCkpOworCisJYWxpZ25tZW50ID0gaW50ZWxfZGlzcGxheV9v YmpfYWxpZ25tZW50KGRldiwgZmIpOworCisJcmV0ID0gaW50ZWxfZmJfZ2d0dF92aWV3KHBsYW5l X3N0YXRlLCBmYiwgJnZpZXcpOworCWlmIChyZXQgPCAwKQorCQlyZXR1cm4gcmV0OworCiAJLyoK IAkgKiBHbG9iYWwgZ3R0IHB0ZSByZWdpc3RlcnMgYXJlIHNwZWNpYWwgcmVnaXN0ZXJzIHdoaWNo IGFjdHVhbGx5IGZvcndhcmQKIAkgKiB3cml0ZXMgdG8gYSBjaHVuayBvZiBzeXN0ZW0gbWVtb3J5 LiBXaGljaCBtZWFucyB0aGF0IHRoZXJlIGlzIG5vIHJpc2sKQEAgLTIzMDYsNyArMjQ2Myw4IEBA IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlu dGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAogCWRldl9wcml2LT5tbS5pbnRlcnJ1cHRp YmxlID0gZmFsc2U7Ci0JcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5l KG9iaiwgYWxpZ25tZW50LCBwaXBlbGluZWQpOworCXJldCA9IGk5MTVfZ2VtX29iamVjdF9waW5f dG9fZGlzcGxheV9wbGFuZShvYmosIGFsaWdubWVudCwgcGlwZWxpbmVkLAorCQkJCQkJICAgJnZp ZXcpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2ludGVycnVwdGlibGU7CiAKQEAgLTIzMjYsMTkg KzI0ODQsMjcgQEAgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJcmV0dXJuIDA7CiAKIGVycl91bnBpbjoKLQlpOTE1X2dlbV9vYmplY3RfdW5waW5f ZnJvbV9kaXNwbGF5X3BsYW5lKG9iaik7CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlz cGxheV9wbGFuZShvYmosICZ2aWV3KTsKIGVycl9pbnRlcnJ1cHRpYmxlOgogCWRldl9wcml2LT5t bS5pbnRlcnJ1cHRpYmxlID0gdHJ1ZTsKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7 CiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJfb2JqKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCitzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9v Ymooc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJCQkgICAgICAgc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aiA9IGludGVsX2ZiX29iaihmYik7CisJc3RydWN0IGk5MTVfZ2d0dF92aWV3IHZpZXc7CisJaW50 IHJldDsKKwogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5iYXNlLmRldi0+c3RydWN0 X211dGV4KSk7CiAKKwlyZXQgPSBpbnRlbF9mYl9nZ3R0X3ZpZXcocGxhbmVfc3RhdGUsIGZiLCAm dmlldyk7CisJV0FSTl9PTkNFKHJldCA8IDAsICJJbnZhbGlkIGZiIGZvcm1hdCBhbmQgcm90YXRp b24gY29tYmluYXRpb24hIik7CisKIAlpOTE1X2dlbV9vYmplY3RfdW5waW5fZmVuY2Uob2JqKTsK LQlpOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKG9iaik7CisJaTkxNV9n ZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShvYmosICZ2aWV3KTsKIH0KIAogLyog Q29tcHV0ZXMgdGhlIGxpbmVhciBvZmZzZXQgdG8gdGhlIGJhc2UgdGlsZSBhbmQgYWRqdXN0cyB4 LCB5LiBieXRlcyBwZXIgcGl4ZWwKQEAgLTkyMjMsNyArOTM4OSw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3VucGluX3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJZW51bSBwaXBl IHBpcGUgPSB0b19pbnRlbF9jcnRjKHdvcmstPmNydGMpLT5waXBlOwogCiAJbXV0ZXhfbG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX3VucGluX2ZiX29iaihpbnRlbF9mYl9vYmood29y ay0+b2xkX2ZiKSk7CisJaW50ZWxfdW5waW5fZmJfb2JqKHdvcmstPm9sZF9mYiwgd29yay0+Y3J0 Yy0+cHJpbWFyeS0+c3RhdGUpOwogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZ3b3JrLT5w ZW5kaW5nX2ZsaXBfb2JqLT5iYXNlKTsKIAlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uod29y ay0+b2xkX2ZiKTsKIApAQCAtOTkzMSw3ICsxMDA5Nyw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0 Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlyaW5nID0gJmRldl9wcml2LT5y aW5nW1JDU107CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+ cHJpbWFyeSwgZmIsIHJpbmcpOworCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGNy dGMtPnByaW1hcnksIGZiLAorCQkJCQkgY3J0Yy0+cHJpbWFyeS0+c3RhdGUsIHJpbmcpOwogCWlm IChyZXQpCiAJCWdvdG8gY2xlYW51cF9wZW5kaW5nOwogCkBAIC05OTcxLDcgKzEwMTM4LDcgQEAg c3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJ cmV0dXJuIDA7CiAKIGNsZWFudXBfdW5waW46Ci0JaW50ZWxfdW5waW5fZmJfb2JqKG9iaik7CisJ aW50ZWxfdW5waW5fZmJfb2JqKGZiLCBjcnRjLT5wcmltYXJ5LT5zdGF0ZSk7CiBjbGVhbnVwX3Bl bmRpbmc6CiAJYXRvbWljX2RlYygmaW50ZWxfY3J0Yy0+dW5waW5fd29ya19jb3VudCk7CiAJY3J0 Yy0+cHJpbWFyeS0+ZmIgPSBvbGRfZmI7CkBAIC0xMTkzMyw3ICsxMjEwMCw3IEBAIGludGVsX3By ZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCWlmIChyZXQpCiAJCQlE Uk1fREVCVUdfS01TKCJmYWlsZWQgdG8gYXR0YWNoIHBoeXMgb2JqZWN0XG4iKTsKIAl9IGVsc2Ug ewotCQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihwbGFuZSwgZmIsIE5VTEwpOwor CQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihwbGFuZSwgZmIsIG5ld19zdGF0ZSwg TlVMTCk7CiAJfQogCiAJaWYgKHJldCA9PSAwKQpAQCAtMTE5NjUsNyArMTIxMzIsNyBAQCBpbnRl bF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmIChwbGFuZS0+ dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgfHwKIAkgICAgIUlOVEVMX0lORk8oZGV2KS0+ Y3Vyc29yX25lZWRzX3BoeXNpY2FsKSB7CiAJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKLQkJaW50ZWxfdW5waW5fZmJfb2JqKG9iaik7CisJCWludGVsX3VucGluX2ZiX29iaihmYiwg b2xkX3N0YXRlKTsKIAkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJfQogfQpA QCAtMTM4NjIsNiArMTQwMjksNyBAQCB2b2lkIGludGVsX21vZGVzZXRfZ2VtX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAogCQlpZiAoaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooYy0+ cHJpbWFyeSwKIAkJCQkJICAgICAgIGMtPnByaW1hcnktPmZiLAorCQkJCQkgICAgICAgYy0+cHJp bWFyeS0+c3RhdGUsCiAJCQkJCSAgICAgICBOVUxMKSkgewogCQkJRFJNX0VSUk9SKCJmYWlsZWQg dG8gcGluIGJvb3QgZmIgb24gcGlwZSAlZFxuIiwKIAkJCQkgIHRvX2ludGVsX2NydGMoYyktPnBp cGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjNDY2ZDQzLi45YzIxNDVkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTU1LDYgKzk1NSw3IEBAIHZvaWQgaW50ZWxfcmVs ZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJ CQkJICAgIHN0cnVjdCBpbnRlbF9sb2FkX2RldGVjdF9waXBlICpvbGQpOwogaW50IGludGVsX3Bp bl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICAgICAgIHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJICAgICAgIHN0cnVjdCBkcm1fcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlLAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVs aW5lZCk7CiBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICoKIF9faW50ZWxfZnJhbWVidWZmZXJfY3Jl YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC05NzksNiArOTgwLDkgQEAgaW50IGludGVs X3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJ ICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAogCQkJCSAgICB1aW50NjRfdCB2YWwp OwogCitzdHJ1Y3Qgc2dfdGFibGUgKmludGVsX3JvdGF0ZV9mYl9vYmpfcGFnZXMoc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICpnZ3R0X3ZpZXcsCisJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopOworCiAvKiBzaGFyZWQgZHBsbCBmdW5jdGlvbnMgKi8KIHN0cnVjdCBpbnRlbF9z aGFyZWRfZHBsbCAqaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0Yyk7CiB2b2lkIGFzc2VydF9zaGFyZWRfZHBsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCAyMzRhNjk5Li5kODIw NGFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTEyNiw3ICsxMjYsNyBAQCBz dGF0aWMgaW50IGludGVsZmJfYWxsb2Moc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAl9 CiAKIAkvKiBGbHVzaCBldmVyeXRoaW5nIG91dCwgd2UnbGwgYmUgZG9pbmcgR1RUIG9ubHkgZnJv bSBub3cgb24gKi8KLQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihOVUxMLCBmYiwg TlVMTCk7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooTlVMTCwgZmIsIE5VTEws IE5VTEwpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcGluIG9iajogJWRc biIsIHJldCk7CiAJCWdvdG8gb3V0X2ZiOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5j CmluZGV4IDgyM2QxZDkuLmRkOTIxMjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5 LmMKQEAgLTcyMCw3ICs3MjAsOCBAQCBzdGF0aWMgaW50IGludGVsX292ZXJsYXlfZG9fcHV0X2lt YWdlKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LAogCWlmIChyZXQgIT0gMCkKIAkJcmV0 dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShu ZXdfYm8sIDAsIE5VTEwpOworCXJldCA9IGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9w bGFuZShuZXdfYm8sIDAsIE5VTEwsCisJCQkJCQkgICAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsK IAlpZiAocmV0ICE9IDApCiAJCXJldHVybiByZXQ7CiAKLS0gCjIuMy4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=