From: Tvrtko Ursulin Subject: [PATCH 3/5] drm/i915: Unify engine init loop Date: Wed, 6 Jul 2016 11:52:09 +0100 Message-ID: <1467802331-5402-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467802331-5402-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 46EE16E631 for ; Wed, 6 Jul 2016 10:52:28 +0000 (UTC) In-Reply-To: <1467802331-5402-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldpdGggdGhl IHVuaWZpZWQgY29tbW9uIGVuZ2luZSBzZXR1cCBkb25lLCBhbmQgdGhlIGV4ZWNsaXN0IGVuZ2lu ZQppbml0aWFsaXphdGlvbiBsb29wIGNsZWFybHkgc3BsaXQgaW50byB0d28gcGhhc2VzLCB3ZSBj YW4gZWxpbWluYXRlCnRoZSBzZXBhcmF0ZSBsZWdhY3kgZW5naW5lIGluaXRpYWxpemF0aW9uIGNv ZGUuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyIC0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA1MSArLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j ICAgICAgICB8IDI1ICsrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5oICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgfCA0NSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgMTAgKysrLS0tLQogNiBmaWxlcyBjaGFuZ2VkLCAz OCBpbnNlcnRpb25zKCspLCA5NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCBjMjY5ZTBhZDQwNTcuLjVlYWUxMGI5MGIzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC0yMDE1LDcgKzIwMTUsNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCWludCAo KmV4ZWNidWZfc3VibWl0KShzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAog CQkJCSAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3MsCiAJCQkJICAg ICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcyk7Ci0JCWludCAoKmluaXRfZW5naW5lcykoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiAJCXZvaWQgKCpjbGVhbnVwX2VuZ2luZSkoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKTsKIAkJdm9pZCAoKnN0b3BfZW5naW5lKShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOwogCkBAIC0zMzYyLDcgKzMzNjEsNiBAQCBzdGF0aWMgaW5saW5l IHUzMiBpOTE1X3Jlc2V0X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB2b2lk IGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogYm9vbCBpOTE1X2dlbV9j bGZsdXNoX29iamVjdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLCBib29sIGZvcmNl KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKLWludCBpOTE1X2dlbV9pbml0X2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBp bnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiB2b2lkIGk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog dm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4ZjUwOTE5YmE5YjQuLmEzN2FmM2EyNWZmMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC01MDYzLDUzICs1MDYzLDYgQEAgc3RhdGljIHZvaWQg aW5pdF91bnVzZWRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiB9CiAKLWludCBp OTE1X2dlbV9pbml0X2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKLXsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JaW50IHJldDsKLQot CXJldCA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKGRldik7Ci0JaWYgKHJldCkKLQkJ cmV0dXJuIHJldDsKLQotCWlmIChIQVNfQlNEKGRldikpIHsKLQkJcmV0ID0gaW50ZWxfaW5pdF9i c2RfcmluZ19idWZmZXIoZGV2KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gY2xlYW51cF9yZW5kZXJf cmluZzsKLQl9Ci0KLQlpZiAoSEFTX0JMVChkZXYpKSB7Ci0JCXJldCA9IGludGVsX2luaXRfYmx0 X3JpbmdfYnVmZmVyKGRldik7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIGNsZWFudXBfYnNkX3Jpbmc7 Ci0JfQotCi0JaWYgKEhBU19WRUJPWChkZXYpKSB7Ci0JCXJldCA9IGludGVsX2luaXRfdmVib3hf cmluZ19idWZmZXIoZGV2KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gY2xlYW51cF9ibHRfcmluZzsK LQl9Ci0KLQlpZiAoSEFTX0JTRDIoZGV2KSkgewotCQlyZXQgPSBpbnRlbF9pbml0X2JzZDJfcmlu Z19idWZmZXIoZGV2KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gY2xlYW51cF92ZWJveF9yaW5nOwot CX0KLQotCXJldHVybiAwOwotCi1jbGVhbnVwX3ZlYm94X3Jpbmc6Ci0JaW50ZWxfY2xlYW51cF9l bmdpbmUoJmRldl9wcml2LT5lbmdpbmVbVkVDU10pOwotY2xlYW51cF9ibHRfcmluZzoKLQlpbnRl bF9jbGVhbnVwX2VuZ2luZSgmZGV2X3ByaXYtPmVuZ2luZVtCQ1NdKTsKLWNsZWFudXBfYnNkX3Jp bmc6Ci0JaW50ZWxfY2xlYW51cF9lbmdpbmUoJmRldl9wcml2LT5lbmdpbmVbVkNTXSk7Ci1jbGVh bnVwX3JlbmRlcl9yaW5nOgotCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ZW5naW5l W1JDU10pOwotCi0JcmV0dXJuIHJldDsKLX0KLQogaW50CiBpOTE1X2dlbV9pbml0X2h3KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CkBAIC01MTg1LDEyICs1MTM4LDEwIEBAIGludCBpOTE1X2dl bV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNs aXN0cykgewogCQlkZXZfcHJpdi0+Z3QuZXhlY2J1Zl9zdWJtaXQgPSBpOTE1X2dlbV9yaW5nYnVm ZmVyX3N1Ym1pc3Npb247Ci0JCWRldl9wcml2LT5ndC5pbml0X2VuZ2luZXMgPSBpOTE1X2dlbV9p bml0X2VuZ2luZXM7CiAJCWRldl9wcml2LT5ndC5jbGVhbnVwX2VuZ2luZSA9IGludGVsX2NsZWFu dXBfZW5naW5lOwogCQlkZXZfcHJpdi0+Z3Quc3RvcF9lbmdpbmUgPSBpbnRlbF9zdG9wX2VuZ2lu ZTsKIAl9IGVsc2UgewogCQlkZXZfcHJpdi0+Z3QuZXhlY2J1Zl9zdWJtaXQgPSBpbnRlbF9leGVj bGlzdHNfc3VibWlzc2lvbjsKLQkJZGV2X3ByaXYtPmd0LmluaXRfZW5naW5lcyA9IGludGVsX2xv Z2ljYWxfcmluZ3NfaW5pdDsKIAkJZGV2X3ByaXYtPmd0LmNsZWFudXBfZW5naW5lID0gaW50ZWxf bG9naWNhbF9yaW5nX2NsZWFudXA7CiAJCWRldl9wcml2LT5ndC5zdG9wX2VuZ2luZSA9IGludGVs X2xvZ2ljYWxfcmluZ19zdG9wOwogCX0KQEAgLTUyMTAsNyArNTE2MSw3IEBAIGludCBpOTE1X2dl bV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKHJldCkKIAkJZ290byBvdXRfdW5s b2NrOwogCi0JcmV0ID0gZGV2X3ByaXYtPmd0LmluaXRfZW5naW5lcyhkZXYpOworCXJldCA9IGlu dGVsX2VuZ2luZXNfaW5pdChkZXYpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0X3VubG9jazsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBmY2ZmMzA5OTgyMjcuLjViZWJjYjE2ZTQ4OCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIxMTUsNiArMjExNSw3IEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewogCXUzMiBtbWlvX2Jhc2U7CiAJdW5zaWduZWQgaXJx X3NoaWZ0OwogCWludCAoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJ aW50ICgqaW5pdF9yaW5nYnVmKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogfSBp bnRlbF9lbmdpbmVzW10gPSB7CiAJW1JDU10gPSB7CiAJCS5uYW1lID0gInJlbmRlciByaW5nIiwK QEAgLTIxMjMsNiArMjEyNCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewog CQkubW1pb19iYXNlID0gUkVOREVSX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfUkNT X0lSUV9TSElGVCwKIAkJLmluaXQgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQsCisJCS5pbml0 X3JpbmdidWYgPSBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlciwKIAl9LAogCVtCQ1NdID0g ewogCQkubmFtZSA9ICJibGl0dGVyIHJpbmciLApAQCAtMjEzMSw2ICsyMTMzLDcgQEAgc3RhdGlj IGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJCS5tbWlvX2Jhc2UgPSBCTFRfUklOR19CQVNF LAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9CQ1NfSVJRX1NISUZULAogCQkuaW5pdCA9IGxvZ2ljYWxf eGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfcmluZ2J1ZiA9IGludGVsX2luaXRfYmx0X3JpbmdfYnVm ZmVyLAogCX0sCiAJW1ZDU10gPSB7CiAJCS5uYW1lID0gImJzZCByaW5nIiwKQEAgLTIxMzksNiAr MjE0Miw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewogCQkubW1pb19iYXNl ID0gR0VONl9CU0RfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WQ1MxX0lSUV9TSElG VCwKIAkJLmluaXQgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X3JpbmdidWYgPSBp bnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlciwKIAl9LAogCVtWQ1MyXSA9IHsKIAkJLm5hbWUgPSAi YnNkMiByaW5nIiwKQEAgLTIxNDcsNiArMjE1MSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5n aW5lX2luZm8gewogCQkubW1pb19iYXNlID0gR0VOOF9CU0QyX1JJTkdfQkFTRSwKIAkJLmlycV9z aGlmdCA9IEdFTjhfVkNTMl9JUlFfU0hJRlQsCiAJCS5pbml0ID0gbG9naWNhbF94Y3NfcmluZ19p bml0LAorCQkuaW5pdF9yaW5nYnVmID0gaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyLAogCX0s CiAJW1ZFQ1NdID0gewogCQkubmFtZSA9ICJ2aWRlbyBlbmhhbmNlbWVudCByaW5nIiwKQEAgLTIx NTUsNiArMjE2MCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZW5naW5lX2luZm8gewogCQkubW1p b19iYXNlID0gVkVCT1hfUklOR19CQVNFLAogCQkuaXJxX3NoaWZ0ID0gR0VOOF9WRUNTX0lSUV9T SElGVCwKIAkJLmluaXQgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X3JpbmdidWYg PSBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyLAogCX0sCiB9OwogCkBAIC0yMTc3LDIwICsy MTgzLDE2IEBAIGludGVsX2VuZ2luZV9zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiB9CiAKIC8qKgotICogaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KCkgLSBhbGxvY2F0 ZSwgcG9wdWxhdGUgYW5kIGluaXQgdGhlIEVuZ2luZSBDb21tYW5kIFN0cmVhbWVycworICogaW50 ZWxfZW5naW5lc19pbml0KCkgLSBhbGxvY2F0ZSwgcG9wdWxhdGUgYW5kIGluaXQgdGhlIEVuZ2lu ZSBDb21tYW5kIFN0cmVhbWVycwogICogQGRldjogRFJNIGRldmljZS4KICAqCi0gKiBUaGlzIGZ1 bmN0aW9uIGluaXRzIHRoZSBlbmdpbmVzIGZvciBhbiBFeGVjbGlzdHMgc3VibWlzc2lvbiBzdHls ZSAodGhlCi0gKiBlcXVpdmFsZW50IGluIHRoZSBsZWdhY3kgcmluZ2J1ZmZlciBzdWJtaXNzaW9u IHdvcmxkIHdvdWxkIGJlCi0gKiBpOTE1X2dlbV9pbml0X2VuZ2luZXMpLiBJdCBkb2VzIGl0IG9u bHkgZm9yIHRob3NlIGVuZ2luZXMgdGhhdCBhcmUgcHJlc2VudCBpbgotICogdGhlIGhhcmR3YXJl LgotICoKICAqIFJldHVybjogbm9uLXplcm8gaWYgdGhlIGluaXRpYWxpemF0aW9uIGZhaWxlZC4K ICAqLwotaW50IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQoraW50IGludGVsX2VuZ2luZXNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1bnNpZ25l ZCBpbnQgbWFzayA9IDA7CisJaW50ICgqaW5pdCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKIAl1bnNpZ25lZCBpbnQgaTsKIAlpbnQgcmV0OwogCkBAIC0yMjAxLDEwICsyMjAzLDE1 IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJaWYgKCFIQVNfRU5HSU5FKGRldl9wcml2LCBpKSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmICgh aW50ZWxfZW5naW5lc1tpXS5pbml0KQorCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQorCQkJ aW5pdCA9IGludGVsX2VuZ2luZXNbaV0uaW5pdDsKKwkJZWxzZQorCQkJaW5pdCA9IGludGVsX2Vu Z2luZXNbaV0uaW5pdF9yaW5nYnVmOworCisJCWlmICghaW5pdCkKIAkJCWNvbnRpbnVlOwogCi0J CXJldCA9IGludGVsX2VuZ2luZXNbaV0uaW5pdChpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYs IGkpKTsKKwkJcmV0ID0gaW5pdChpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIGkpKTsKIAkJ aWYgKHJldCkKIAkJCWdvdG8gY2xlYW51cDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRl eCAyYjgyNTVjMTlkY2MuLmFhODkwNWM0MmRlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK QEAgLTY3LDcgKzY3LDcgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4 dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIGludCBpbnRlbF9sb2dp Y2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpOwotaW50IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKK2ludCBpbnRlbF9lbmdpbmVzX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiAKIGludCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwppbmRleCBjODU1ZmY5ZTI4ZTQuLjkxY2EyNjg1NjVlNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjgzNSwxNCArMjgzNSwxMSBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlpbnRlbF9yaW5nX2luaXRfc2VtYXBob3JlcyhkZXZfcHJpdiwgZW5naW5l KTsKIH0KIAotaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCWludCByZXQ7 CiAKLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFJDUyk7Ci0KIAlpbnRl bF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5pcnFf ZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQ7CkBAIC0yODc2LDcgKzI4NzMs NyBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAllbmdpbmUtPmluaXRfaHcgPSBpbml0X3JlbmRlcl9yaW5nOwogCWVuZ2luZS0+Y2xl YW51cCA9IHJlbmRlcl9yaW5nX2NsZWFudXA7CiAKLQlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVm ZmVyKGRldiwgZW5naW5lKTsKKwlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJp di0+ZHJtLCBlbmdpbmUpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTI4OTMsMTIg KzI4OTAsOSBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIH0KIAotaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZm ZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmU7Ci0KLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFZDUyk7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJ aW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIApAQCAtMjkyMSwx OCArMjkxNSwxNSBAQCBpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9CU0RfVVNFUl9J TlRFUlJVUFQ7CiAJfQogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdp bmUpOworCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdp bmUpOwogfQogCiAvKioKICAqIEluaXRpYWxpemUgdGhlIHNlY29uZCBCU0QgcmluZyAoZWcuIEJy b2Fkd2VsbCBHVDMsIFNreWxha2UgR1QzKQogICovCi1pbnQgaW50ZWxfaW5pdF9ic2QyX3Jpbmdf YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ic2QyX3Jpbmdf YnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lOwotCi0JZW5naW5lID0gaW50ZWxfZW5naW5lX3NldHVwKGRldl9wcml2LCBW Q1MyKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7 CiAKIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCkBAIC0y OTQwLDE1ICsyOTMxLDEyIEBAIGludCBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5E RVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1MyX0lSUV9TSElGVDsKIAotCXJldHVybiBpbnRl bF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsKKwlyZXR1cm4gaW50ZWxfaW5pdF9yaW5n X2J1ZmZlcigmZGV2X3ByaXYtPmRybSwgZW5naW5lKTsKIH0KIAotaW50IGludGVsX2luaXRfYmx0 X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ibHRf cmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmU7Ci0KLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3By aXYsIEJDUyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5p OTE1OwogCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIApA QCAtMjk1OSwxNSArMjk0NywxMiBAQCBpbnQgaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlCiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0g R1RfQkxUX1VTRVJfSU5URVJSVVBUOwogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIo ZGV2LCBlbmdpbmUpOworCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ ZHJtLCBlbmdpbmUpOwogfQogCi1pbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQoraW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmU7Ci0KLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFZFQ1MpOworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKIAogCWludGVs X3JpbmdfZGVmYXVsdF92ZnVuY3MoZGV2X3ByaXYsIGVuZ2luZSk7CiAKQEAgLTI5ODIsNyArMjk2 Nyw3IEBAIGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCWVuZ2luZS0+aXJxX2Rpc2FibGUgPSBoc3dfdmVib3hfaXJxX2Rpc2FibGU7CiAJ fQogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOworCXJldHVy biBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOwogfQogCiBp bnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA4MDZiN2U3MTUy YjMuLjA5ZWE1MTQ4YWMyZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aApAQCAtNDgyLDExICs0ODIsMTEgQEAgaW50IGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2Fj aGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpbnRlbF9pbml0X3Bp cGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKTsKIHZv aWQgaW50ZWxfZmluaV9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KTsKIAotaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwotaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwotaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKLWludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKLWludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOworaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSk7CitpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK2ludCBpbnRlbF9pbml0X2JzZDJfcmluZ19i dWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKK2ludCBpbnRlbF9pbml0X2Js dF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworaW50IGludGVs X2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsK IAogdTY0IGludGVsX3JpbmdfZ2V0X2FjdGl2ZV9oZWFkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSk7CiBzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9lbmdpbmVfZ2V0X3NlcW5vKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK