From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/atomic: Move drm_crtc_commit to drm_crtc_state, v4. Date: Mon, 4 Sep 2017 17:04:56 +0200 Message-ID: <20170904150456.31049-1-maarten.lankhorst@linux.intel.com> References: <20170904104838.23822-3-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170904104838.23822-3-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org TW9zdCBjb2RlIG9ubHkgY2FyZXMgYWJvdXQgdGhlIGN1cnJlbnQgY29tbWl0IG9yIHByZXZpb3Vz IGNvbW1pdC4KRm9ydHVhbnRlbHkgd2UgYWxyZWFkeSBoYXZlIGEgcGxhY2UgdG8gdHJhY2sgdGhv c2UuIE1vdmUgaXQgdG8KZHJtX2NydGNfc3RhdGUgd2hlcmUgaXQgYmVsb25ncy4gOikKClRoZSBw ZXItY3J0YyBjb21taXRfbGlzdCBpcyBrZXB0IGZvciBwbGFjZXMgd2hlcmUgd2UgaGF2ZSB0byBs b29rCmRlZXBlciB0aGFuIHRoZSBjdXJyZW50IG9yIHByZXZpb3VzIGNvbW1pdCBmb3IgY2hlY2tp bmcgd2hldGhlciB0byBzdGFsbApvbiB1bnBpbi4gVGhpcyBpcyB1c2VkIGluIGRybV9hdG9taWNf aGVscGVyX3NldHVwX2NvbW1pdCBhbmQKaW50ZWxfaGFzX3BlbmRpbmdfZmJfdW5waW4uCgpDaGFu Z2VzIHNpbmNlIHYxOgotIFVwZGF0ZSBrZXJuZWxkb2MgZm9yIGRybV9jcnRjLmNvbW1pdF9saXN0 LiAoZGFudmV0KQpDaGFuZ2VzIHNpbmNlIHYyOgotIFJlbW92ZSBkcm1fYXRvbWljX2hlbHBlcl9h c3luY19jaGVjayBodW5rLiAocGluY2hhcnRsKQpDaGFuZ2VzIHNpbmNlIHYzOgotIEZpeCB1c2Ut YWZ0ZXItZnJlZSBpbiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfY2xlYW51cF9kb25lKCkuCgpT aWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXgu aW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZnds bC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jICAgICAgICB8ICA3IC0tLS0K IGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgODIgKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oICAgICAgICAg ICAgfCAgMSAtCiBpbmNsdWRlL2RybS9kcm1fY3J0Yy5oICAgICAgICAgICAgICB8IDIzICsrKysr KysrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDU5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IDJmZDM4M2Q3MjUzYS4uMmNjZTQ4ZjIwM2UwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMKQEAgLTE2MywxMyArMTYzLDYgQEAgdm9pZCBkcm1fYXRvbWljX3N0YXRl X2RlZmF1bHRfY2xlYXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQljcnRjLT5m dW5jcy0+YXRvbWljX2Rlc3Ryb3lfc3RhdGUoY3J0YywKIAkJCQkJCSAgc3RhdGUtPmNydGNzW2ld LnN0YXRlKTsKIAotCQlpZiAoc3RhdGUtPmNydGNzW2ldLmNvbW1pdCkgewotCQkJa2ZyZWUoc3Rh dGUtPmNydGNzW2ldLmNvbW1pdC0+ZXZlbnQpOwotCQkJc3RhdGUtPmNydGNzW2ldLmNvbW1pdC0+ ZXZlbnQgPSBOVUxMOwotCQkJZHJtX2NydGNfY29tbWl0X3B1dChzdGF0ZS0+Y3J0Y3NbaV0uY29t bWl0KTsKLQkJfQotCi0JCXN0YXRlLT5jcnRjc1tpXS5jb21taXQgPSBOVUxMOwogCQlzdGF0ZS0+ Y3J0Y3NbaV0ucHRyID0gTlVMTDsKIAkJc3RhdGUtPmNydGNzW2ldLnN0YXRlID0gTlVMTDsKIAl9 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDRlNTNhYWU5YTFmYi4uODBjMTM4 Y2JkZTlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMTI2MiwxMiArMTI2 MiwxMiBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFua3Mp Owogdm9pZCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9mbGlwX2RvbmUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKQog ewotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqdW51c2VkOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0 ZSAqbmV3X2NydGNfc3RhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWludCBpOwogCi0J Zm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCB1bnVzZWQsIGkpIHsK LQkJc3RydWN0IGRybV9jcnRjX2NvbW1pdCAqY29tbWl0ID0gb2xkX3N0YXRlLT5jcnRjc1tpXS5j b21taXQ7CisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBuZXdf Y3J0Y19zdGF0ZSwgaSkgeworCQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQgPSBuZXdf Y3J0Y19zdGF0ZS0+Y29tbWl0OwogCQlpbnQgcmV0OwogCiAJCWlmICghY29tbWl0KQpAQCAtMTcz MSw3ICsxNzMxLDcgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1pdChzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCWtyZWZfaW5pdCgmY29tbWl0LT5yZWYpOwogCQlj b21taXQtPmNydGMgPSBjcnRjOwogCi0JCXN0YXRlLT5jcnRjc1tpXS5jb21taXQgPSBjb21taXQ7 CisJCW5ld19jcnRjX3N0YXRlLT5jb21taXQgPSBjb21taXQ7CiAKIAkJcmV0ID0gc3RhbGxfY2hl Y2tzKGNydGMsIG5vbmJsb2NrKTsKIAkJaWYgKHJldCkKQEAgLTE3NjksMjIgKzE3NjksNiBAQCBp bnQgZHJtX2F0b21pY19oZWxwZXJfc2V0dXBfY29tbWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfc2V0dXBfY29tbWl0 KTsKIAotCi1zdGF0aWMgc3RydWN0IGRybV9jcnRjX2NvbW1pdCAqcHJlY2VlZGluZ19jb21taXQo c3RydWN0IGRybV9jcnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1fY3J0Y19jb21taXQgKmNvbW1p dDsKLQlpbnQgaSA9IDA7Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbW1pdCwgJmNydGMtPmNv bW1pdF9saXN0LCBjb21taXRfZW50cnkpIHsKLQkJLyogc2tpcCB0aGUgZmlyc3QgZW50cnksIHRo YXQncyB0aGUgY3VycmVudCBjb21taXQgKi8KLQkJaWYgKGkgPT0gMSkKLQkJCXJldHVybiBjb21t aXQ7Ci0JCWkrKzsKLQl9Ci0KLQlyZXR1cm4gTlVMTDsKLX0KLQogLyoqCiAgKiBkcm1fYXRvbWlj X2hlbHBlcl93YWl0X2Zvcl9kZXBlbmRlbmNpZXMgLSB3YWl0IGZvciByZXF1aXJlZCBwcmVjZWVk aW5nIGNvbW1pdHMKICAqIEBvbGRfc3RhdGU6IGF0b21pYyBzdGF0ZSBvYmplY3Qgd2l0aCBvbGQg c3RhdGUgc3RydWN0dXJlcwpAQCAtMTgwMCwxNyArMTc4NCwxMyBAQCBzdGF0aWMgc3RydWN0IGRy bV9jcnRjX2NvbW1pdCAqcHJlY2VlZGluZ19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQog dm9pZCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9kZXBlbmRlbmNpZXMoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0Y19jb21taXQgKmNvbW1pdDsKIAlp bnQgaTsKIAlsb25nIHJldDsKIAotCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKG9sZF9zdGF0 ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkpIHsKLQkJc3Bpbl9sb2NrKCZjcnRjLT5jb21taXRf bG9jayk7Ci0JCWNvbW1pdCA9IHByZWNlZWRpbmdfY29tbWl0KGNydGMpOwotCQlpZiAoY29tbWl0 KQotCQkJZHJtX2NydGNfY29tbWl0X2dldChjb21taXQpOwotCQlzcGluX3VubG9jaygmY3J0Yy0+ Y29tbWl0X2xvY2spOworCWZvcl9lYWNoX29sZF9jcnRjX2luX3N0YXRlKG9sZF9zdGF0ZSwgY3J0 Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJY29tbWl0ID0gb2xkX2NydGNfc3RhdGUtPmNvbW1p dDsKIAogCQlpZiAoIWNvbW1pdCkKIAkJCWNvbnRpbnVlOwpAQCAtMTgyOCw4ICsxODA4LDYgQEAg dm9pZCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9kZXBlbmRlbmNpZXMoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAkJaWYgKHJldCA9PSAwKQogCQkJRFJNX0VSUk9SKCJb Q1JUQzolZDolc10gZmxpcF9kb25lIHRpbWVkIG91dFxuIiwKIAkJCQkgIGNydGMtPmJhc2UuaWQs IGNydGMtPm5hbWUpOwotCi0JCWRybV9jcnRjX2NvbW1pdF9wdXQoY29tbWl0KTsKIAl9CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX2RlcGVuZGVuY2llcyk7CkBA IC0xODUyLDE1ICsxODMwLDI1IEBAIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfd2Fp dF9mb3JfZGVwZW5kZW5jaWVzKTsKIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X2h3X2Rv bmUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2Ny dGMgKmNydGM7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKKwlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7CiAJc3Ry dWN0IGRybV9jcnRjX2NvbW1pdCAqY29tbWl0OwogCWludCBpOwogCi0JZm9yX2VhY2hfbmV3X2Ny dGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewotCQljb21t aXQgPSBvbGRfc3RhdGUtPmNydGNzW2ldLmNvbW1pdDsKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19p bl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSwg aSkgeworCQljb21taXQgPSBuZXdfY3J0Y19zdGF0ZS0+Y29tbWl0OwogCQlpZiAoIWNvbW1pdCkK IAkJCWNvbnRpbnVlOwogCisJCS8qCisJCSAqIGNvcHkgbmV3X2NydGNfc3RhdGUtPmNvbW1pdCB0 byBvbGRfY3J0Y19zdGF0ZS0+Y29tbWl0LAorCQkgKiBpdCdzIHVuc2FmZSB0byB0b3VjaCBuZXdf Y3J0Y19zdGF0ZSBhZnRlciBod19kb25lLAorCQkgKiBidXQgd2Ugc3RpbGwgbmVlZCB0byBkbyBz byBpbiBjbGVhbnVwX2RvbmUoKS4KKwkJICovCisJCWlmIChvbGRfY3J0Y19zdGF0ZS0+Y29tbWl0 KQorCQkJZHJtX2NydGNfY29tbWl0X3B1dChvbGRfY3J0Y19zdGF0ZS0+Y29tbWl0KTsKKworCQlv bGRfY3J0Y19zdGF0ZS0+Y29tbWl0ID0gZHJtX2NydGNfY29tbWl0X2dldChjb21taXQpOworCiAJ CS8qIGJhY2tlbmQgbXVzdCBoYXZlIGNvbnN1bWVkIGFueSBldmVudCBieSBub3cgKi8KIAkJV0FS Tl9PTihuZXdfY3J0Y19zdGF0ZS0+ZXZlbnQpOwogCQljb21wbGV0ZV9hbGwoJmNvbW1pdC0+aHdf ZG9uZSk7CkBAIC0xODgyLDEzICsxODcwLDEzIEBAIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19o ZWxwZXJfY29tbWl0X2h3X2RvbmUpOwogdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfY2xl YW51cF9kb25lKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3RydWN0 IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGU7 CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2Ny dGNfY29tbWl0ICpjb21taXQ7CiAJaW50IGk7CiAJbG9uZyByZXQ7CiAKLQlmb3JfZWFjaF9uZXdf Y3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0JCWNv bW1pdCA9IG9sZF9zdGF0ZS0+Y3J0Y3NbaV0uY29tbWl0OworCWZvcl9lYWNoX29sZF9jcnRjX2lu X3N0YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJY29tbWl0ID0g b2xkX2NydGNfc3RhdGUtPmNvbW1pdDsKIAkJaWYgKFdBUk5fT04oIWNvbW1pdCkpCiAJCQljb250 aW51ZTsKIApAQCAtMjI5NCwyMCArMjI4MiwxMyBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfc3dh cF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGRybV9wcml2 YXRlX3N0YXRlICpvbGRfb2JqX3N0YXRlLCAqbmV3X29ial9zdGF0ZTsKIAogCWlmIChzdGFsbCkg ewotCQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3Rh dGUsIGkpIHsKLQkJCXNwaW5fbG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOwotCQkJY29tbWl0ID0g bGlzdF9maXJzdF9lbnRyeV9vcl9udWxsKCZjcnRjLT5jb21taXRfbGlzdCwKLQkJCQkJc3RydWN0 IGRybV9jcnRjX2NvbW1pdCwgY29tbWl0X2VudHJ5KTsKLQkJCWlmIChjb21taXQpCi0JCQkJZHJt X2NydGNfY29tbWl0X2dldChjb21taXQpOwotCQkJc3Bpbl91bmxvY2soJmNydGMtPmNvbW1pdF9s b2NrKTsKKwkJZm9yX2VhY2hfb2xkX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRj X3N0YXRlLCBpKSB7CisJCQljb21taXQgPSBvbGRfY3J0Y19zdGF0ZS0+Y29tbWl0OwogCiAJCQlp ZiAoIWNvbW1pdCkKIAkJCQljb250aW51ZTsKIAogCQkJcmV0ID0gd2FpdF9mb3JfY29tcGxldGlv bl9pbnRlcnJ1cHRpYmxlKCZjb21taXQtPmh3X2RvbmUpOwotCQkJZHJtX2NydGNfY29tbWl0X3B1 dChjb21taXQpOwotCiAJCQlpZiAocmV0KQogCQkJCXJldHVybiByZXQ7CiAJCX0KQEAgLTIzMzIs MTMgKzIzMTMsMTMgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlzdGF0ZS0+Y3J0Y3NbaV0uc3RhdGUgPSBvbGRfY3J0 Y19zdGF0ZTsKIAkJY3J0Yy0+c3RhdGUgPSBuZXdfY3J0Y19zdGF0ZTsKIAotCQlpZiAoc3RhdGUt PmNydGNzW2ldLmNvbW1pdCkgeworCQlpZiAobmV3X2NydGNfc3RhdGUtPmNvbW1pdCkgewogCQkJ c3Bpbl9sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7Ci0JCQlsaXN0X2FkZCgmc3RhdGUtPmNydGNz W2ldLmNvbW1pdC0+Y29tbWl0X2VudHJ5LAorCQkJbGlzdF9hZGQoJm5ld19jcnRjX3N0YXRlLT5j b21taXQtPmNvbW1pdF9lbnRyeSwKIAkJCQkgJmNydGMtPmNvbW1pdF9saXN0KTsKIAkJCXNwaW5f dW5sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7CiAKLQkJCXN0YXRlLT5jcnRjc1tpXS5jb21taXQt PmV2ZW50ID0gTlVMTDsKKwkJCW5ld19jcnRjX3N0YXRlLT5jb21taXQtPmV2ZW50ID0gTlVMTDsK IAkJfQogCX0KIApAQCAtMzE4Niw2ICszMTY3LDcgQEAgdm9pZCBfX2RybV9hdG9taWNfaGVscGVy X2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdGF0ZS0+Y29u bmVjdG9yc19jaGFuZ2VkID0gZmFsc2U7CiAJc3RhdGUtPmNvbG9yX21nbXRfY2hhbmdlZCA9IGZh bHNlOwogCXN0YXRlLT56cG9zX2NoYW5nZWQgPSBmYWxzZTsKKwlzdGF0ZS0+Y29tbWl0ID0gTlVM TDsKIAlzdGF0ZS0+ZXZlbnQgPSBOVUxMOwogCXN0YXRlLT5wYWdlZmxpcF9mbGFncyA9IDA7CiB9 CkBAIC0zMjI0LDYgKzMyMDYsMTIgQEAgRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9j cnRjX2R1cGxpY2F0ZV9zdGF0ZSk7CiAgKi8KIHZvaWQgX19kcm1fYXRvbWljX2hlbHBlcl9jcnRj X2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKKwlpZiAoc3Rh dGUtPmNvbW1pdCkgeworCQlrZnJlZShzdGF0ZS0+Y29tbWl0LT5ldmVudCk7CisJCXN0YXRlLT5j b21taXQtPmV2ZW50ID0gTlVMTDsKKwkJZHJtX2NydGNfY29tbWl0X3B1dChzdGF0ZS0+Y29tbWl0 KTsKKwl9CisKIAlkcm1fcHJvcGVydHlfYmxvYl9wdXQoc3RhdGUtPm1vZGVfYmxvYik7CiAJZHJt X3Byb3BlcnR5X2Jsb2JfcHV0KHN0YXRlLT5kZWdhbW1hX2x1dCk7CiAJZHJtX3Byb3BlcnR5X2Js b2JfcHV0KHN0YXRlLT5jdG0pOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5o IGIvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCmluZGV4IGY3M2I2NjNjMWY3Ni4uMjg1ZmJjNGVj MzYwIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKKysrIGIvaW5jbHVkZS9k cm0vZHJtX2F0b21pYy5oCkBAIC0xNDQsNyArMTQ0LDYgQEAgc3RydWN0IF9fZHJtX3BsYW5lc19z dGF0ZSB7CiBzdHJ1Y3QgX19kcm1fY3J0Y3Nfc3RhdGUgewogCXN0cnVjdCBkcm1fY3J0YyAqcHRy OwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUsICpvbGRfc3RhdGUsICpuZXdfc3RhdGU7 Ci0Jc3RydWN0IGRybV9jcnRjX2NvbW1pdCAqY29tbWl0OwogCXMzMiBfX3VzZXIgKm91dF9mZW5j ZV9wdHI7CiAJdW5zaWduZWQgbGFzdF92YmxhbmtfY291bnQ7CiB9OwpkaWZmIC0tZ2l0IGEvaW5j bHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKaW5kZXggMWE2NDIw MjBlMzA2Li4xYTAxZmY0ZWEwMjMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgK KysrIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaApAQCAtMjUzLDYgKzI1MywxNSBAQCBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgewogCSAqLwogCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQg KmV2ZW50OwogCisJLyoqCisJICogQGNvbW1pdDoKKwkgKgorCSAqIFRoaXMgdHJhY2tzIGhvdyB0 aGUgY29tbWl0IGZvciB0aGlzIHVwZGF0ZSBwcm9jZWVkcyB0aHJvdWdoIHRoZQorCSAqIHZhcmlv dXMgcGhhc2VzLiBUaGlzIGlzIG5ldmVyIGNsZWFyZWQsIGV4Y2VwdCB3aGVuIHdlIGRlc3Ryb3kg dGhlCisJICogc3RhdGUsIHNvIHRoYXQgc3Vic2VxdWVudCBjb21taXRzIGNhbiBzeW5jaHJvbml6 ZSB3aXRoIHByZXZpb3VzIG9uZXMuCisJICovCisJc3RydWN0IGRybV9jcnRjX2NvbW1pdCAqY29t bWl0OworCiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwogfTsKIApAQCAtODA4LDEw ICs4MTcsMTYgQEAgc3RydWN0IGRybV9jcnRjIHsKIAkgKiBAY29tbWl0X2xpc3Q6CiAJICoKIAkg KiBMaXN0IG9mICZkcm1fY3J0Y19jb21taXQgc3RydWN0dXJlcyB0cmFja2luZyBwZW5kaW5nIGNv bW1pdHMuCi0JICogUHJvdGVjdGVkIGJ5IEBjb21taXRfbG9jay4gVGhpcyBsaXN0IGRvZXNuJ3Qg aG9sZCBpdHMgb3duIGZ1bGwKLQkgKiByZWZlcmVuY2UsIGJ1dCBidXJyb3dzIGl0IGZyb20gdGhl IG9uZ29pbmcgY29tbWl0LiBDb21taXQgZW50cmllcwotCSAqIG11c3QgYmUgcmVtb3ZlZCBmcm9t IHRoaXMgbGlzdCBvbmNlIHRoZSBjb21taXQgaXMgZnVsbHkgY29tcGxldGVkLAotCSAqIGJ1dCBi ZWZvcmUgaXQncyBjb3JyZXNwb2RpbmcgJmRybV9hdG9taWNfc3RhdGUgZ2V0cyBkZXN0cm95ZWQu CisJICogUHJvdGVjdGVkIGJ5IEBjb21taXRfbG9jay4gVGhpcyBsaXN0IGhvbGRzIGl0cyBvd24g ZnVsbCByZWZlcmVuY2UsCisJICogYXMgZG9lcyB0aGUgb25nb2luZyBjb21taXQuCisJICoKKwkg KiAiTm90ZSB0aGF0IHRoZSBjb21taXQgZm9yIGEgc3RhdGUgY2hhbmdlIGlzIGFsc28gdHJhY2tl ZCBpbgorCSAqICZkcm1fY3J0Y19zdGF0ZS5jb21taXQuIEZvciBhY2Nlc3NpbmcgdGhlIGltbWVk aWF0ZWx5IHByZWNlZWRpbmcKKwkgKiBjb21taXQgaW4gYW4gYXRvbWljIHVwZGF0ZSBpdCBpcyBy ZWNvbW1lbmRlZCB0byBqdXN0IHVzZSB0aGF0CisJICogcG9pbnRlciBpbiB0aGUgb2xkIENSVEMg c3RhdGUsIHNpbmNlIGFjY2Vzc2luZyB0aGF0IGRvZXNuJ3QgbmVlZAorCSAqIGFueSBsb2NraW5n IG9yIGxpc3Qtd2Fsa2luZy4gQGNvbW1pdF9saXN0IHNob3VsZCBvbmx5IGJlIHVzZWQgdG8KKwkg KiBzdGFsbCBmb3IgZnJhbWVidWZmZXIgY2xlYW51cCB0aGF0J3Mgc2lnbmFsbGVkIHRocm91Z2gK KwkgKiAmZHJtX2NydGNfY29tbWl0LmNsZWFudXBfZG9uZS4iCiAJICovCiAJc3RydWN0IGxpc3Rf aGVhZCBjb21taXRfbGlzdDsKIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK