From: Tvrtko Ursulin Subject: [PATCH 3/7] drm/i915: Unify engine init loop Date: Wed, 13 Jul 2016 16:03:37 +0100 Message-ID: <1468422221-12132-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1468422221-12132-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id BA5386E76F for ; Wed, 13 Jul 2016 15:08:15 +0000 (UTC) In-Reply-To: <1468422221-12132-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 ZGUuCgp2MjogRml4IGNsZWFudXAgcGF0aCBmb3IgbGVnYWN5Lgp2MzogUmVuYW1lIGNvbnN0cnVj dG9ycy4gKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAg ICAgICB8ICAyIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA1 MSArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jICAgICAgICB8IDQ1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAgICAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNDUgKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8IDEwICsr Ky0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgMTA1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGU3NmNmZTJlMjQ3MS4uNjVkNjllNTJmOWM0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIwMTYsNyArMjAxNiw2IEBAIHN0cnVjdCBk cm1faTkxNV9wcml2YXRlIHsKIAkJaW50ICgqZXhlY2J1Zl9zdWJtaXQpKHN0cnVjdCBpOTE1X2V4 ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9l eGVjYnVmZmVyMiAqYXJncywKIAkJCQkgICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKTsKLQkJ aW50ICgqaW5pdF9lbmdpbmVzKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAkJdm9pZCAoKmNs ZWFudXBfZW5naW5lKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCQl2b2lkICgq c3RvcF9lbmdpbmUpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKQEAgLTMzNzQs NyArMzM3Myw2IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGk5MTVfcmVzZXRfY291bnQoc3RydWN0IGk5 MTVfZ3B1X2Vycm9yICplcnJvcikKIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiBib29sIGk5MTVfZ2VtX2NsZmx1c2hfb2JqZWN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmosIGJvb2wgZm9yY2UpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfZ2VtX2luaXRfZW5naW5lcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmco c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGFkZWNh MGVjNGNmYi4uYjc4OGY5N2NkNGNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTUwNTYs NTMgKzUwNTYsNiBAQCBzdGF0aWMgdm9pZCBpbml0X3VudXNlZF9yaW5ncyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCX0KIH0KIAotaW50IGk5MTVfZ2VtX2luaXRfZW5naW5lcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKLQlpbnQgcmV0OwotCi0JcmV0ID0gaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19i dWZmZXIoZGV2KTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKEhBU19CU0QoZGV2 KSkgewotCQlyZXQgPSBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihkZXYpOwotCQlpZiAocmV0 KQotCQkJZ290byBjbGVhbnVwX3JlbmRlcl9yaW5nOwotCX0KLQotCWlmIChIQVNfQkxUKGRldikp IHsKLQkJcmV0ID0gaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoZGV2KTsKLQkJaWYgKHJldCkK LQkJCWdvdG8gY2xlYW51cF9ic2RfcmluZzsKLQl9Ci0KLQlpZiAoSEFTX1ZFQk9YKGRldikpIHsK LQkJcmV0ID0gaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihkZXYpOwotCQlpZiAocmV0KQot CQkJZ290byBjbGVhbnVwX2JsdF9yaW5nOwotCX0KLQotCWlmIChIQVNfQlNEMihkZXYpKSB7Ci0J CXJldCA9IGludGVsX2luaXRfYnNkMl9yaW5nX2J1ZmZlcihkZXYpOwotCQlpZiAocmV0KQotCQkJ Z290byBjbGVhbnVwX3ZlYm94X3Jpbmc7Ci0JfQotCi0JcmV0dXJuIDA7Ci0KLWNsZWFudXBfdmVi b3hfcmluZzoKLQlpbnRlbF9jbGVhbnVwX2VuZ2luZSgmZGV2X3ByaXYtPmVuZ2luZVtWRUNTXSk7 Ci1jbGVhbnVwX2JsdF9yaW5nOgotCWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ZW5n aW5lW0JDU10pOwotY2xlYW51cF9ic2RfcmluZzoKLQlpbnRlbF9jbGVhbnVwX2VuZ2luZSgmZGV2 X3ByaXYtPmVuZ2luZVtWQ1NdKTsKLWNsZWFudXBfcmVuZGVyX3Jpbmc6Ci0JaW50ZWxfY2xlYW51 cF9lbmdpbmUoJmRldl9wcml2LT5lbmdpbmVbUkNTXSk7Ci0KLQlyZXR1cm4gcmV0OwotfQotCiBp bnQKIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKQEAgLTUxNzgs MTIgKzUxMzEsMTAgQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAogCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCWRldl9wcml2LT5ndC5leGVjYnVm X3N1Ym1pdCA9IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbjsKLQkJZGV2X3ByaXYtPmd0 LmluaXRfZW5naW5lcyA9IGk5MTVfZ2VtX2luaXRfZW5naW5lczsKIAkJZGV2X3ByaXYtPmd0LmNs ZWFudXBfZW5naW5lID0gaW50ZWxfY2xlYW51cF9lbmdpbmU7CiAJCWRldl9wcml2LT5ndC5zdG9w X2VuZ2luZSA9IGludGVsX3N0b3BfZW5naW5lOwogCX0gZWxzZSB7CiAJCWRldl9wcml2LT5ndC5l eGVjYnVmX3N1Ym1pdCA9IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uOwotCQlkZXZfcHJpdi0+ Z3QuaW5pdF9lbmdpbmVzID0gaW50ZWxfbG9naWNhbF9yaW5nc19pbml0OwogCQlkZXZfcHJpdi0+ Z3QuY2xlYW51cF9lbmdpbmUgPSBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cDsKIAkJZGV2X3By aXYtPmd0LnN0b3BfZW5naW5lID0gaW50ZWxfbG9naWNhbF9yaW5nX3N0b3A7CiAJfQpAQCAtNTIw Myw3ICs1MTU0LDcgQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlpZiAocmV0KQogCQlnb3RvIG91dF91bmxvY2s7CiAKLQlyZXQgPSBkZXZfcHJpdi0+Z3QuaW5p dF9lbmdpbmVzKGRldik7CisJcmV0ID0gaW50ZWxfZW5naW5lc19pbml0KGRldik7CiAJaWYgKHJl dCkKIAkJZ290byBvdXRfdW5sb2NrOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDYw NGNmYmI4YWVjOS4uMmUxM2EzYTI2MjQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAt MjEzOSw3ICsyMTM5LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJdW5z aWduZWQgZ3VjX2lkOwogCXUzMiBtbWlvX2Jhc2U7CiAJdW5zaWduZWQgaXJxX3NoaWZ0OwotCWlu dCAoKmluaXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJaW50ICgqaW5pdF9s ZWdhY3kpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CisJaW50ICgqaW5pdF9leGVj bGlzdHMpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiB9IGludGVsX2VuZ2luZXNb XSA9IHsKIAlbUkNTXSA9IHsKIAkJLm5hbWUgPSAicmVuZGVyIHJpbmciLApAQCAtMjE0Nyw3ICsy MTQ4LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJCS5ndWNfaWQgPSBH VUNfUkVOREVSX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IFJFTkRFUl9SSU5HX0JBU0UsCiAJCS5p cnFfc2hpZnQgPSBHRU44X1JDU19JUlFfU0hJRlQsCi0JCS5pbml0ID0gbG9naWNhbF9yZW5kZXJf cmluZ19pbml0LAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQs CisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyLAogCX0sCiAJ W0JDU10gPSB7CiAJCS5uYW1lID0gImJsaXR0ZXIgcmluZyIsCkBAIC0yMTU1LDcgKzIxNTcsOCBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGVuZ2luZV9pbmZvIHsKIAkJLmd1Y19pZCA9IEdVQ19CTElU VEVSX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IEJMVF9SSU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQg PSBHRU44X0JDU19JUlFfU0hJRlQsCi0JCS5pbml0ID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAor CQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2Fj eSA9IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDU10gPSB7CiAJCS5uYW1l ID0gImJzZCByaW5nIiwKQEAgLTIxNjMsNyArMjE2Niw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg ZW5naW5lX2luZm8gewogCQkuZ3VjX2lkID0gR1VDX1ZJREVPX0VOR0lORSwKIAkJLm1taW9fYmFz ZSA9IEdFTjZfQlNEX1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkNTMV9JUlFfU0hJ RlQsCi0JCS5pbml0ID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9leGVjbGlzdHMg PSBsb2dpY2FsX3hjc19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfYnNk X3JpbmdfYnVmZmVyLAogCX0sCiAJW1ZDUzJdID0gewogCQkubmFtZSA9ICJic2QyIHJpbmciLApA QCAtMjE3MSw3ICsyMTc1LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJ CS5ndWNfaWQgPSBHVUNfVklERU9fRU5HSU5FMiwKIAkJLm1taW9fYmFzZSA9IEdFTjhfQlNEMl9S SU5HX0JBU0UsCiAJCS5pcnFfc2hpZnQgPSBHRU44X1ZDUzJfSVJRX1NISUZULAotCQkuaW5pdCA9 IGxvZ2ljYWxfeGNzX3JpbmdfaW5pdCwKKwkJLmluaXRfZXhlY2xpc3RzID0gbG9naWNhbF94Y3Nf cmluZ19pbml0LAorCQkuaW5pdF9sZWdhY3kgPSBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIs CiAJfSwKIAlbVkVDU10gPSB7CiAJCS5uYW1lID0gInZpZGVvIGVuaGFuY2VtZW50IHJpbmciLApA QCAtMjE3OSw3ICsyMTg0LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBlbmdpbmVfaW5mbyB7CiAJ CS5ndWNfaWQgPSBHVUNfVklERU9FTkhBTkNFX0VOR0lORSwKIAkJLm1taW9fYmFzZSA9IFZFQk9Y X1JJTkdfQkFTRSwKIAkJLmlycV9zaGlmdCA9IEdFTjhfVkVDU19JUlFfU0hJRlQsCi0JCS5pbml0 ID0gbG9naWNhbF94Y3NfcmluZ19pbml0LAorCQkuaW5pdF9leGVjbGlzdHMgPSBsb2dpY2FsX3hj c19yaW5nX2luaXQsCisJCS5pbml0X2xlZ2FjeSA9IGludGVsX2luaXRfdmVib3hfcmluZ19idWZm ZXIsCiAJfSwKIH07CiAKQEAgLTIyMDIsMjAgKzIyMDgsMTYgQEAgaW50ZWxfZW5naW5lX3NldHVw KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAogLyoqCi0gKiBpbnRlbF9s b2dpY2FsX3JpbmdzX2luaXQoKSAtIGFsbG9jYXRlLCBwb3B1bGF0ZSBhbmQgaW5pdCB0aGUgRW5n aW5lIENvbW1hbmQgU3RyZWFtZXJzCisgKiBpbnRlbF9lbmdpbmVzX2luaXQoKSAtIGFsbG9jYXRl LCBwb3B1bGF0ZSBhbmQgaW5pdCB0aGUgRW5naW5lIENvbW1hbmQgU3RyZWFtZXJzCiAgKiBAZGV2 OiBEUk0gZGV2aWNlLgogICoKLSAqIFRoaXMgZnVuY3Rpb24gaW5pdHMgdGhlIGVuZ2luZXMgZm9y IGFuIEV4ZWNsaXN0cyBzdWJtaXNzaW9uIHN0eWxlICh0aGUKLSAqIGVxdWl2YWxlbnQgaW4gdGhl IGxlZ2FjeSByaW5nYnVmZmVyIHN1Ym1pc3Npb24gd29ybGQgd291bGQgYmUKLSAqIGk5MTVfZ2Vt X2luaXRfZW5naW5lcykuIEl0IGRvZXMgaXQgb25seSBmb3IgdGhvc2UgZW5naW5lcyB0aGF0IGFy ZSBwcmVzZW50IGluCi0gKiB0aGUgaGFyZHdhcmUuCi0gKgogICogUmV0dXJuOiBub24temVybyBp ZiB0aGUgaW5pdGlhbGl6YXRpb24gZmFpbGVkLgogICovCi1pbnQgaW50ZWxfbG9naWNhbF9yaW5n c19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfZW5naW5lc19pbml0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwogCXVuc2lnbmVkIGludCBtYXNrID0gMDsKKwlpbnQgKCppbml0 KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCXVuc2lnbmVkIGludCBpOwogCWlu dCByZXQ7CiAKQEAgLTIyMjYsMTAgKzIyMjgsMTUgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ3Nf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoIUhBU19FTkdJTkUoZGV2X3ByaXYs IGkpKQogCQkJY29udGludWU7CiAKLQkJaWYgKCFpbnRlbF9lbmdpbmVzW2ldLmluaXQpCisJCWlm IChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCisJCQlpbml0ID0gaW50ZWxfZW5naW5lc1tpXS5pbml0 X2V4ZWNsaXN0czsKKwkJZWxzZQorCQkJaW5pdCA9IGludGVsX2VuZ2luZXNbaV0uaW5pdF9sZWdh Y3k7CisKKwkJaWYgKCFpbml0KQogCQkJY29udGludWU7CiAKLQkJcmV0ID0gaW50ZWxfZW5naW5l c1tpXS5pbml0KGludGVsX2VuZ2luZV9zZXR1cChkZXZfcHJpdiwgaSkpOworCQlyZXQgPSBpbml0 KGludGVsX2VuZ2luZV9zZXR1cChkZXZfcHJpdiwgaSkpOwogCQlpZiAocmV0KQogCQkJZ290byBj bGVhbnVwOwogCkBAIC0yMjUwLDggKzIyNTcsMTIgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ3Nf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAwOwogCiBjbGVhbnVwOgotCWZv ciAoaSA9IDA7IGkgPCBJOTE1X05VTV9FTkdJTkVTOyBpKyspCi0JCWludGVsX2xvZ2ljYWxfcmlu Z19jbGVhbnVwKCZkZXZfcHJpdi0+ZW5naW5lW2ldKTsKKwlmb3IgKGkgPSAwOyBpIDwgSTkxNV9O VU1fRU5HSU5FUzsgaSsrKSB7CisJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCisJCQlpbnRl bF9sb2dpY2FsX3JpbmdfY2xlYW51cCgmZGV2X3ByaXYtPmVuZ2luZVtpXSk7CisJCWVsc2UKKwkJ CWludGVsX2NsZWFudXBfZW5naW5lKCZkZXZfcHJpdi0+ZW5naW5lW2ldKTsKKwl9CiAKIAlyZXR1 cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCAyYjgyNTVjMTlkY2MuLmFh ODkwNWM0MmRlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTY3LDcgKzY3LDcgQEAg aW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfcmVzZXJ2ZV9z cGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogdm9pZCBpbnRlbF9s b2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogdm9pZCBp bnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp OwotaW50IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K2ludCBpbnRlbF9lbmdpbmVzX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAKIGludCBs b2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSk7CiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2 ZGIxOTQ3ODlmNzEuLjE2Y2VkMjc1Yzg0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwpAQCAtMjgzNiwxNCArMjgzNiwxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9yaW5n X2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpbnRl bF9yaW5nX2luaXRfc2VtYXBob3JlcyhkZXZfcHJpdiwgZW5naW5lKTsKIH0KIAotaW50IGludGVs X2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50 ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK LQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCWludCByZXQ7CiAKLQllbmdpbmUgPSBpbnRl bF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFJDUyk7Ci0KIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1 bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9S RU5ERVJfVVNFUl9JTlRFUlJVUFQ7CkBAIC0yODc3LDcgKzI4NzQsNyBAQCBpbnQgaW50ZWxfaW5p dF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbmdpbmUtPmlu aXRfaHcgPSBpbml0X3JlbmRlcl9yaW5nOwogCWVuZ2luZS0+Y2xlYW51cCA9IHJlbmRlcl9yaW5n X2NsZWFudXA7CiAKLQlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsK KwlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOwog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTI4OTQsMTIgKzI4OTEsOSBAQCBpbnQgaW50 ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1 cm4gMDsKIH0KIAotaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0KLQllbmdp bmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFZDUyk7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJaW50ZWxfcmluZ19kZWZhdWx0 X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIApAQCAtMjkyMiwxOCArMjkxNiwxNSBAQCBpbnQg aW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWVu Z2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9CU0RfVVNFUl9JTlRFUlJVUFQ7CiAJfQogCi0J cmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOworCXJldHVybiBpbnRl bF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOwogfQogCiAvKioKICAq IEluaXRpYWxpemUgdGhlIHNlY29uZCBCU0QgcmluZyAoZWcuIEJyb2Fkd2VsbCBHVDMsIFNreWxh a2UgR1QzKQogICovCi1pbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCi0J ZW5naW5lID0gaW50ZWxfZW5naW5lX3NldHVwKGRldl9wcml2LCBWQ1MyKTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAKIAlpbnRlbF9yaW5nX2Rl ZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCkBAIC0yOTQxLDE1ICsyOTMyLDEyIEBA IGludCBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQg PDwgR0VOOF9WQ1MyX0lSUV9TSElGVDsKIAotCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVy KGRldiwgZW5naW5lKTsKKwlyZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYt PmRybSwgZW5naW5lKTsKIH0KIAotaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7 Ci0KLQllbmdpbmUgPSBpbnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIEJDUyk7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJaW50ZWxfcmlu Z19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIApAQCAtMjk2MCwxNSArMjk0OCwx MiBAQCBpbnQgaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAllbHNlCiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gR1RfQkxUX1VTRVJfSU5URVJS VVBUOwogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOworCXJl dHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOwogfQog Ci1pbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQoraW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0KLQllbmdpbmUgPSBp bnRlbF9lbmdpbmVfc2V0dXAoZGV2X3ByaXYsIFZFQ1MpOworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKIAogCWludGVsX3JpbmdfZGVmYXVsdF92ZnVu Y3MoZGV2X3ByaXYsIGVuZ2luZSk7CiAKQEAgLTI5ODMsNyArMjk2OCw3IEBAIGludCBpbnRlbF9p bml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+ aXJxX2Rpc2FibGUgPSBoc3dfdmVib3hfaXJxX2Rpc2FibGU7CiAJfQogCi0JcmV0dXJuIGludGVs X2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOworCXJldHVybiBpbnRlbF9pbml0X3Jpbmdf YnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOwogfQogCiBpbnQKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmOGVlYjUwODY4YzMuLmEyNWVhYzE3ZWZjZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDg0LDExICs0ODQs MTEgQEAgaW50IGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpbnRlbF9pbml0X3BpcGVfY29udHJvbChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKTsKIHZvaWQgaW50ZWxfZmluaV9waXBl X2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAotaW50IGludGVsX2lu aXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGludGVs X2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotaW50IGludGVs X2luaXRfYnNkMl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpbnRl bF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGlu dGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSk7CitpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lKTsKK2ludCBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKTsKK2ludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworaW50IGludGVsX2luaXRfdmVib3hfcmluZ19i dWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogdTY0IGludGVsX3Jpbmdf Z2V0X2FjdGl2ZV9oZWFkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiBzdGF0aWMg aW5saW5lIHUzMiBpbnRlbF9lbmdpbmVfZ2V0X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK