From: Nick Hoath Subject: [RFC 5/5] drm/i915: Clean up lrc context init Date: Thu, 9 Jul 2015 11:57:44 +0100 Message-ID: <1436439464-17122-5-git-send-email-nicholas.hoath@intel.com> References: <1436439464-17122-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E1F1A6E42C for ; Thu, 9 Jul 2015 03:57:57 -0700 (PDT) In-Reply-To: <1436439464-17122-1-git-send-email-nicholas.hoath@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 Q2xlYW4gdXAgbHJjIGNvbnRleHQgaW5pdCBieToKICAgLSBNb3ZlIGNvbnRleHQgaW5pdGlhbGlz YXRpb24gaW4gdG8gaTkxNV9nZW1faW5pdF9odwogICAtIE1vdmUgb25lIG9mZiBpbml0aWFsaXNh dGlvbiBmb3IgcmVuZGVyIHJpbmcgdG8KCWk5MTVfZ2VtX3ZhbGlkYXRlX2NvbnRleHQKICAgLSBN b3ZlIGRlZmF1bHQgY29udGV4dCBpbml0aWFsaXNhdGlvbiB0byBsb2dpY2FsX3JpbmdfaW5pdAoK UmVuYW1lIGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlIHRvCmludGVsX2xyX2NvbnRl eHRfZGVmZXJyZWRfYWxsb2MsIHRvIHJlZmxlY3QgcmVkdWNlZCBmdW5jdGlvbmFsaXR5LgoKSXNz dWU6IFZJWi00Nzk4ClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAg fCAgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgIDQx ICsrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jICAg IHwgIDIxIC0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j IHwgIDM2ICsrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAg ICAgICB8IDEwMSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggICAgICAgICAgIHwgICA2ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oICAgIHwgICAxICsKIDggZmlsZXMgY2hhbmdlZCwgMTA1IGluc2VydGlv bnMoKyksIDEwMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBlZjAy Mzc4Li4zMTQyYTNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwNjMsNyArMzA2Myw2 IEBAIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3Nl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQgaTkx NV9zd2l0Y2hfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiBzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBkOWY1ZTRkLi45 MTRmNjYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTUwNDgsNiArNTA0OCw3IEBAIGk5 MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmc7CiAJaW50IHJldCwgaSwgajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcTsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYgJiYgIWludGVsX2VuYWJs ZV9ndHQoKSkKIAkJcmV0dXJuIC1FSU87CkBAIC01MTAwLDE1ICs1MTAxLDE3IEBAIGk5MTVfZ2Vt X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiAKIAkvKiBOb3cgaXQgaXMgc2Fm ZSB0byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVyeXRoaW5nIGVsc2U6ICovCi0JZm9yX2VhY2hf cmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcTsKIAorCXJldCA9IGk5MTVfZ2VtX3NldF9zZXFubyhkZXYsICgodTMyKX4wIC0gMHgxMDAw KSk7CisJaWYgKHJldCkKKwkJZ290byBvdXQ7CisKKwlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9w cml2LCBpKSB7CiAJCVdBUk5fT04oIXJpbmctPmRlZmF1bHRfY29udGV4dCk7CiAKIAkJcmV0ID0g aTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRleHQsICZyZXEp OwogCQlpZiAocmV0KSB7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKLQkJ CWdvdG8gb3V0OworCQkJZ290byBjbGVhbl9yaW5nYnVmX291dDsKIAkJfQogCiAJCWlmIChyaW5n LT5pZCA9PSBSQ1MpIHsKQEAgLTUxMTksMjIgKzUxMjIsMzQgQEAgaTkxNV9nZW1faW5pdF9odyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfcmluZyhyZXEp OwogCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJs ZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7Ci0JCQlpOTE1X2dlbV9yZXF1ZXN0X2Nh bmNlbChyZXEpOwotCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7Ci0JCQlnb3Rv IG91dDsKKwkJCWdvdG8gY2xlYW5fcmVxX291dDsKIAkJfQogCi0JCXJldCA9IGk5MTVfZ2VtX2Nv bnRleHRfZW5hYmxlKHJlcSk7Ci0JCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKLQkJCURSTV9F UlJPUigiQ29udGV4dCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4iLCBpLCByZXQpOwotCQkJ aTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKLQkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1 ZmZlcihkZXYpOwotCQkJZ290byBvdXQ7CisJCWlmIChyaW5nLT5zd2l0Y2hfY29udGV4dCkgewor CQkJcmV0ID0gcmluZy0+c3dpdGNoX2NvbnRleHQocmVxKTsKKwkJCWlmIChyZXQgJiYgcmV0ICE9 IC1FSU8pIHsKKwkJCQlEUk1fRVJST1IoInJpbmcgc3dpdGNoIGNvbnRleHQ6ICVkXG4iLAorCQkJ CQkJcmV0KTsKKwkJCQlnb3RvIGNsZWFuX3JlcV9vdXQ7CisJCQl9CisJCX0gZWxzZSBpZiAocmlu Zy0+aW5pdF9jb250ZXh0KSB7CisJCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKKwkJ CWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKKwkJCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250 ZXh0OiAlZFxuIiwKKwkJCQkJCXJldCk7CisJCQkJZ290byBjbGVhbl9yZXFfb3V0OworCQkJfQog CQl9CiAKIAkJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyZXEpOwogCX0KIAorCXJldHVybiBy ZXQ7CisKK2NsZWFuX3JlcV9vdXQ6CisJaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKK2Ns ZWFuX3JpbmdidWZfb3V0OgorCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwogb3V0 OgogCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsK IAlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4 IGE3ZTU4YTguLjg3YTdmYmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMKQEAgLTQwOSwyNyArNDA5LDYgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGRjdHgpOwog fQogCi1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsK LQlpbnQgcmV0OwotCi0JaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlpZiAocmluZy0+ aW5pdF9jb250ZXh0ID09IE5VTEwpCi0JCQlyZXR1cm4gMDsKLQotCQlyZXQgPSByaW5nLT5pbml0 X2NvbnRleHQocmVxKTsKLQl9IGVsc2UKLQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4dChyZXEp OwotCi0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxuIiwg cmV0KTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGludCBj b250ZXh0X2lkcl9jbGVhbnVwKGludCBpZCwgdm9pZCAqcCwgdm9pZCAqZGF0YSkKIHsKIAlzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gcDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYwppbmRleCA2MDBkYjc0Li41NDU1ZTM1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC05OTMsNiArOTkzLDcgQEAgaTkxNV9nZW1f dmFsaWRhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUsCiB7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IE5VTEw7CiAJc3RydWN0IGk5 MTVfY3R4X2hhbmdfc3RhdHMgKmhzOworCWludCByZXQ7CiAKIAlpZiAocmluZy0+aWQgIT0gUkNT ICYmIGN0eF9pZCAhPSBERUZBVUxUX0NPTlRFWFRfSEFORExFKQogCQlyZXR1cm4gRVJSX1BUUigt RUlOVkFMKTsKQEAgLTEwMDgsMTQgKzEwMDksNDcgQEAgaTkxNV9nZW1fdmFsaWRhdGVfY29udGV4 dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJfQogCiAJ aWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cyAmJiAhY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRl KSB7Ci0JCWludCByZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShjdHgsIHJp bmcpOworCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKGN0eCwgcmluZyk7 CiAJCWlmIChyZXQpIHsKIAkJCURSTV9ERUJVRygiQ291bGQgbm90IGNyZWF0ZSBMUkMgJXU6ICVk XG4iLCBjdHhfaWQsIHJldCk7CiAJCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCQl9CisKKwkJaWYg KHJpbmctPmlkID09IFJDUyAmJiAhY3R4LT5yY3NfaW5pdGlhbGl6ZWQpIHsKKwkJCWlmIChyaW5n LT5pbml0X2NvbnRleHQpIHsKKwkJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsK KworCQkJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywKKwkJCQkJcmluZy0+ZGVm YXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJCQlpZiAocmV0KSB7CisJCQkJCURSTV9FUlJPUigicmlu ZyBjcmVhdGUgcmVxOiAlZFxuIiwKKwkJCQkJCSAgcmV0KTsKKwkJCQkJaTkxNV9nZW1fcmVxdWVz dF9jYW5jZWwocmVxKTsKKwkJCQkJZ290byB2YWxpZGF0ZV9lcnJvcjsKKwkJCQl9CisKKwkJCQly ZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKKwkJCQlpZiAocmV0KSB7CisJCQkJCURSTV9F UlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLAorCQkJCQkJICByZXQpOworCQkJCQlpOTE1 X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOworCQkJCQlnb3RvIHZhbGlkYXRlX2Vycm9yOworCQkJ CX0KKwkJCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcSk7CisJCQl9CisKKwkJCWN0eC0+ cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKKwkJfQogCX0KIAogCXJldHVybiBjdHg7CisKK3ZhbGlk YXRlX2Vycm9yOgorCWludGVsX2Rlc3Ryb3lfcmluZ2J1ZmZlcl9vYmooY3R4LT5lbmdpbmVbcmlu Zy0+aWRdLnJpbmdidWYpOworCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHgtPmVuZ2lu ZVtyaW5nLT5pZF0uc3RhdGUtPmJhc2UpOworCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVm ID0gTlVMTDsKKwljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBOVUxMOworCXJldHVybiBF UlJfUFRSKHJldCk7CiB9CiAKIHZvaWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNzcw YTZmNi4uMTlhZDk2MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTEzNTAsNiArMTM1 MCw5IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJbHJj X3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcsCisJCQlyaW5nLT5kZWZhdWx0X2NvbnRl eHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpOworCiAJSTkxNV9XUklURV9JTVIocmluZywgfihy aW5nLT5pcnFfZW5hYmxlX21hc2sgfCByaW5nLT5pcnFfa2VlcF9tYXNrKSk7CiAJSTkxNV9XUklU RShSSU5HX0hXU1RBTShyaW5nLT5tbWlvX2Jhc2UpLCAweGZmZmZmZmZmKTsKIApAQCAtMTczOSw4 ICsxNzQyLDMzIEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluCiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKIAotCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHJpbmctPmRl ZmF1bHRfY29udGV4dCwgcmluZyk7CisJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9h bGxvYyhyaW5nLT5kZWZhdWx0X2NvbnRleHQsIHJpbmcpOworCWlmIChyZXQpCisJCXJldHVybiBy ZXQ7CisKKwlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oCisJCXJpbmctPmRlZmF1bHRfY29u dGV4dC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSwKKwkJR0VOOF9MUl9DT05URVhUX0FMSUdOLCAw KTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19EUklWRVIoIlBpbiBMUkMgYmFja2luZyBvYmog ZmFpbGVkOiAlZFxuIiwKKwkJCQlyZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJldCA9IGlu dGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwKKwkJcmluZy0+ZGVmYXVsdF9jb250 ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9S KAorCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKKwkJCXJp bmctPm5hbWUsIHJldCk7CisJCWdvdG8gZXJyb3JfdW5waW5fZ2d0dDsKKwl9CisKKwlyZXR1cm4g cmV0OwogCitlcnJvcl91bnBpbl9nZ3R0OgorCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKAor CQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpOwogCXJldHVy biByZXQ7CiB9CiAKQEAgLTE5NDIsMTQgKzE5NzAsOCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5n c19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIGNsZWFudXBfdmVib3hfcmlu ZzsKIAl9CiAKLQlyZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2LCAoKHUzMil+MCAtIDB4MTAw MCkpOwotCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9ic2QyX3Jpbmc7Ci0KIAlyZXR1cm4gMDsK IAotY2xlYW51cF9ic2QyX3Jpbmc6Ci0JaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoJmRldl9w cml2LT5yaW5nW1ZDUzJdKTsKIGNsZWFudXBfdmVib3hfcmluZzoKIAlpbnRlbF9sb2dpY2FsX3Jp bmdfY2xlYW51cCgmZGV2X3ByaXYtPnJpbmdbVkVDU10pOwogY2xlYW51cF9ibHRfcmluZzoKQEAg LTIxNDYsNyArMjE2OCw3IEBAIHN0YXRpYyB1aW50MzJfdCBnZXRfbHJfY29udGV4dF9zaXplKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZv aWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCit2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9j dHhfb2JqKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRl di0+ZGV2X3ByaXZhdGU7CkBAIC0yMTY0LDcgKzIxODYsNyBAQCBzdGF0aWMgdm9pZCBscmNfc2V0 dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIH0K IAogLyoqCi0gKiBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZSgpIC0gY3JlYXRlIHRo ZSBMUkMgc3BlY2lmaWMgYml0cyBvZiBhIGNvbnRleHQKKyAqIGludGVsX2xyX2NvbnRleHRfZGVm ZXJyZWRfYWxsb2MoKSAtIGNyZWF0ZSB0aGUgTFJDIHNwZWNpZmljIGJpdHMgb2YgYSBjb250ZXh0 CiAgKiBAY3R4OiBMUiBjb250ZXh0IHRvIGNyZWF0ZS4KICAqIEByaW5nOiBlbmdpbmUgdG8gYmUg dXNlZCB3aXRoIHRoZSBjb250ZXh0LgogICoKQEAgLTIxNzYsMTAgKzIxOTgsMTAgQEAgc3RhdGlj IHZvaWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCiAgKgogICogUmV0dXJuOiBub24temVybyBvbiBlcnJvci4KICAqLwotaW50IGlu dGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CisKK2ludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCWNv bnN0IGJvb2wgaXNfZ2xvYmFsX2RlZmF1bHRfY3R4ID0gKGN0eCA9PSByaW5nLT5kZWZhdWx0X2Nv bnRleHQpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmo7CiAJdWludDMyX3QgY29udGV4dF9zaXplOwpAQCAt MjE5NywyMiArMjIxOSwxMiBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUo c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JaWYg KGlzX2dsb2JhbF9kZWZhdWx0X2N0eCkgewotCQlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4o Y3R4X29iaiwgR0VOOF9MUl9DT05URVhUX0FMSUdOLCAwKTsKLQkJaWYgKHJldCkgewotCQkJRFJN X0RFQlVHX0RSSVZFUigiUGluIExSQyBiYWNraW5nIG9iaiBmYWlsZWQ6ICVkXG4iLAotCQkJCQly ZXQpOwotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmN0eF9vYmotPmJhc2UpOwotCQkJ cmV0dXJuIHJldDsKLQkJfQotCX0KLQogCXJpbmdidWYgPSBremFsbG9jKHNpemVvZigqcmluZ2J1 ZiksIEdGUF9LRVJORUwpOwogCWlmICghcmluZ2J1ZikgewogCQlEUk1fREVCVUdfRFJJVkVSKCJG YWlsZWQgdG8gYWxsb2NhdGUgcmluZ2J1ZmZlciAlc1xuIiwKIAkJCQlyaW5nLT5uYW1lKTsKIAkJ cmV0ID0gLUVOT01FTTsKLQkJZ290byBlcnJvcl91bnBpbl9jdHg7CisJCWdvdG8gZXJyb3JfZGVy ZWZfb2JqOwogCX0KIAogCXJpbmdidWYtPnJpbmcgPSByaW5nOwpAQCAtMjIzMiw2NSArMjI0NCwy NCBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCwKIAkJCQlyaW5nLT5uYW1lLCByZXQpOwogCQkJZ290byBlcnJvcl9mcmVlX3Ji dWY7CiAJCX0KLQotCQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KSB7Ci0JCQlyZXQgPSBpbnRl bF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihkZXYsIHJpbmdidWYpOwotCQkJaWYgKHJldCkg ewotCQkJCURSTV9FUlJPUigKLQkJCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVy ICVzOiAlZFxuIiwKLQkJCQkJcmluZy0+bmFtZSwgcmV0KTsKLQkJCQlnb3RvIGVycm9yX2Rlc3Ry b3lfcmJ1ZjsKLQkJCX0KLQkJfQotCiAJfQogCiAJcmV0ID0gcG9wdWxhdGVfbHJfY29udGV4dChj dHgsIGN0eF9vYmosIHJpbmcsIHJpbmdidWYpOwogCWlmIChyZXQpIHsKIAkJRFJNX0RFQlVHX0RS SVZFUigiRmFpbGVkIHRvIHBvcHVsYXRlIExSQzogJWRcbiIsIHJldCk7Ci0JCWdvdG8gZXJyb3I7 CisJCWdvdG8gZXJyb3JfZGVzdHJveV9yYnVmOwogCX0KIAogCWN0eC0+ZW5naW5lW3JpbmctPmlk XS5yaW5nYnVmID0gcmluZ2J1ZjsKIAljdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUgPSBjdHhf b2JqOwogCi0JaWYgKGN0eCA9PSByaW5nLT5kZWZhdWx0X2NvbnRleHQpCi0JCWxyY19zZXR1cF9o YXJkd2FyZV9zdGF0dXNfcGFnZShyaW5nLCBjdHhfb2JqKTsKLQllbHNlIGlmIChyaW5nLT5pZCA9 PSBSQ1MgJiYgIWN0eC0+cmNzX2luaXRpYWxpemVkKSB7Ci0JCWlmIChyaW5nLT5pbml0X2NvbnRl eHQpIHsKLQkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwotCi0JCQlyZXQgPSBp OTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIGN0eCwgJnJlcSk7Ci0JCQlpZiAocmV0KQotCQkJ CXJldHVybiByZXQ7Ci0KLQkJCXJldCA9IHJpbmctPmluaXRfY29udGV4dChyZXEpOwotCQkJaWYg KHJldCkgewotCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLCByZXQpOwot CQkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQkJY3R4LT5lbmdpbmVbcmluZy0+ aWRdLnJpbmdidWYgPSBOVUxMOwotCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSA9IE5V TEw7Ci0JCQkJZ290byBlcnJvcjsKLQkJCX0KLQotCQkJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVz aChyZXEpOwotCQl9Ci0KLQkJY3R4LT5yY3NfaW5pdGlhbGl6ZWQgPSB0cnVlOwotCX0KLQogCXJl dHVybiAwOwogCi1lcnJvcjoKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KQotCQlpbnRlbF91 bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKIGVycm9yX2Rlc3Ryb3lfcmJ1ZjoKIAlpbnRl bF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwogZXJyb3JfZnJlZV9yYnVmOgogCWtm cmVlKHJpbmdidWYpOwotZXJyb3JfdW5waW5fY3R4OgotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9j dHgpCi0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOworZXJyb3JfZGVyZWZf b2JqOgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsKIAlyZXR1 cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCA5ZDJlOThhLi4yY2VjMGVl IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtNjcsOCArNjcsOCBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmdidWYsCiAKIC8qIExvZ2ljYWwgUmluZyBDb250ZXh0cyAqLwogdm9pZCBpbnRlbF9scl9j b250ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7Ci1pbnQgaW50ZWxfbHJfY29u dGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKLQkJCQkgICAg IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOworaW50IGludGVsX2xyX2NvbnRleHRfZGVm ZXJyZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICAgc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB2 b2lkIGludGVsX2xyX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAgLTg0 LDUgKzg0LDcgQEAgdTMyIGludGVsX2V4ZWNsaXN0c19jdHhfaWQoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmN0eF9vYmopOwogCiBib29sIGludGVsX2xyY19pcnFfaGFuZGxlcihzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1 ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK3ZvaWQgbHJjX3NldHVwX2hhcmR3 YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCisJCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpkZWZhdWx0X2N0eF9vYmopOwogCiAjZW5kaWYgLyogX0lOVEVM X0xSQ19IXyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGUz OWM4OTEuLmI1ZTVkNDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTI2NjQsNiArMjY2NCw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTgz MF9kaXNwYXRjaF9leGVjYnVmZmVyOwogCWVsc2UKIAkJcmluZy0+ZGlzcGF0Y2hfZXhlY2J1ZmZl ciA9IGk5MTVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKKwlyaW5nLT5zd2l0Y2hfY29udGV4dCA9IGk5 MTVfc3dpdGNoX2NvbnRleHQ7CiAJcmluZy0+aW5pdF9odyA9IGluaXRfcmVuZGVyX3Jpbmc7CiAJ cmluZy0+Y2xlYW51cCA9IHJlbmRlcl9yaW5nX2NsZWFudXA7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA3M2IwYmQ4Li5iYTMwNDliIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xNzcsNiArMTc3LDcgQEAgc3RydWN0ICBp bnRlbF9lbmdpbmVfY3MgewogCWludAkJKCppbml0X2h3KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKTsKIAogCWludAkJKCppbml0X2NvbnRleHQpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKTsKKwlpbnQJCSgqc3dpdGNoX2NvbnRleHQpKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxKTsKIAogCXZvaWQJCSgqd3JpdGVfdGFpbCkoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKIAkJCQkgICAgICB1MzIgdmFsdWUpOwotLSAKMi4xLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==