From: Sean Paul Subject: [PATCH 1/9] drm/msm: Don't track crtcs in msm private struct Date: Wed, 5 Dec 2018 11:29:33 -0500 Message-ID: <20181205162958.25025-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Cgpkcm0gY29yZSBhbHJlYWR5 IHRyYWNrcyB0aGlzLCBzbyB3ZSBjYW4ganVzdCBsZWFuIG9uIHRoYXQgaW5zdGVhZCBvZgp0cmFj a2luZyBvdXJzZWx2ZXMuCgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9t aXVtLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMgIHwg IDkgKystCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNC9tZHA0X2lycS5jIHwgMTAgKy0t CiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNC9tZHA0X2ttcy5jIHwgIDQgKy0KIGRyaXZl cnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVfaXJxLmMgfCAxMCArLS0KIGRyaXZlcnMvZ3B1 L2RybS9tc20vZGlzcC9tZHA1L21kcDVfa21zLmMgfCAxMiArLS0tCiBkcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9kcnYuYyAgICAgICAgICAgIHwgNzkgKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCAgICAgICAgICAgIHwgIDMgLQogNyBmaWxlcyBj aGFuZ2VkLCA2MiBpbnNlcnRpb25zKCspLCA2NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0v bXNtL2Rpc3AvZHB1MS9kcHVfa21zLmMKaW5kZXggMTk2OWYwZDA3ZDg2NS4uMzc5NmEyOTc4YTQw YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuYwpAQCAtNDk3LDYgKzQ5 Nyw3IEBAIHN0YXRpYyB2b2lkIF9kcHVfa21zX3NldHVwX2Rpc3BsYXlzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiBzdGF0aWMgdm9pZCBfZHB1X2ttc19kcm1fb2JqX2Rlc3Ryb3koc3RydWN0IGRw dV9rbXMgKmRwdV9rbXMpCiB7CiAJc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdjsKKwlzdHJ1 Y3QgZHJtX2NydGMgKmNydGM7CiAJaW50IGk7CiAKIAlpZiAoIWRwdV9rbXMpIHsKQEAgLTUxMSw5 ICs1MTIsOCBAQCBzdGF0aWMgdm9pZCBfZHB1X2ttc19kcm1fb2JqX2Rlc3Ryb3koc3RydWN0IGRw dV9rbXMgKmRwdV9rbXMpCiAJfQogCXByaXYgPSBkcHVfa21zLT5kZXYtPmRldl9wcml2YXRlOwog Ci0JZm9yIChpID0gMDsgaSA8IHByaXYtPm51bV9jcnRjczsgaSsrKQotCQlwcml2LT5jcnRjc1tp XS0+ZnVuY3MtPmRlc3Ryb3kocHJpdi0+Y3J0Y3NbaV0pOwotCXByaXYtPm51bV9jcnRjcyA9IDA7 CisJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZHB1X2ttcy0+ZGV2KQorCQljcnRjLT5mdW5jcy0+ ZGVzdHJveShjcnRjKTsKIAogCWZvciAoaSA9IDA7IGkgPCBwcml2LT5udW1fcGxhbmVzOyBpKysp CiAJCXByaXYtPnBsYW5lc1tpXS0+ZnVuY3MtPmRlc3Ryb3kocHJpdi0+cGxhbmVzW2ldKTsKQEAg LTU5OCwxMiArNTk4LDExIEBAIHN0YXRpYyBpbnQgX2RwdV9rbXNfZHJtX29ial9pbml0KHN0cnVj dCBkcHVfa21zICpkcHVfa21zKQogCQkJcmV0ID0gUFRSX0VSUihjcnRjKTsKIAkJCWdvdG8gZmFp bDsKIAkJfQotCQlwcml2LT5jcnRjc1twcml2LT5udW1fY3J0Y3MrK10gPSBjcnRjOwogCX0KIAog CS8qIEFsbCBDUlRDcyBhcmUgY29tcGF0aWJsZSB3aXRoIGFsbCBlbmNvZGVycyAqLwogCWZvciAo aSA9IDA7IGkgPCBwcml2LT5udW1fZW5jb2RlcnM7IGkrKykKLQkJcHJpdi0+ZW5jb2RlcnNbaV0t PnBvc3NpYmxlX2NydGNzID0gKDEgPDwgcHJpdi0+bnVtX2NydGNzKSAtIDE7CisJCXByaXYtPmVu Y29kZXJzW2ldLT5wb3NzaWJsZV9jcnRjcyA9ICgxIDw8IG1heF9jcnRjX2NvdW50KSAtIDE7CiAK IAlyZXR1cm4gMDsKIGZhaWw6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3Av bWRwNC9tZHA0X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDQvbWRwNF9pcnEu YwppbmRleCBiNzY0ZDdmMTAzMTI3Li43YzU5N2QyMWM5N2JhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbXNtL2Rpc3AvbWRwNC9tZHA0X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9t c20vZGlzcC9tZHA0L21kcDRfaXJxLmMKQEAgLTE1LDYgKzE1LDcgQEAKICAqIHRoaXMgcHJvZ3Jh bS4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KICAqLwogCisj aW5jbHVkZSA8ZHJtL2RybV9jcnRjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9wcmludC5oPgogCiAj aW5jbHVkZSAibXNtX2Rydi5oIgpAQCAtNzksOCArODAsNyBAQCBpcnFyZXR1cm5fdCBtZHA0X2ly cShzdHJ1Y3QgbXNtX2ttcyAqa21zKQogCXN0cnVjdCBtZHBfa21zICptZHBfa21zID0gdG9fbWRw X2ttcyhrbXMpOwogCXN0cnVjdCBtZHA0X2ttcyAqbWRwNF9rbXMgPSB0b19tZHA0X2ttcyhtZHBf a21zKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWRwNF9rbXMtPmRldjsKLQlzdHJ1Y3Qg bXNtX2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQl1bnNpZ25lZCBpbnQg aWQ7CisJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXVpbnQzMl90IHN0YXR1cywgZW5hYmxlOwog CiAJZW5hYmxlID0gbWRwNF9yZWFkKG1kcDRfa21zLCBSRUdfTURQNF9JTlRSX0VOQUJMRSk7CkBA IC05MSw5ICs5MSw5IEBAIGlycXJldHVybl90IG1kcDRfaXJxKHN0cnVjdCBtc21fa21zICprbXMp CiAKIAltZHBfZGlzcGF0Y2hfaXJxcyhtZHBfa21zLCBzdGF0dXMpOwogCi0JZm9yIChpZCA9IDA7 IGlkIDwgcHJpdi0+bnVtX2NydGNzOyBpZCsrKQotCQlpZiAoc3RhdHVzICYgbWRwNF9jcnRjX3Zi bGFuayhwcml2LT5jcnRjc1tpZF0pKQotCQkJZHJtX2hhbmRsZV92YmxhbmsoZGV2LCBpZCk7CisJ ZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KQorCQlpZiAoc3RhdHVzICYgbWRwNF9jcnRjX3Zi bGFuayhjcnRjKSkKKwkJCWRybV9oYW5kbGVfdmJsYW5rKGRldiwgZHJtX2NydGNfaW5kZXgoY3J0 YykpOwogCiAJcmV0dXJuIElSUV9IQU5ETEVEOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL21kcDQvbWRwNF9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9t ZHA0L21kcDRfa21zLmMKaW5kZXggZTQzN2FhODA2ZjdiZS4uZjdmNjc4YzU1ZTNhYyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDQvbWRwNF9rbXMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNC9tZHA0X2ttcy5jCkBAIC0zNzMsNyArMzczLDcgQEAg c3RhdGljIGludCBtb2Rlc2V0X2luaXQoc3RydWN0IG1kcDRfa21zICptZHA0X2ttcykKIAkJCWdv dG8gZmFpbDsKIAkJfQogCi0JCWNydGMgID0gbWRwNF9jcnRjX2luaXQoZGV2LCBwbGFuZSwgcHJp di0+bnVtX2NydGNzLCBpLAorCQljcnRjICA9IG1kcDRfY3J0Y19pbml0KGRldiwgcGxhbmUsIEFS UkFZX1NJWkUobWRwNF9jcnRjcyksIGksCiAJCQkJbWRwNF9jcnRjc1tpXSk7CiAJCWlmIChJU19F UlIoY3J0YykpIHsKIAkJCURSTV9ERVZfRVJST1IoZGV2LT5kZXYsICJmYWlsZWQgdG8gY29uc3Ry dWN0IGNydGMgZm9yICVzXG4iLApAQCAtMzgxLDggKzM4MSw2IEBAIHN0YXRpYyBpbnQgbW9kZXNl dF9pbml0KHN0cnVjdCBtZHA0X2ttcyAqbWRwNF9rbXMpCiAJCQlyZXQgPSBQVFJfRVJSKGNydGMp OwogCQkJZ290byBmYWlsOwogCQl9Ci0KLQkJcHJpdi0+Y3J0Y3NbcHJpdi0+bnVtX2NydGNzKytd ID0gY3J0YzsKIAl9CiAKIAkvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNw L21kcDUvbWRwNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVfaXJx LmMKaW5kZXggMjgwZTM2OGJjOWJiOC4uYzY2YTdmYmQ5YjljMyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL21zbS9kaXNwL21kcDUvbWRwNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v bXNtL2Rpc3AvbWRwNS9tZHA1X2lycS5jCkBAIC0xNyw2ICsxNyw3IEBACiAKICNpbmNsdWRlIDxs aW51eC9pcnEuaD4KIAorI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5oPgogI2luY2x1ZGUgPGRybS9k cm1fcHJpbnQuaD4KIAogI2luY2x1ZGUgIm1zbV9kcnYuaCIKQEAgLTkyLDggKzkzLDcgQEAgaXJx cmV0dXJuX3QgbWRwNV9pcnEoc3RydWN0IG1zbV9rbXMgKmttcykKIAlzdHJ1Y3QgbWRwX2ttcyAq bWRwX2ttcyA9IHRvX21kcF9rbXMoa21zKTsKIAlzdHJ1Y3QgbWRwNV9rbXMgKm1kcDVfa21zID0g dG9fbWRwNV9rbXMobWRwX2ttcyk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG1kcDVfa21z LT5kZXY7Ci0Jc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 Ci0JdW5zaWduZWQgaW50IGlkOworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAl1aW50MzJfdCBz dGF0dXMsIGVuYWJsZTsKIAogCWVuYWJsZSA9IG1kcDVfcmVhZChtZHA1X2ttcywgUkVHX01EUDVf SU5UUl9FTik7CkBAIC0xMDQsOSArMTA0LDkgQEAgaXJxcmV0dXJuX3QgbWRwNV9pcnEoc3RydWN0 IG1zbV9rbXMgKmttcykKIAogCW1kcF9kaXNwYXRjaF9pcnFzKG1kcF9rbXMsIHN0YXR1cyk7CiAK LQlmb3IgKGlkID0gMDsgaWQgPCBwcml2LT5udW1fY3J0Y3M7IGlkKyspCi0JCWlmIChzdGF0dXMg JiBtZHA1X2NydGNfdmJsYW5rKHByaXYtPmNydGNzW2lkXSkpCi0JCQlkcm1faGFuZGxlX3ZibGFu ayhkZXYsIGlkKTsKKwlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpCisJCWlmIChzdGF0dXMg JiBtZHA1X2NydGNfdmJsYW5rKGNydGMpKQorCQkJZHJtX2hhbmRsZV92YmxhbmsoZGV2LCBkcm1f Y3J0Y19pbmRleChjcnRjKSk7CiAKIAlyZXR1cm4gSVJRX0hBTkRMRUQ7CiB9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNS9tZHA1X2ttcy5jIGIvZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL21kcDUvbWRwNV9rbXMuYwppbmRleCBkMjdlMzVhMjE3YmQ3Li40ZmI3MDUz MmIwNDg0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvbWRwNS9tZHA1X2tt cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVfa21zLmMKQEAgLTUy MCw3ICs1MjAsNiBAQCBzdGF0aWMgaW50IG1vZGVzZXRfaW5pdChzdHJ1Y3QgbWRwNV9rbXMgKm1k cDVfa21zKQogCQkJRFJNX0RFVl9FUlJPUihkZXYtPmRldiwgImZhaWxlZCB0byBjb25zdHJ1Y3Qg Y3J0YyAlZCAoJWQpXG4iLCBpLCByZXQpOwogCQkJZ290byBmYWlsOwogCQl9Ci0JCXByaXYtPmNy dGNzW3ByaXYtPm51bV9jcnRjcysrXSA9IGNydGM7CiAJfQogCiAJLyoKQEAgLTUzMCw3ICs1Mjks NyBAQCBzdGF0aWMgaW50IG1vZGVzZXRfaW5pdChzdHJ1Y3QgbWRwNV9rbXMgKm1kcDVfa21zKQog CWZvciAoaSA9IDA7IGkgPCBwcml2LT5udW1fZW5jb2RlcnM7IGkrKykgewogCQlzdHJ1Y3QgZHJt X2VuY29kZXIgKmVuY29kZXIgPSBwcml2LT5lbmNvZGVyc1tpXTsKIAotCQllbmNvZGVyLT5wb3Nz aWJsZV9jcnRjcyA9ICgxIDw8IHByaXYtPm51bV9jcnRjcykgLSAxOworCQllbmNvZGVyLT5wb3Nz aWJsZV9jcnRjcyA9ICgxIDw8IG51bV9jcnRjcykgLSAxOwogCX0KIAogCXJldHVybiAwOwpAQCAt NTg5LDEyICs1ODgsMTEgQEAgc3RhdGljIGJvb2wgbWRwNV9nZXRfc2Nhbm91dHBvcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKIAkJCQlrdGltZV90ICpzdGltZSwg a3RpbWVfdCAqZXRpbWUsCiAJCQkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUp CiB7Ci0Jc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcjsKIAlp bnQgbGluZSwgdnN3LCB2YnAsIHZhY3RpdmVfc3RhcnQsIHZhY3RpdmVfZW5kLCB2ZnBfZW5kOwog Ci0JY3J0YyA9IHByaXYtPmNydGNzW3BpcGVdOworCWNydGMgPSBkcm1fY3J0Y19mcm9tX2luZGV4 KGRldiwgcGlwZSk7CiAJaWYgKCFjcnRjKSB7CiAJCURSTV9FUlJPUigiSW52YWxpZCBjcnRjICVk XG4iLCBwaXBlKTsKIAkJcmV0dXJuIGZhbHNlOwpAQCAtNjQ2LDE0ICs2NDQsMTAgQEAgc3RhdGlj IGJvb2wgbWRwNV9nZXRfc2Nhbm91dHBvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25l ZCBpbnQgcGlwZSwKIAogc3RhdGljIHUzMiBtZHA1X2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIHsKLQlzdHJ1Y3QgbXNtX2RybV9w cml2YXRlICpwcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 CiAJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwogCi0JaWYgKHBpcGUgPj0gcHJpdi0+bnVt X2NydGNzKQotCQlyZXR1cm4gMDsKLQotCWNydGMgPSBwcml2LT5jcnRjc1twaXBlXTsKKwljcnRj ID0gZHJtX2NydGNfZnJvbV9pbmRleChkZXYsIHBpcGUpOwogCWlmICghY3J0YykKIAkJcmV0dXJu IDA7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jIGIvZHJpdmVy cy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKaW5kZXggODFiZmFjNzQ0YTU1NS4uZGNjNjcxZWJhMjRk YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL21zbS9tc21fZHJ2LmMKQEAgLTIyNCwxNSArMjI0LDE5IEBAIHN0YXRpYyB2b2lk IHZibGFua19jdHJsX3dvcmtlcihzdHJ1Y3Qga3RocmVhZF93b3JrICp3b3JrKQogCiAJc3Bpbl9s b2NrX2lycXNhdmUoJnZibF9jdHJsLT5sb2NrLCBmbGFncyk7CiAJbGlzdF9mb3JfZWFjaF9lbnRy eV9zYWZlKHZibF9ldiwgdG1wLCAmdmJsX2N0cmwtPmV2ZW50X2xpc3QsIG5vZGUpIHsKKwkJc3Ry dWN0IGRybV9jcnRjICpjcnRjID0gZHJtX2NydGNfZnJvbV9pbmRleChwcml2LT5kZXYsCisJCQkJ CQkJICAgIHZibF9ldi0+Y3J0Y19pZCk7CisKKwkJaWYgKFdBUk5fT04oIWNydGMpKQorCQkJY29u dGludWU7CisKIAkJbGlzdF9kZWwoJnZibF9ldi0+bm9kZSk7CiAJCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJnZibF9jdHJsLT5sb2NrLCBmbGFncyk7CiAKIAkJaWYgKHZibF9ldi0+ZW5hYmxlKQot CQkJa21zLT5mdW5jcy0+ZW5hYmxlX3ZibGFuayhrbXMsCi0JCQkJCQlwcml2LT5jcnRjc1t2Ymxf ZXYtPmNydGNfaWRdKTsKKwkJCWttcy0+ZnVuY3MtPmVuYWJsZV92Ymxhbmsoa21zLCBjcnRjKTsK IAkJZWxzZQotCQkJa21zLT5mdW5jcy0+ZGlzYWJsZV92Ymxhbmsoa21zLAotCQkJCQkJcHJpdi0+ Y3J0Y3NbdmJsX2V2LT5jcnRjX2lkXSk7CisJCQlrbXMtPmZ1bmNzLT5kaXNhYmxlX3ZibGFuayhr bXMsIGNydGMpOwogCiAJCWtmcmVlKHZibF9ldik7CiAKQEAgLTI3MCwxMiArMjc0LDEyIEBAIHN0 YXRpYyBpbnQgbXNtX2RybV91bmluaXQoc3RydWN0IGRldmljZSAqZGV2KQogewogCXN0cnVjdCBw bGF0Zm9ybV9kZXZpY2UgKnBkZXYgPSB0b19wbGF0Zm9ybV9kZXZpY2UoZGV2KTsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGRldiA9IHBsYXRmb3JtX2dldF9kcnZkYXRhKHBkZXYpOworCXN0cnVjdCBk cm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gZGRldi0+ZGV2 X3ByaXZhdGU7CiAJc3RydWN0IG1zbV9rbXMgKmttcyA9IHByaXYtPmttczsKIAlzdHJ1Y3QgbXNt X21kc3MgKm1kc3MgPSBwcml2LT5tZHNzOwogCXN0cnVjdCBtc21fdmJsYW5rX2N0cmwgKnZibF9j dHJsID0gJnByaXYtPnZibGFua19jdHJsOwogCXN0cnVjdCB2YmxhbmtfZXZlbnQgKnZibF9ldiwg KnRtcDsKLQlpbnQgaTsKIAogCS8qIFdlIG11c3QgY2FuY2VsIGFuZCBjbGVhbnVwIGFueSBwZW5k aW5nIHZibGFuayBlbmFibGUvZGlzYWJsZQogCSAqIHdvcmsgYmVmb3JlIGRybV9pcnFfdW5pbnN0 YWxsKCkgdG8gYXZvaWQgd29yayByZS1lbmFibGluZyBhbgpAQCAtMjg4LDE3ICsyOTIsMTggQEAg c3RhdGljIGludCBtc21fZHJtX3VuaW5pdChzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJfQogCiAJLyog Y2xlYW4gdXAgZGlzcGxheSBjb21taXQvZXZlbnQgd29ya2VyIHRocmVhZHMgKi8KLQlmb3IgKGkg PSAwOyBpIDwgcHJpdi0+bnVtX2NydGNzOyBpKyspIHsKLQkJaWYgKHByaXYtPmRpc3BfdGhyZWFk W2ldLnRocmVhZCkgewotCQkJa3RocmVhZF9mbHVzaF93b3JrZXIoJnByaXYtPmRpc3BfdGhyZWFk W2ldLndvcmtlcik7Ci0JCQlrdGhyZWFkX3N0b3AocHJpdi0+ZGlzcF90aHJlYWRbaV0udGhyZWFk KTsKLQkJCXByaXYtPmRpc3BfdGhyZWFkW2ldLnRocmVhZCA9IE5VTEw7CisJZHJtX2Zvcl9lYWNo X2NydGMoY3J0YywgZGRldikgeworCQl1bnNpZ25lZCBpbnQgcGlwZSA9IGRybV9jcnRjX2luZGV4 KGNydGMpOworCQlpZiAocHJpdi0+ZGlzcF90aHJlYWRbcGlwZV0udGhyZWFkKSB7CisJCQlrdGhy ZWFkX2ZsdXNoX3dvcmtlcigmcHJpdi0+ZGlzcF90aHJlYWRbcGlwZV0ud29ya2VyKTsKKwkJCWt0 aHJlYWRfc3RvcChwcml2LT5kaXNwX3RocmVhZFtwaXBlXS50aHJlYWQpOworCQkJcHJpdi0+ZGlz cF90aHJlYWRbcGlwZV0udGhyZWFkID0gTlVMTDsKIAkJfQogCi0JCWlmIChwcml2LT5ldmVudF90 aHJlYWRbaV0udGhyZWFkKSB7Ci0JCQlrdGhyZWFkX2ZsdXNoX3dvcmtlcigmcHJpdi0+ZXZlbnRf dGhyZWFkW2ldLndvcmtlcik7Ci0JCQlrdGhyZWFkX3N0b3AocHJpdi0+ZXZlbnRfdGhyZWFkW2ld LnRocmVhZCk7Ci0JCQlwcml2LT5ldmVudF90aHJlYWRbaV0udGhyZWFkID0gTlVMTDsKKwkJaWYg KHByaXYtPmV2ZW50X3RocmVhZFtwaXBlXS50aHJlYWQpIHsKKwkJCWt0aHJlYWRfZmx1c2hfd29y a2VyKCZwcml2LT5ldmVudF90aHJlYWRbcGlwZV0ud29ya2VyKTsKKwkJCWt0aHJlYWRfc3RvcChw cml2LT5ldmVudF90aHJlYWRbcGlwZV0udGhyZWFkKTsKKwkJCXByaXYtPmV2ZW50X3RocmVhZFtw aXBlXS50aHJlYWQgPSBOVUxMOwogCQl9CiAJfQogCkBAIC00MzgsMTAgKzQ0MywxMSBAQCBzdGF0 aWMgaW50IG1zbV9kcm1faW5pdChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZHJpdmVy ICpkcnYpCiB7CiAJc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiA9IHRvX3BsYXRmb3JtX2Rl dmljZShkZXYpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZGV2OworCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKIAlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2OwogCXN0cnVjdCBtc21fa21zICpr bXM7CiAJc3RydWN0IG1zbV9tZHNzICptZHNzOwotCWludCByZXQsIGk7CisJaW50IHJldDsKIAlz dHJ1Y3Qgc2NoZWRfcGFyYW0gcGFyYW07CiAKIAlkZGV2ID0gZHJtX2Rldl9hbGxvYyhkcnYsIGRl dik7CkBAIC01NDcsMzkgKzU1Myw0MiBAQCBzdGF0aWMgaW50IG1zbV9kcm1faW5pdChzdHJ1Y3Qg ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZHJpdmVyICpkcnYpCiAJICogb3RoZXIgcmVhbCB0aW1l IGFuZCBub3JtYWwgcHJpb3JpdHkgdGFzawogCSAqLwogCXBhcmFtLnNjaGVkX3ByaW9yaXR5ID0g MTY7Ci0JZm9yIChpID0gMDsgaSA8IHByaXYtPm51bV9jcnRjczsgaSsrKSB7CisJZHJtX2Zvcl9l YWNoX2NydGMoY3J0YywgZGRldikgeworCQl1bnNpZ25lZCBpbnQgcGlwZSA9IGRybV9jcnRjX2lu ZGV4KGNydGMpOwogCiAJCS8qIGluaXRpYWxpemUgZGlzcGxheSB0aHJlYWQgKi8KLQkJcHJpdi0+ ZGlzcF90aHJlYWRbaV0uY3J0Y19pZCA9IHByaXYtPmNydGNzW2ldLT5iYXNlLmlkOwotCQlrdGhy ZWFkX2luaXRfd29ya2VyKCZwcml2LT5kaXNwX3RocmVhZFtpXS53b3JrZXIpOwotCQlwcml2LT5k aXNwX3RocmVhZFtpXS5kZXYgPSBkZGV2OwotCQlwcml2LT5kaXNwX3RocmVhZFtpXS50aHJlYWQg PQorCQlwcml2LT5kaXNwX3RocmVhZFtwaXBlXS5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKKwkJ a3RocmVhZF9pbml0X3dvcmtlcigmcHJpdi0+ZGlzcF90aHJlYWRbcGlwZV0ud29ya2VyKTsKKwkJ cHJpdi0+ZGlzcF90aHJlYWRbcGlwZV0uZGV2ID0gZGRldjsKKwkJcHJpdi0+ZGlzcF90aHJlYWRb cGlwZV0udGhyZWFkID0KIAkJCWt0aHJlYWRfcnVuKGt0aHJlYWRfd29ya2VyX2ZuLAotCQkJCSZw cml2LT5kaXNwX3RocmVhZFtpXS53b3JrZXIsCi0JCQkJImNydGNfY29tbWl0OiVkIiwgcHJpdi0+ ZGlzcF90aHJlYWRbaV0uY3J0Y19pZCk7Ci0JCWlmIChJU19FUlIocHJpdi0+ZGlzcF90aHJlYWRb aV0udGhyZWFkKSkgeworCQkJCSZwcml2LT5kaXNwX3RocmVhZFtwaXBlXS53b3JrZXIsCisJCQkJ ImNydGNfY29tbWl0OiVkIiwKKwkJCQlwcml2LT5kaXNwX3RocmVhZFtwaXBlXS5jcnRjX2lkKTsK KwkJaWYgKElTX0VSUihwcml2LT5kaXNwX3RocmVhZFtwaXBlXS50aHJlYWQpKSB7CiAJCQlEUk1f REVWX0VSUk9SKGRldiwgImZhaWxlZCB0byBjcmVhdGUgY3J0Y19jb21taXQga3RocmVhZFxuIik7 Ci0JCQlwcml2LT5kaXNwX3RocmVhZFtpXS50aHJlYWQgPSBOVUxMOworCQkJcHJpdi0+ZGlzcF90 aHJlYWRbcGlwZV0udGhyZWFkID0gTlVMTDsKIAkJCWdvdG8gZXJyX21zbV91bmluaXQ7CiAJCX0K IAotCQlyZXQgPSBzY2hlZF9zZXRzY2hlZHVsZXIocHJpdi0+ZGlzcF90aHJlYWRbaV0udGhyZWFk LAorCQlyZXQgPSBzY2hlZF9zZXRzY2hlZHVsZXIocHJpdi0+ZGlzcF90aHJlYWRbcGlwZV0udGhy ZWFkLAogCQkJCQkgU0NIRURfRklGTywgJnBhcmFtKTsKIAkJaWYgKHJldCkKIAkJCWRldl93YXJu KGRldiwgImRpc3BfdGhyZWFkIHNldCBwcmlvcml0eSBmYWlsZWQ6ICVkXG4iLAogCQkJCSByZXQp OwogCiAJCS8qIGluaXRpYWxpemUgZXZlbnQgdGhyZWFkICovCi0JCXByaXYtPmV2ZW50X3RocmVh ZFtpXS5jcnRjX2lkID0gcHJpdi0+Y3J0Y3NbaV0tPmJhc2UuaWQ7Ci0JCWt0aHJlYWRfaW5pdF93 b3JrZXIoJnByaXYtPmV2ZW50X3RocmVhZFtpXS53b3JrZXIpOwotCQlwcml2LT5ldmVudF90aHJl YWRbaV0uZGV2ID0gZGRldjsKLQkJcHJpdi0+ZXZlbnRfdGhyZWFkW2ldLnRocmVhZCA9CisJCXBy aXYtPmV2ZW50X3RocmVhZFtwaXBlXS5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKKwkJa3RocmVh ZF9pbml0X3dvcmtlcigmcHJpdi0+ZXZlbnRfdGhyZWFkW3BpcGVdLndvcmtlcik7CisJCXByaXYt PmV2ZW50X3RocmVhZFtwaXBlXS5kZXYgPSBkZGV2OworCQlwcml2LT5ldmVudF90aHJlYWRbcGlw ZV0udGhyZWFkID0KIAkJCWt0aHJlYWRfcnVuKGt0aHJlYWRfd29ya2VyX2ZuLAotCQkJCSZwcml2 LT5ldmVudF90aHJlYWRbaV0ud29ya2VyLAotCQkJCSJjcnRjX2V2ZW50OiVkIiwgcHJpdi0+ZXZl bnRfdGhyZWFkW2ldLmNydGNfaWQpOwotCQlpZiAoSVNfRVJSKHByaXYtPmV2ZW50X3RocmVhZFtp XS50aHJlYWQpKSB7CisJCQkJJnByaXYtPmV2ZW50X3RocmVhZFtwaXBlXS53b3JrZXIsCisJCQkJ ImNydGNfZXZlbnQ6JWQiLAorCQkJCXByaXYtPmV2ZW50X3RocmVhZFtwaXBlXS5jcnRjX2lkKTsK KwkJaWYgKElTX0VSUihwcml2LT5ldmVudF90aHJlYWRbcGlwZV0udGhyZWFkKSkgewogCQkJRFJN X0RFVl9FUlJPUihkZXYsICJmYWlsZWQgdG8gY3JlYXRlIGNydGNfZXZlbnQga3RocmVhZFxuIik7 Ci0JCQlwcml2LT5ldmVudF90aHJlYWRbaV0udGhyZWFkID0gTlVMTDsKKwkJCXByaXYtPmV2ZW50 X3RocmVhZFtwaXBlXS50aHJlYWQgPSBOVUxMOwogCQkJZ290byBlcnJfbXNtX3VuaW5pdDsKIAkJ fQogCkBAIC01OTAsMTQgKzU5OSwxNCBAQCBzdGF0aWMgaW50IG1zbV9kcm1faW5pdChzdHJ1Y3Qg ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZHJpdmVyICpkcnYpCiAJCSAqIGZyYW1lX3BlbmRpbmcg Y291bnRlcnMgYmV5b25kIDIuIFRoaXMgY2FuIGxlYWQgdG8gY29tbWl0CiAJCSAqIGZhaWx1cmUg YXQgY3J0YyBjb21taXQgbGV2ZWwuCiAJCSAqLwotCQlyZXQgPSBzY2hlZF9zZXRzY2hlZHVsZXIo cHJpdi0+ZXZlbnRfdGhyZWFkW2ldLnRocmVhZCwKKwkJcmV0ID0gc2NoZWRfc2V0c2NoZWR1bGVy KHByaXYtPmV2ZW50X3RocmVhZFtwaXBlXS50aHJlYWQsCiAJCQkJCSBTQ0hFRF9GSUZPLCAmcGFy YW0pOwogCQlpZiAocmV0KQogCQkJZGV2X3dhcm4oZGV2LCAiZXZlbnRfdGhyZWFkIHNldCBwcmlv cml0eSBmYWlsZWQ6JWRcbiIsCiAJCQkJIHJldCk7CiAJfQogCi0JcmV0ID0gZHJtX3ZibGFua19p bml0KGRkZXYsIHByaXYtPm51bV9jcnRjcyk7CisJcmV0ID0gZHJtX3ZibGFua19pbml0KGRkZXYs IGRkZXYtPm1vZGVfY29uZmlnLm51bV9jcnRjKTsKIAlpZiAocmV0IDwgMCkgewogCQlEUk1fREVW X0VSUk9SKGRldiwgImZhaWxlZCB0byBpbml0aWFsaXplIHZibGFua1xuIik7CiAJCWdvdG8gZXJy X21zbV91bmluaXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCmluZGV4IDcxYTAzY2UyMWRhNTMuLmZjNjc3 ZGEwNmUzM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCkBAIC0xOTQsOSArMTk0LDYgQEAgc3RydWN0 IG1zbV9kcm1fcHJpdmF0ZSB7CiAJdW5zaWduZWQgaW50IG51bV9wbGFuZXM7CiAJc3RydWN0IGRy bV9wbGFuZSAqcGxhbmVzW01BWF9QTEFORVNdOwogCi0JdW5zaWduZWQgaW50IG51bV9jcnRjczsK LQlzdHJ1Y3QgZHJtX2NydGMgKmNydGNzW01BWF9DUlRDU107Ci0KIAlzdHJ1Y3QgbXNtX2RybV90 aHJlYWQgZGlzcF90aHJlYWRbTUFYX0NSVENTXTsKIAlzdHJ1Y3QgbXNtX2RybV90aHJlYWQgZXZl bnRfdGhyZWFkW01BWF9DUlRDU107CiAKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIs IEdvb2dsZSAvIENocm9taXVtIE9TCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9mcmVlZHJlbm8K