From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH 1/6] drm/i915/skl: Update plane watermarks atomically during plane updates Date: Wed, 20 Jul 2016 16:59:57 -0400 Message-ID: <1469048403-32016-2-git-send-email-cpaul@redhat.com> References: <1469048403-32016-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1469048403-32016-1-git-send-email-cpaul@redhat.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: David Airlie , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , stable@vger.kernel.org, Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhhbmtzIHRvIFZpbGxlIGZvciBzdWdnZXN0aW5nIHRoaXMgYXMgYSBwb3RlbnRpYWwgc29sdXRp b24gdG8gcGlwZQp1bmRlcnJ1bnMgb24gU2t5bGFrZS4KCk9uIFNreWxha2UgYWxsIG9mIHRoZSBy ZWdpc3RlcnMgZm9yIGNvbmZpZ3VyaW5nIHBsYW5lcywgaW5jbHVkaW5nIHRoZQpyZWdpc3RlcnMg Zm9yIGNvbmZpZ3VyaW5nIHRoZWlyIHdhdGVybWFya3MsIGFyZSBkb3VibGUgYnVmZmVyZWQuIE5l dwp2YWx1ZXMgd3JpdHRlbiB0byB0aGVtIHdvbid0IHRha2UgZWZmZWN0IHVudGlsIHNhaWQgcmVn aXN0ZXJzIGFyZQoiYXJtZWQiLCB3aGljaCBpcyBkb25lIGJ5IHdyaXRpbmcgdG8gdGhlIFBMQU5F X1NVUkYgKG9yIGluIHRoZSBjYXNlIG9mCmN1cnNvciBwbGFuZXMsIHRoZSBDVVJCQVNFIHJlZ2lz dGVyKSByZWdpc3Rlci4KCldpdGggdGhpcyBpbiBtaW5kLCB1cCB1bnRpbCBub3cgd2UndmUgYmVl biB1cGRhdGluZyB3YXRlcm1hcmtzIG9uIHNrbApsaWtlIHRoaXM6CgogIG5vbi1tb2Rlc2V0IHsK ICAgLSBjYWxjdWxhdGUgKGR1cmluZyBhdG9taWMgY2hlY2sgcGhhc2UpCiAgIC0gZmluaXNoX2F0 b21pY19jb21taXQ6CiAgICAgLSBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlOgogICAgICAgIC0gaW50 ZWxfdXBkYXRlX3dhdGVybWFya3MoKQogICAgIC0ge3ZibGFuayBoYXBwZW5zOyBuZXcgd2F0ZXJt YXJrcyArIG9sZCBwbGFuZSB2YWx1ZXMgPT4gdW5kZXJydW4gfQogICAgIC0gZHJtX2F0b21pY19o ZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjOgogICAgICAgIC0gc3RhcnQgdmJsYW5rIGV2YXNp b24KICAgICAgICAtIHdyaXRlIG5ldyBwbGFuZSByZWdpc3RlcnMKICAgICAgICAtIGVuZCB2Ymxh bmsgZXZhc2lvbgogIH0KCiAgb3IKCiAgbW9kZXNldCB7CiAgIC0gY2FsY3VsYXRlIChkdXJpbmcg YXRvbWljIGNoZWNrIHBoYXNlKQogICAtIGZpbmlzaF9hdG9taWNfY29tbWl0OgogICAgIC0gY3J0 Y19lbmFibGU6CiAgICAgICAgLSBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcygpCiAgICAgLSB7dmJs YW5rIGhhcHBlbnM7IG5ldyB3YXRlcm1hcmtzICsgb2xkIHBsYW5lIHZhbHVlcyA9PiB1bmRlcnJ1 biB9CiAgICAgLSBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGM6CiAgICAg ICAgLSBzdGFydCB2YmxhbmsgZXZhc2lvbgogICAgICAgIC0gd3JpdGUgbmV3IHBsYW5lIHJlZ2lz dGVycwogICAgICAgIC0gZW5kIHZibGFuayBldmFzaW9uCiAgfQoKTm93IHdlIHVwZGF0ZSB3YXRl cm1hcmtzIGF0b21pY2FsbHkgbGlrZSB0aGlzOgoKICBub24tbW9kZXNldCB7CiAgIC0gY2FsY3Vs YXRlIChkdXJpbmcgYXRvbWljIGNoZWNrIHBoYXNlKQogICAtIGZpbmlzaF9hdG9taWNfY29tbWl0 OgogICAgIC0gaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZToKICAgICAgICAtIGludGVsX3VwZGF0ZV93 YXRlcm1hcmtzKCkgKHdtIHZhbHVlcyBhcmVuJ3Qgd3JpdHRlbiB5ZXQpCiAgICAgLSBkcm1fYXRv bWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGM6CiAgICAgICAgLSBzdGFydCB2Ymxhbmsg ZXZhc2lvbgogICAgICAgIC0gd3JpdGUgbmV3IHBsYW5lIHJlZ2lzdGVycwogICAgICAgIC0gd3Jp dGUgbmV3IHdtIHZhbHVlcwogICAgICAgIC0gZW5kIHZibGFuayBldmFzaW9uCiAgfQoKICBtb2Rl c2V0IHsKICAgLSBjYWxjdWxhdGUgKGR1cmluZyBhdG9taWMgY2hlY2sgcGhhc2UpCiAgIC0gZmlu aXNoX2F0b21pY19jb21taXQ6CiAgICAgLSBjcnRjX2VuYWJsZToKICAgICAgICAtIGludGVsX3Vw ZGF0ZV93YXRlcm1hcmtzKCkgKGFjdHVhbCB3bSB2YWx1ZXMgYXJlbid0IHdyaXR0ZW4KICAgICAg ICAgIHlldCkKICAgICAtIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YzoK ICAgICAgICAtIHN0YXJ0IHZibGFuayBldmFzaW9uCiAgICAgICAgLSB3cml0ZSBuZXcgcGxhbmUg cmVnaXN0ZXJzCgktIHdyaXRlIG5ldyB3bSB2YWx1ZXMKICAgICAgICAtIGVuZCB2YmxhbmsgZXZh c2lvbgogIH0KCldoaWNoIGlzIG1vcmUgb2YgYSBzdGVwIGluIHRoZSByaWdodCBkaXJlY3Rpb24g dG8gZml4aW5nIGFsbCBvZiB0aGUKdW5kZXJydW4gaXNzdWVzIHdlJ3JlIGN1cnJlbnRseSBzZWVp bmcgd2l0aCBza2wKCkNoYW5nZXMgc2luY2Ugb3JpZ2luYWwgcGF0Y2ggc2VyaWVzOgotIFJlbW92 ZSBtdXRleF9sb2NrL211dGV4X3VubG9jayBzaW5jZSB0aGV5IGRvbid0IGRvIGFueXRoaW5nIGFu ZCB3ZSdyZQogIG5vdCB0b3VjaGluZyBnbG9iYWwgc3RhdGUKLSBNb3ZlIHNrbF93cml0ZV9jdXJz b3Jfd20vc2tsX3dyaXRlX3BsYW5lX3dtIGZ1bmN0aW9ucyBpbnRvIGludGVsX3BtLmMsIG1ha2UK ICBleHRlcm5hbGx5IHZpc2libGUKLSBBZGQgc2tsX3dyaXRlX3BsYW5lX3dtIGNhbGxzIHRvIHNr bF91cGRhdGVfcGxhbmUKLSBGaXggY29uZGl0aW9uYWwgZm9yIGZvciBsb29wIGluIHNrbF93cml0 ZV9wbGFuZV93bSAobGV2ZWwgPCBtYXhfbGV2ZWwKICBzaG91bGQgYmUgbGV2ZWwgPD0gbWF4X2xl dmVsKQotIE1ha2UgZGlhZ3JhbSBpbiBjb21taXQgbW9yZSBhY2N1cmF0ZSB0byB3aGF0J3MgYWN0 dWFsbHkgaGFwcGVuaW5nCi0gQWRkIEZpeGVzOgoKRml4ZXM6IDJkNDFjMGI1OWFmYyAoImRybS9p OTE1L3NrbDogU0tMIFdhdGVybWFyayBDb21wdXRhdGlvbiIpClNpZ25lZC1vZmYtYnk6IEx5dWRl IDxjcGF1bEByZWRoYXQuY29tPgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwpDYzogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0 ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgpDYzogUmFkaGFrcmlzaG5hIFNyaXBhZGEgPHJh ZGhha3Jpc2huYS5zcmlwYWRhQGludGVsLmNvbT4KQ2M6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRl QHJlZGhhdC5jb20+IDxjcGF1bEByZWRoYXQuY29tPgpDYzogTWF0dCBSb3BlciA8bWF0dGhldy5k LnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgfCAgNSArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiAr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgNDggKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgfCAgMiArKwogNCBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAxNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNzhiZWI3ZS4u YzBkMjA3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzAzMSw2ICsz MDMxLDggQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAlpbnRlbF9jcnRjLT5hZGp1c3RlZF94ID0geF9vZmZzZXQ7CiAJ aW50ZWxfY3J0Yy0+YWRqdXN0ZWRfeSA9IHlfb2Zmc2V0OwogCisJc2tsX3dyaXRlX3BsYW5lX3dt KGludGVsX2NydGMsIDApOworCiAJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgMCksIHBsYW5l X2N0bCk7CiAJSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlwZSwgMCksIHBsYW5lX29mZnNldCk7 CiAJSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIDApLCBwbGFuZV9zaXplKTsKQEAgLTEwMjQy LDYgKzEwMjQ0LDkgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywgdTMyIGJhc2UsCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXVp bnQzMl90IGNudGwgPSAwOwogCisJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKQorCQlza2xfd3Jp dGVfY3Vyc29yX3dtKGludGVsX2NydGMpOworCiAJaWYgKHBsYW5lX3N0YXRlICYmIHBsYW5lX3N0 YXRlLT52aXNpYmxlKSB7CiAJCWNudGwgPSBNQ1VSU09SX0dBTU1BX0VOQUJMRTsKIAkJc3dpdGNo IChwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggZTc0ZDg1MS4uZjFmNTRkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE3MDks NiArMTcwOSw4IEBAIHZvaWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIHZvaWQgc2tsX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgc2tsX2RkYl9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQkJICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIgLyogb3V0ICovKTsKK3Zv aWQgc2tsX3dyaXRlX2N1cnNvcl93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0Yyk7Cit2 b2lkIHNrbF93cml0ZV9wbGFuZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywgaW50 IHBsYW5lKTsKIHVpbnQzMl90IGlsa19waXBlX3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKIGJvb2wgaWxrX2Rpc2FibGVfbHBfd20oc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiBpbnQgc2FuaXRpemVfcmM2X29wdGlvbihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBlbmFibGVfcmM2KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCmluZGV4IDY0ZDYyOGMuLmZhODZiZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAt MzY4MCw2ICszNjgwLDM5IEBAIHN0YXRpYyB2b2lkIHNrbF9kZGJfZW50cnlfd3JpdGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlJOTE1X1dSSVRFKHJlZywgMCk7CiB9CiAK K3ZvaWQgc2tsX3dyaXRlX3BsYW5lX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAor CQkJaW50IHBsYW5lKQoreworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9ICZpbnRlbF9jcnRjLT5i YXNlOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBza2xfd21fdmFs dWVzICp3bSA9ICZkZXZfcHJpdi0+d20uc2tsX3Jlc3VsdHM7CisJaW50IGxldmVsLCBtYXhfbGV2 ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRj LT5waXBlOworCisJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykg eworCQlJOTE1X1dSSVRFKFBMQU5FX1dNKHBpcGUsIHBsYW5lLCBsZXZlbCksCisJCQkgICB3bS0+ cGxhbmVbcGlwZV1bcGxhbmVdW2xldmVsXSk7CisJfQorCUk5MTVfV1JJVEUoUExBTkVfV01fVFJB TlMocGlwZSwgcGxhbmUpLCB3bS0+cGxhbmVfdHJhbnNbcGlwZV1bcGxhbmVdKTsKK30KKwordm9p ZCBza2xfd3JpdGVfY3Vyc29yX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQorewor CXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBza2xfd21fdmFsdWVzICp3bSA9ICZkZXZfcHJp di0+d20uc2tsX3Jlc3VsdHM7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xl dmVsKGRldik7CisJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOworCisJZm9yIChs ZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgeworCQlJOTE1X1dSSVRFKENV Ul9XTShwaXBlLCBsZXZlbCksCisJCQkgICB3bS0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXVts ZXZlbF0pOworCX0KKwlJOTE1X1dSSVRFKENVUl9XTV9UUkFOUyhwaXBlKSwgd20tPnBsYW5lX3Ry YW5zW3BpcGVdW1BMQU5FX0NVUlNPUl0pOworfQorCiBzdGF0aWMgdm9pZCBza2xfd3JpdGVfd21f dmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQljb25zdCBzdHJ1 Y3Qgc2tsX3dtX3ZhbHVlcyAqbmV3KQogewpAQCAtMzY4Nyw3ICszNzIwLDcgQEAgc3RhdGljIHZv aWQgc2tsX3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwg Y3J0YykgewotCQlpbnQgaSwgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2 KTsKKwkJaW50IGk7CiAJCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+cGlwZTsKIAogCQlpZiAoKG5l dy0+ZGlydHlfcGlwZXMgJiBkcm1fY3J0Y19tYXNrKCZjcnRjLT5iYXNlKSkgPT0gMCkKQEAgLTM2 OTcsMTkgKzM3MzAsNiBAQCBzdGF0aWMgdm9pZCBza2xfd3JpdGVfd21fdmFsdWVzKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCQlJOTE1X1dSSVRFKFBJUEVfV01fTElORVRJ TUUocGlwZSksIG5ldy0+d21fbGluZXRpbWVbcGlwZV0pOwogCi0JCWZvciAobGV2ZWwgPSAwOyBs ZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKLQkJCWZvciAoaSA9IDA7IGkgPCBpbnRlbF9u dW1fcGxhbmVzKGNydGMpOyBpKyspCi0JCQkJSTkxNV9XUklURShQTEFORV9XTShwaXBlLCBpLCBs ZXZlbCksCi0JCQkJCSAgIG5ldy0+cGxhbmVbcGlwZV1baV1bbGV2ZWxdKTsKLQkJCUk5MTVfV1JJ VEUoQ1VSX1dNKHBpcGUsIGxldmVsKSwKLQkJCQkgICBuZXctPnBsYW5lW3BpcGVdW1BMQU5FX0NV UlNPUl1bbGV2ZWxdKTsKLQkJfQotCQlmb3IgKGkgPSAwOyBpIDwgaW50ZWxfbnVtX3BsYW5lcyhj cnRjKTsgaSsrKQotCQkJSTkxNV9XUklURShQTEFORV9XTV9UUkFOUyhwaXBlLCBpKSwKLQkJCQkg ICBuZXctPnBsYW5lX3RyYW5zW3BpcGVdW2ldKTsKLQkJSTkxNV9XUklURShDVVJfV01fVFJBTlMo cGlwZSksCi0JCQkgICBuZXctPnBsYW5lX3RyYW5zW3BpcGVdW1BMQU5FX0NVUlNPUl0pOwotCiAJ CWZvciAoaSA9IDA7IGkgPCBpbnRlbF9udW1fcGxhbmVzKGNydGMpOyBpKyspIHsKIAkJCXNrbF9k ZGJfZW50cnlfd3JpdGUoZGV2X3ByaXYsCiAJCQkJCSAgICBQTEFORV9CVUZfQ0ZHKHBpcGUsIGkp LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAwZGU5MzVhLi41MDAyNmYxIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjM4LDYgKzIzOCw4IEBAIHNrbF91 cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLAogCWNydGNfdy0tOwogCWNy dGNfaC0tOwogCisJc2tsX3dyaXRlX3BsYW5lX3dtKHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+ YmFzZS5jcnRjKSwgcGxhbmUpOworCiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkxNV9XUklURShQ TEFORV9LRVlWQUwocGlwZSwgcGxhbmUpLCBrZXktPm1pbl92YWx1ZSk7CiAJCUk5MTVfV1JJVEUo UExBTkVfS0VZTUFYKHBpcGUsIHBsYW5lKSwga2V5LT5tYXhfdmFsdWUpOwotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=