From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/5] drm/atomic: Move drm_crtc_commit to drm_crtc_state, v2. Date: Wed, 30 Aug 2017 14:17:50 +0200 Message-ID: <20170830121752.31291-4-maarten.lankhorst@linux.intel.com> References: <20170830121752.31291-1-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: <20170830121752.31291-1-maarten.lankhorst@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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TW9zdCBjb2RlIG9ubHkgY2FyZXMgYWJvdXQgdGhlIGN1cnJlbnQgY29tbWl0IG9yIHByZXZpb3Vz IGNvbW1pdC4KRm9ydHVhbnRlbHkgd2UgYWxyZWFkeSBoYXZlIGEgcGxhY2UgdG8gdHJhY2sgdGhv c2UuIE1vdmUgaXQgdG8KZHJtX2NydGNfc3RhdGUgd2hlcmUgaXQgYmVsb25ncy4gOikKClRoZSBw ZXItY3J0YyBjb21taXRfbGlzdCBpcyBrZXB0IGZvciBwbGFjZXMgd2hlcmUgd2UgaGF2ZSB0byBs b29rCmRlZXBlciB0aGFuIHRoZSBjdXJyZW50IG9yIHByZXZpb3VzIGNvbW1pdCBmb3IgY2hlY2tp bmcgd2hldGhlciB0byBzdGFsbApvbiB1bnBpbi4gVGhpcyBpcyB1c2VkIGluIGRybV9hdG9taWNf aGVscGVyX3NldHVwX2NvbW1pdCBhbmQKaW50ZWxfaGFzX3BlbmRpbmdfZmJfdW5waW4uCgpDaGFu Z2VzIHNpbmNlIHYxOgotIFVwZGF0ZSBrZXJuZWxkb2MgZm9yIGRybV9jcnRjLmNvbW1pdF9saXN0 LiAoZGFudmV0KQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmll bC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyAgICAg ICAgfCAgNyAtLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgOTIgKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX2F0b21p Yy5oICAgICAgICAgICAgfCAgMSAtCiBpbmNsdWRlL2RybS9kcm1fY3J0Yy5oICAgICAgICAgICAg ICB8IDIzICsrKysrKysrLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgODEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKaW5kZXggMmZkMzgzZDcyNTNhLi4yY2NlNDhm MjAzZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAtMTYzLDEzICsxNjMsNiBAQCB2b2lkIGRybV9h dG9taWNfc3RhdGVfZGVmYXVsdF9jbGVhcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUp CiAJCWNydGMtPmZ1bmNzLT5hdG9taWNfZGVzdHJveV9zdGF0ZShjcnRjLAogCQkJCQkJICBzdGF0 ZS0+Y3J0Y3NbaV0uc3RhdGUpOwogCi0JCWlmIChzdGF0ZS0+Y3J0Y3NbaV0uY29tbWl0KSB7Ci0J CQlrZnJlZShzdGF0ZS0+Y3J0Y3NbaV0uY29tbWl0LT5ldmVudCk7Ci0JCQlzdGF0ZS0+Y3J0Y3Nb aV0uY29tbWl0LT5ldmVudCA9IE5VTEw7Ci0JCQlkcm1fY3J0Y19jb21taXRfcHV0KHN0YXRlLT5j cnRjc1tpXS5jb21taXQpOwotCQl9Ci0KLQkJc3RhdGUtPmNydGNzW2ldLmNvbW1pdCA9IE5VTEw7 CiAJCXN0YXRlLT5jcnRjc1tpXS5wdHIgPSBOVUxMOwogCQlzdGF0ZS0+Y3J0Y3NbaV0uc3RhdGUg PSBOVUxMOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggMTFkMGU5NGEy MTgxLi44Y2NiOGI2NTM2YzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj X2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC0x MjYyLDEyICsxMjYyLDEyIEBAIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfd2FpdF9m b3JfdmJsYW5rcyk7CiB2b2lkIGRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX2ZsaXBfZG9uZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpv bGRfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICp1bnVzZWQ7CisJc3RydWN0IGRy bV9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJ aW50IGk7CiAKLQlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIHVu dXNlZCwgaSkgewotCQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQgPSBvbGRfc3RhdGUt PmNydGNzW2ldLmNvbW1pdDsKKwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUs IGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCXN0cnVjdCBkcm1fY3J0Y19jb21taXQgKmNv bW1pdCA9IG5ld19jcnRjX3N0YXRlLT5jb21taXQ7CiAJCWludCByZXQ7CiAKIAkJaWYgKCFjb21t aXQpCkBAIC0xMzg4LDExICsxMzg4LDEwIEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9hc3luY19j aGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsK IAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0Jc3RydWN0IGRybV9jcnRjX2Nv bW1pdCAqY29tbWl0OwogCXN0cnVjdCBkcm1fcGxhbmUgKl9fcGxhbmUsICpwbGFuZSA9IE5VTEw7 CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqX19wbGFuZV9zdGF0ZSwgKnBsYW5lX3N0YXRlID0g TlVMTDsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyAqZnVuY3M7Ci0JaW50 IGksIGosIG5fcGxhbmVzID0gMDsKKwlpbnQgaSwgbl9wbGFuZXMgPSAwOwogCiAJZm9yX2VhY2hf bmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJaWYgKGRy bV9hdG9taWNfY3J0Y19uZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKQpAQCAtMTQyMCwzMyArMTQx OSwxMCBAQCBpbnQgZHJtX2F0b21pY19oZWxwZXJfYXN5bmNfY2hlY2soc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAkvKgotCSAqIERvbid0IGRvIGFuIGFzeW5j IHVwZGF0ZSBpZiB0aGVyZSBpcyBhbiBvdXRzdGFuZGluZyBjb21taXQgbW9kaWZ5aW5nCisJICog VE9ETzogRG9uJ3QgZG8gYW4gYXN5bmMgdXBkYXRlIGlmIHRoZXJlIGlzIGFuIG91dHN0YW5kaW5n IGNvbW1pdCBtb2RpZnlpbmcKIAkgKiB0aGUgcGxhbmUuICBUaGlzIHByZXZlbnRzIG91ciBhc3lu YyB1cGRhdGUncyBjaGFuZ2VzIGZyb20gZ2V0dGluZwogCSAqIG92ZXJyaWRkZW4gYnkgYSBwcmV2 aW91cyBzeW5jaHJvbm91cyB1cGRhdGUncyBzdGF0ZS4KIAkgKi8KLQlmb3JfZWFjaF9uZXdfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlpZiAocGxhbmUtPmNy dGMgIT0gY3J0YykKLQkJCWNvbnRpbnVlOwotCi0JCXNwaW5fbG9jaygmY3J0Yy0+Y29tbWl0X2xv Y2spOwotCQljb21taXQgPSBsaXN0X2ZpcnN0X2VudHJ5X29yX251bGwoJmNydGMtPmNvbW1pdF9s aXN0LAotCQkJCQkJICBzdHJ1Y3QgZHJtX2NydGNfY29tbWl0LAotCQkJCQkJICBjb21taXRfZW50 cnkpOwotCQlpZiAoIWNvbW1pdCkgewotCQkJc3Bpbl91bmxvY2soJmNydGMtPmNvbW1pdF9sb2Nr KTsKLQkJCWNvbnRpbnVlOwotCQl9Ci0JCXNwaW5fdW5sb2NrKCZjcnRjLT5jb21taXRfbG9jayk7 Ci0KLQkJaWYgKCFjcnRjLT5zdGF0ZS0+c3RhdGUpCi0JCQljb250aW51ZTsKLQotCQlmb3JfZWFj aF9wbGFuZV9pbl9zdGF0ZShjcnRjLT5zdGF0ZS0+c3RhdGUsIF9fcGxhbmUsCi0JCQkJCV9fcGxh bmVfc3RhdGUsIGopIHsKLQkJCWlmIChfX3BsYW5lID09IHBsYW5lKQotCQkJCXJldHVybiAtRUlO VkFMOwotCQl9Ci0JfQogCiAJcmV0dXJuIGZ1bmNzLT5hdG9taWNfYXN5bmNfY2hlY2socGxhbmUs IHBsYW5lX3N0YXRlKTsKIH0KQEAgLTE3MzEsNyArMTcwNyw3IEBAIGludCBkcm1fYXRvbWljX2hl bHBlcl9zZXR1cF9jb21taXQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlrcmVm X2luaXQoJmNvbW1pdC0+cmVmKTsKIAkJY29tbWl0LT5jcnRjID0gY3J0YzsKIAotCQlzdGF0ZS0+ Y3J0Y3NbaV0uY29tbWl0ID0gY29tbWl0OworCQluZXdfY3J0Y19zdGF0ZS0+Y29tbWl0ID0gY29t bWl0OwogCiAJCXJldCA9IHN0YWxsX2NoZWNrcyhjcnRjLCBub25ibG9jayk7CiAJCWlmIChyZXQp CkBAIC0xNzY5LDIyICsxNzQ1LDYgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1p dChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiB9CiBFWFBPUlRfU1lNQk9MKGRybV9h dG9taWNfaGVscGVyX3NldHVwX2NvbW1pdCk7CiAKLQotc3RhdGljIHN0cnVjdCBkcm1fY3J0Y19j b21taXQgKnByZWNlZWRpbmdfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsKLQlzdHJ1 Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7Ci0JaW50IGkgPSAwOwotCi0JbGlzdF9mb3JfZWFj aF9lbnRyeShjb21taXQsICZjcnRjLT5jb21taXRfbGlzdCwgY29tbWl0X2VudHJ5KSB7Ci0JCS8q IHNraXAgdGhlIGZpcnN0IGVudHJ5LCB0aGF0J3MgdGhlIGN1cnJlbnQgY29tbWl0ICovCi0JCWlm IChpID09IDEpCi0JCQlyZXR1cm4gY29tbWl0OwotCQlpKys7Ci0JfQotCi0JcmV0dXJuIE5VTEw7 Ci19Ci0KIC8qKgogICogZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfZGVwZW5kZW5jaWVzIC0g d2FpdCBmb3IgcmVxdWlyZWQgcHJlY2VlZGluZyBjb21taXRzCiAgKiBAb2xkX3N0YXRlOiBhdG9t aWMgc3RhdGUgb2JqZWN0IHdpdGggb2xkIHN0YXRlIHN0cnVjdHVyZXMKQEAgLTE4MDAsMTcgKzE3 NjAsMTMgQEAgc3RhdGljIHN0cnVjdCBkcm1fY3J0Y19jb21taXQgKnByZWNlZWRpbmdfY29tbWl0 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3Jf ZGVwZW5kZW5jaWVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiB7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3Rh dGU7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJt X2NydGNfY29tbWl0ICpjb21taXQ7CiAJaW50IGk7CiAJbG9uZyByZXQ7CiAKLQlmb3JfZWFjaF9u ZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0J CXNwaW5fbG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOwotCQljb21taXQgPSBwcmVjZWVkaW5nX2Nv bW1pdChjcnRjKTsKLQkJaWYgKGNvbW1pdCkKLQkJCWRybV9jcnRjX2NvbW1pdF9nZXQoY29tbWl0 KTsKLQkJc3Bpbl91bmxvY2soJmNydGMtPmNvbW1pdF9sb2NrKTsKKwlmb3JfZWFjaF9vbGRfY3J0 Y19pbl9zdGF0ZShvbGRfc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7CisJCWNvbW1p dCA9IG9sZF9jcnRjX3N0YXRlLT5jb21taXQ7CiAKIAkJaWYgKCFjb21taXQpCiAJCQljb250aW51 ZTsKQEAgLTE4MjgsOCArMTc4NCw2IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3Jf ZGVwZW5kZW5jaWVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUpCiAJCWlmIChy ZXQgPT0gMCkKIAkJCURSTV9FUlJPUigiW0NSVEM6JWQ6JXNdIGZsaXBfZG9uZSB0aW1lZCBvdXRc biIsCiAJCQkJICBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKLQotCQlkcm1fY3J0Y19jb21t aXRfcHV0KGNvbW1pdCk7CiAJfQogfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl93 YWl0X2Zvcl9kZXBlbmRlbmNpZXMpOwpAQCAtMTg1Nyw3ICsxODExLDcgQEAgdm9pZCBkcm1fYXRv bWljX2hlbHBlcl9jb21taXRfaHdfZG9uZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0 YXRlKQogCWludCBpOwogCiAJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBj cnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewotCQljb21taXQgPSBvbGRfc3RhdGUtPmNydGNzW2ld LmNvbW1pdDsKKwkJY29tbWl0ID0gbmV3X2NydGNfc3RhdGUtPmNvbW1pdDsKIAkJaWYgKCFjb21t aXQpCiAJCQljb250aW51ZTsKIApAQCAtMTg4Nyw3ICsxODQxLDcgQEAgdm9pZCBkcm1fYXRvbWlj X2hlbHBlcl9jb21taXRfY2xlYW51cF9kb25lKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRf c3RhdGUpCiAJaW50IGk7CiAKIAlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShvbGRfc3RhdGUs IGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0JCWNvbW1pdCA9IG9sZF9zdGF0ZS0+Y3J0Y3Nb aV0uY29tbWl0OworCQljb21taXQgPSBuZXdfY3J0Y19zdGF0ZS0+Y29tbWl0OwogCQlpZiAoV0FS Tl9PTighY29tbWl0KSkKIAkJCWNvbnRpbnVlOwogCkBAIC0yMjc3LDIwICsyMjMxLDEzIEBAIGlu dCBkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSwKIAlzdHJ1Y3QgZHJtX3ByaXZhdGVfc3RhdGUgKm9sZF9vYmpfc3RhdGUsICpuZXdfb2Jq X3N0YXRlOwogCiAJaWYgKHN0YWxsKSB7Ci0JCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0 YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwgaSkgewotCQkJc3Bpbl9sb2NrKCZjcnRjLT5jb21t aXRfbG9jayk7Ci0JCQljb21taXQgPSBsaXN0X2ZpcnN0X2VudHJ5X29yX251bGwoJmNydGMtPmNv bW1pdF9saXN0LAotCQkJCQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0LCBjb21taXRfZW50cnkpOwot CQkJaWYgKGNvbW1pdCkKLQkJCQlkcm1fY3J0Y19jb21taXRfZ2V0KGNvbW1pdCk7Ci0JCQlzcGlu X3VubG9jaygmY3J0Yy0+Y29tbWl0X2xvY2spOworCQlmb3JfZWFjaF9vbGRfY3J0Y19pbl9zdGF0 ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKKwkJCWNvbW1pdCA9IG9sZF9jcnRj X3N0YXRlLT5jb21taXQ7CiAKIAkJCWlmICghY29tbWl0KQogCQkJCWNvbnRpbnVlOwogCiAJCQly ZXQgPSB3YWl0X2Zvcl9jb21wbGV0aW9uX2ludGVycnVwdGlibGUoJmNvbW1pdC0+aHdfZG9uZSk7 Ci0JCQlkcm1fY3J0Y19jb21taXRfcHV0KGNvbW1pdCk7Ci0KIAkJCWlmIChyZXQpCiAJCQkJcmV0 dXJuIHJldDsKIAkJfQpAQCAtMjMxNSwxMyArMjI2MiwxMyBAQCBpbnQgZHJtX2F0b21pY19oZWxw ZXJfc3dhcF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCXN0YXRlLT5j cnRjc1tpXS5zdGF0ZSA9IG9sZF9jcnRjX3N0YXRlOwogCQljcnRjLT5zdGF0ZSA9IG5ld19jcnRj X3N0YXRlOwogCi0JCWlmIChzdGF0ZS0+Y3J0Y3NbaV0uY29tbWl0KSB7CisJCWlmIChuZXdfY3J0 Y19zdGF0ZS0+Y29tbWl0KSB7CiAJCQlzcGluX2xvY2soJmNydGMtPmNvbW1pdF9sb2NrKTsKLQkJ CWxpc3RfYWRkKCZzdGF0ZS0+Y3J0Y3NbaV0uY29tbWl0LT5jb21taXRfZW50cnksCisJCQlsaXN0 X2FkZCgmbmV3X2NydGNfc3RhdGUtPmNvbW1pdC0+Y29tbWl0X2VudHJ5LAogCQkJCSAmY3J0Yy0+ Y29tbWl0X2xpc3QpOwogCQkJc3Bpbl91bmxvY2soJmNydGMtPmNvbW1pdF9sb2NrKTsKIAotCQkJ c3RhdGUtPmNydGNzW2ldLmNvbW1pdC0+ZXZlbnQgPSBOVUxMOworCQkJbmV3X2NydGNfc3RhdGUt PmNvbW1pdC0+ZXZlbnQgPSBOVUxMOwogCQl9CiAJfQogCkBAIC0zMTY5LDYgKzMxMTYsNyBAQCB2 b2lkIF9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCXN0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSBmYWxzZTsKIAlzdGF0ZS0+ Y29sb3JfbWdtdF9jaGFuZ2VkID0gZmFsc2U7CiAJc3RhdGUtPnpwb3NfY2hhbmdlZCA9IGZhbHNl OworCXN0YXRlLT5jb21taXQgPSBOVUxMOwogCXN0YXRlLT5ldmVudCA9IE5VTEw7CiAJc3RhdGUt PnBhZ2VmbGlwX2ZsYWdzID0gMDsKIH0KQEAgLTMyMDcsNiArMzE1NSwxMiBAQCBFWFBPUlRfU1lN Qk9MKGRybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKTsKICAqLwogdm9pZCBf X2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKnN0YXRlKQogeworCWlmIChzdGF0ZS0+Y29tbWl0KSB7CisJCWtmcmVlKHN0YXRlLT5jb21t aXQtPmV2ZW50KTsKKwkJc3RhdGUtPmNvbW1pdC0+ZXZlbnQgPSBOVUxMOworCQlkcm1fY3J0Y19j b21taXRfcHV0KHN0YXRlLT5jb21taXQpOworCX0KKwogCWRybV9wcm9wZXJ0eV9ibG9iX3B1dChz dGF0ZS0+bW9kZV9ibG9iKTsKIAlkcm1fcHJvcGVydHlfYmxvYl9wdXQoc3RhdGUtPmRlZ2FtbWFf bHV0KTsKIAlkcm1fcHJvcGVydHlfYmxvYl9wdXQoc3RhdGUtPmN0bSk7CmRpZmYgLS1naXQgYS9p bmNsdWRlL2RybS9kcm1fYXRvbWljLmggYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKaW5kZXgg OGE1ODA4ZWI1NjI4Li5lNzZkOWY5NWMxOTEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9h dG9taWMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKQEAgLTE0NCw3ICsxNDQsNiBA QCBzdHJ1Y3QgX19kcm1fcGxhbmVzX3N0YXRlIHsKIHN0cnVjdCBfX2RybV9jcnRjc19zdGF0ZSB7 CiAJc3RydWN0IGRybV9jcnRjICpwdHI7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSwg Km9sZF9zdGF0ZSwgKm5ld19zdGF0ZTsKLQlzdHJ1Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7 CiAJczMyIF9fdXNlciAqb3V0X2ZlbmNlX3B0cjsKIAl1bnNpZ25lZCBsYXN0X3ZibGFua19jb3Vu dDsKIH07CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oIGIvaW5jbHVkZS9kcm0v ZHJtX2NydGMuaAppbmRleCAxYTY0MjAyMGUzMDYuLjFhMDFmZjRlYTAyMyAxMDA2NDQKLS0tIGEv aW5jbHVkZS9kcm0vZHJtX2NydGMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC0y NTMsNiArMjUzLDE1IEBAIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSB7CiAJICovCiAJc3RydWN0IGRy bV9wZW5kaW5nX3ZibGFua19ldmVudCAqZXZlbnQ7CiAKKwkvKioKKwkgKiBAY29tbWl0OgorCSAq CisJICogVGhpcyB0cmFja3MgaG93IHRoZSBjb21taXQgZm9yIHRoaXMgdXBkYXRlIHByb2NlZWRz IHRocm91Z2ggdGhlCisJICogdmFyaW91cyBwaGFzZXMuIFRoaXMgaXMgbmV2ZXIgY2xlYXJlZCwg ZXhjZXB0IHdoZW4gd2UgZGVzdHJveSB0aGUKKwkgKiBzdGF0ZSwgc28gdGhhdCBzdWJzZXF1ZW50 IGNvbW1pdHMgY2FuIHN5bmNocm9uaXplIHdpdGggcHJldmlvdXMgb25lcy4KKwkgKi8KKwlzdHJ1 Y3QgZHJtX2NydGNfY29tbWl0ICpjb21taXQ7CisKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGU7CiB9OwogCkBAIC04MDgsMTAgKzgxNywxNiBAQCBzdHJ1Y3QgZHJtX2NydGMgewogCSAq IEBjb21taXRfbGlzdDoKIAkgKgogCSAqIExpc3Qgb2YgJmRybV9jcnRjX2NvbW1pdCBzdHJ1Y3R1 cmVzIHRyYWNraW5nIHBlbmRpbmcgY29tbWl0cy4KLQkgKiBQcm90ZWN0ZWQgYnkgQGNvbW1pdF9s b2NrLiBUaGlzIGxpc3QgZG9lc24ndCBob2xkIGl0cyBvd24gZnVsbAotCSAqIHJlZmVyZW5jZSwg YnV0IGJ1cnJvd3MgaXQgZnJvbSB0aGUgb25nb2luZyBjb21taXQuIENvbW1pdCBlbnRyaWVzCi0J ICogbXVzdCBiZSByZW1vdmVkIGZyb20gdGhpcyBsaXN0IG9uY2UgdGhlIGNvbW1pdCBpcyBmdWxs eSBjb21wbGV0ZWQsCi0JICogYnV0IGJlZm9yZSBpdCdzIGNvcnJlc3BvZGluZyAmZHJtX2F0b21p Y19zdGF0ZSBnZXRzIGRlc3Ryb3llZC4KKwkgKiBQcm90ZWN0ZWQgYnkgQGNvbW1pdF9sb2NrLiBU aGlzIGxpc3QgaG9sZHMgaXRzIG93biBmdWxsIHJlZmVyZW5jZSwKKwkgKiBhcyBkb2VzIHRoZSBv bmdvaW5nIGNvbW1pdC4KKwkgKgorCSAqICJOb3RlIHRoYXQgdGhlIGNvbW1pdCBmb3IgYSBzdGF0 ZSBjaGFuZ2UgaXMgYWxzbyB0cmFja2VkIGluCisJICogJmRybV9jcnRjX3N0YXRlLmNvbW1pdC4g Rm9yIGFjY2Vzc2luZyB0aGUgaW1tZWRpYXRlbHkgcHJlY2VlZGluZworCSAqIGNvbW1pdCBpbiBh biBhdG9taWMgdXBkYXRlIGl0IGlzIHJlY29tbWVuZGVkIHRvIGp1c3QgdXNlIHRoYXQKKwkgKiBw b2ludGVyIGluIHRoZSBvbGQgQ1JUQyBzdGF0ZSwgc2luY2UgYWNjZXNzaW5nIHRoYXQgZG9lc24n dCBuZWVkCisJICogYW55IGxvY2tpbmcgb3IgbGlzdC13YWxraW5nLiBAY29tbWl0X2xpc3Qgc2hv dWxkIG9ubHkgYmUgdXNlZCB0bworCSAqIHN0YWxsIGZvciBmcmFtZWJ1ZmZlciBjbGVhbnVwIHRo YXQncyBzaWduYWxsZWQgdGhyb3VnaAorCSAqICZkcm1fY3J0Y19jb21taXQuY2xlYW51cF9kb25l LiIKIAkgKi8KIAlzdHJ1Y3QgbGlzdF9oZWFkIGNvbW1pdF9saXN0OwogCi0tIAoyLjExLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=