From: Nick Hoath Subject: [PATCH] drm/i915: Split alloc from init for lrc Date: Fri, 4 Sep 2015 14:49:24 +0100 Message-ID: <1441374564-4074-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 8525A6EBDF for ; Fri, 4 Sep 2015 06:49:42 -0700 (PDT) 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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RXh0ZW5kIGluaXQvaW5pdF9odyBzcGxpdCB0byBjb250ZXh0IGluaXQuCiAgIC0gTW92ZSBjb250 ZXh0IGluaXRpYWxpc2F0aW9uIGluIHRvIGk5MTVfZ2VtX2luaXRfaHcKICAgLSBNb3ZlIG9uZSBv ZmYgaW5pdGlhbGlzYXRpb24gZm9yIHJlbmRlciByaW5nIHRvCiAgICAgICAgaTkxNV9nZW1fdmFs aWRhdGVfY29udGV4dAogICAtIE1vdmUgZGVmYXVsdCBjb250ZXh0IGluaXRpYWxpc2F0aW9uIHRv IGxvZ2ljYWxfcmluZ19pbml0CgpSZW5hbWUgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVh dGUgdG8KaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYywgdG8gcmVmbGVjdCByZWR1Y2Vk IGZ1bmN0aW9uYWxpdHkgJgphbGxvYy9pbml0IHNwbGl0LgoKVGhpcyBwYXRjaCBpcyBpbnRlbmRl ZCB0byBzcGxpdCBvdXQgdGhlIGFsbG9jYXRpb24gb2YgcmVzb3VyY2VzICYKaW5pdGlhbGlzYXRp b24gdG8gYWxsb3cgZWFzaWVyIHJldXNlIG9mIGNvZGUgZm9yIHJlc3VtZS9ncHUgcmVzZXQuCgp2 MjogUmVtb3ZlZCBmdW5jdGlvbiBwdHIgd3JhcHBpbmcgb2YgZG9fc3dpdGNoX2NvbnRleHQgKERh bmllbCBWZXR0ZXIpCiAgICBMZWZ0IC0+aW5pdF9jb250ZXh0IGludCBpbnRlbF9scl9jb250ZXh0 X2RlZmVycmVkX2FsbG9jCiAgICAoRGFuaWVsIFZldHRlcikKICAgIFJlbW92ZSB1bm5lY2Vzc2Fy eSBpbml0IGZsYWcgJiByaW5nIHR5cGUgdGVzdC4gKERhbmllbCBWZXR0ZXIpCiAgICBJbXByb3Zl IGNvbW1pdCBtZXNzYWdlIChEYW5pZWwgVmV0dGVyKQp2MzogT24gaW5pdC9yZWluaXQsIHNldCB0 aGUgaHcgbmV4dCBzZXF1ZW5jZSBudW1iZXIgdG8gdGhlIHN3IG5leHQKICAgIHNlcXVlbmNlIG51 bWJlci4gVGhpcyBpcyBzZXQgdG8gMSBhdCBkcml2ZXIgbG9hZCB0aW1lLiBUaGlzIHByZXZlbnRz CiAgICB0aGUgc2Vxbm8gYmVpbmcgcmVzZXQgb24gcmVpbml0IChDaHJpcyBXaWxzb24pCnY0OiBT ZXQgc2Vxbm8gYmFjayB0byB+MCAtIDB4MTAwMCBhdCBzdGFydC1vZi1kYXksIGFuZCBpbmNyZW1l bnQgYnkgMHgxMDAKICAgIG9uIHJlc2V0LgogICAgVGhpcyBtYWtlcyBpdCBvYnZpb3VzIHdoaWNo IGJicyBhcmUgd2hpY2ggYWZ0ZXIgYSByZXNldC4gKERhdmlkIEdvcmRvbgogICAgJiBKb2huIEhh cnJpc29uKQogICAgUmViYXNlLgoKSXNzdWU6IFZJWi00Nzk4ClNpZ25lZC1vZmYtYnk6IE5pY2sg SG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll bC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQ2M6IEpvaG4gSGFycmlzb24gPGpvaG4uYy5oYXJyaXNvbkBpbnRlbC5jb20+CkNjOiBE YXZpZCBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgIDI0ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICAgICB8IDE1NSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgICAgIHwgICA0ICstCiA1IGZp bGVzIGNoYW5nZWQsIDkzIGluc2VydGlvbnMoKyksIDk0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IDEyODcwMDcuLmRlZDcxNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtODg4LDcgKzg4OCw2IEBAIHN0cnVjdCBpbnRlbF9jb250ZXh0IHsKIAl9IGxlZ2Fj eV9od19jdHg7CiAKIAkvKiBFeGVjbGlzdHMgKi8KLQlib29sIHJjc19pbml0aWFsaXplZDsKIAlz dHJ1Y3QgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqc3RhdGU7CiAJCXN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNDEy NjNjZC4uYzgxMjVhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00NjEzLDE0ICs0NjEz LDggQEAgaW50IGk5MTVfZ2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ CWdvdG8gY2xlYW51cF92ZWJveF9yaW5nOwogCX0KIAotCXJldCA9IGk5MTVfZ2VtX3NldF9zZXFu byhkZXYsICgodTMyKX4wIC0gMHgxMDAwKSk7Ci0JaWYgKHJldCkKLQkJZ290byBjbGVhbnVwX2Jz ZDJfcmluZzsKLQogCXJldHVybiAwOwogCi1jbGVhbnVwX2JzZDJfcmluZzoKLQlpbnRlbF9jbGVh bnVwX3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+cmluZ1tWQ1MyXSk7CiBjbGVhbnVwX3ZlYm94X3Jp bmc6CiAJaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYtPnJpbmdbVkVDU10pOwog Y2xlYW51cF9ibHRfcmluZzoKQEAgLTQ2MzksNiArNDYzMyw3IEBAIGk5MTVfZ2VtX2luaXRfaHco c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAJ aW50IHJldCwgaSwgajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAogCWlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYgJiYgIWludGVsX2VuYWJsZV9ndHQoKSkKIAkJcmV0 dXJuIC1FSU87CkBAIC00NzA2LDkgKzQ3MDEsMTYgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQkJZ290byBvdXQ7CiAJfQogCisJLyoKKwkgKiBJbmNyZW1lbnQg dGhlIG5leHQgc2Vxbm8gYnkgMHgxMDAgc28gd2UgaGF2ZSBhIHZpc2libGUgYnJlYWsKKwkgKiBv biByZS1pbml0aWFsaXNhdGlvbgorCSAqLworCXJldCA9IGk5MTVfZ2VtX3NldF9zZXFubyhkZXYs IGRldl9wcml2LT5uZXh0X3NlcW5vKzB4MTAwKTsKKwlpZiAocmV0KQorCQlnb3RvIG91dDsKKwog CS8qIE5vdyBpdCBpcyBzYWZlIHRvIGdvIGJhY2sgcm91bmQgYW5kIGRvIGV2ZXJ5dGhpbmcgZWxz ZTogKi8KIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7Ci0JCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCiAJCVdBUk5fT04oIXJpbmctPmRlZmF1bHRfY29udGV4 dCk7CiAKQEAgLTQ5MDcsNiArNDkwOSwxNCBAQCBpOTE1X2dlbV9sb2FkKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCWRldl9wcml2LT5udW1fZmVuY2VfcmVncyA9CiAJCQkJSTkxNV9SRUFEKHZn dGlmX3JlZyhhdmFpbF9ycy5mZW5jZV9udW0pKTsKIAorCS8qCisJICogU2V0IGluaXRpYWwgc2Vx dWVuY2UgbnVtYmVyIGZvciByZXF1ZXN0cy4KKwkgKiBVc2luZyB0aGlzIG51bWJlciBhbGxvd3Mg dGhlIHdyYXBhcm91bmQgdG8gaGFwcGVuIGVhcmx5LAorCSAqIGNhdGNoaW5nIGFueSBvYnZpb3Vz IHByb2JsZW1zLgorCSAqLworCWRldl9wcml2LT5uZXh0X3NlcW5vID0gKCh1MzIpfjAgLSAweDEx MDApOworCWRldl9wcml2LT5sYXN0X3NlcW5vID0gKCh1MzIpfjAgLSAweDExMDEpOworCiAJLyog SW5pdGlhbGl6ZSBmZW5jZSByZWdpc3RlcnMgdG8gemVybyAqLwogCUlOSVRfTElTVF9IRUFEKCZk ZXZfcHJpdi0+bW0uZmVuY2VfbGlzdCk7CiAJaTkxNV9nZW1fcmVzdG9yZV9mZW5jZXMoZGV2KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBhOTUzZDQ5 Li42NDY3NGRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CkBAIC05OTQsNiArOTk0LDcgQEAgaTkxNV9nZW1fdmFsaWRhdGVfY29udGV4dChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiB7CiAJc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCA9IE5VTEw7CiAJc3RydWN0IGk5MTVfY3R4X2hhbmdfc3RhdHMgKmhzOworCWlu dCByZXQ7CiAKIAlpZiAocmluZy0+aWQgIT0gUkNTICYmIGN0eF9pZCAhPSBERUZBVUxUX0NPTlRF WFRfSEFORExFKQogCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKQEAgLTEwMDksNyArMTAxMCw3 IEBAIGk5MTVfZ2VtX3ZhbGlkYXRlX2NvbnRleHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry dWN0IGRybV9maWxlICpmaWxlLAogCX0KIAogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMgJiYg IWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSkgewotCQlpbnQgcmV0ID0gaW50ZWxfbHJfY29u dGV4dF9kZWZlcnJlZF9jcmVhdGUoY3R4LCByaW5nKTsKKwkJcmV0ID0gaW50ZWxfbHJfY29udGV4 dF9kZWZlcnJlZF9hbGxvYyhjdHgsIHJpbmcpOwogCQlpZiAocmV0KSB7CiAJCQlEUk1fREVCVUco IkNvdWxkIG5vdCBjcmVhdGUgTFJDICV1OiAlZFxuIiwgY3R4X2lkLCByZXQpOwogCQkJcmV0dXJu IEVSUl9QVFIocmV0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMjhhNzEyZS4uZWJl MzBhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE0NDUsMTEgKzE0NDUsMzIgQEAg b3V0OgogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9z dGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9jdHhfb2JqKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IHBhZ2UgKnBh Z2U7CisKKwkvKiBUaGUgSFdTUCBpcyBwYXJ0IG9mIHRoZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0 IGluIExSQyBtb2RlLiAqLworCXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRyID0gaTkxNV9nZW1f b2JqX2dndHRfb2Zmc2V0KGRlZmF1bHRfY3R4X29iaikKKwkJCSsgTFJDX1BQSFdTUF9QTiAqIFBB R0VfU0laRTsKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGRlZmF1bHRfY3R4X29i aiwgTFJDX1BQSFdTUF9QTik7CisJcmluZy0+c3RhdHVzX3BhZ2UucGFnZV9hZGRyID0ga21hcChw YWdlKTsKKwlyaW5nLT5zdGF0dXNfcGFnZS5vYmogPSBkZWZhdWx0X2N0eF9vYmo7CisKKwlJOTE1 X1dSSVRFKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpLAorCQkJKHUzMilyaW5nLT5zdGF0 dXNfcGFnZS5nZnhfYWRkcik7CisJUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlv X2Jhc2UpKTsKK30KKwogc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAKKwlscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZywKKwkJCQlyaW5nLT5k ZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpOworCiAJSTkxNV9XUklURV9J TVIocmluZywgfihyaW5nLT5pcnFfZW5hYmxlX21hc2sgfCByaW5nLT5pcnFfa2VlcF9tYXNrKSk7 CiAJSTkxNV9XUklURShSSU5HX0hXU1RBTShyaW5nLT5tbWlvX2Jhc2UpLCAweGZmZmZmZmZmKTsK IApAQCAtMTg4OSw4ICsxOTEwLDMzIEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluCiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3Jl YXRlKHJpbmctPmRlZmF1bHRfY29udGV4dCwgcmluZyk7CisJcmV0ID0gaW50ZWxfbHJfY29udGV4 dF9kZWZlcnJlZF9hbGxvYyhyaW5nLT5kZWZhdWx0X2NvbnRleHQsIHJpbmcpOworCWlmIChyZXQp CisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oCisJCXJpbmct PmRlZmF1bHRfY29udGV4dC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSwKKwkJR0VOOF9MUl9DT05U RVhUX0FMSUdOLCAwKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19EUklWRVIoIlBpbiBMUkMg YmFja2luZyBvYmogZmFpbGVkOiAlZFxuIiwKKwkJCQlyZXQpOworCQlyZXR1cm4gcmV0OworCX0K KworCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKGRldiwKKwkJcmluZy0+ ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYpOworCWlmIChyZXQpIHsK KwkJRFJNX0VSUk9SKAorCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAl ZFxuIiwKKwkJCXJpbmctPm5hbWUsIHJldCk7CisJCWdvdG8gZXJyb3JfdW5waW5fZ2d0dDsKKwl9 CisKKwlyZXR1cm4gcmV0OwogCitlcnJvcl91bnBpbl9nZ3R0OgorCWk5MTVfZ2VtX29iamVjdF9n Z3R0X3VucGluKAorCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3Rh dGUpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTIxMTIsMTQgKzIxNTgsOCBAQCBpbnQgaW50ZWxf bG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIGNsZWFu dXBfdmVib3hfcmluZzsKIAl9CiAKLQlyZXQgPSBpOTE1X2dlbV9zZXRfc2Vxbm8oZGV2LCAoKHUz Mil+MCAtIDB4MTAwMCkpOwotCWlmIChyZXQpCi0JCWdvdG8gY2xlYW51cF9ic2QyX3Jpbmc7Ci0K IAlyZXR1cm4gMDsKIAotY2xlYW51cF9ic2QyX3Jpbmc6Ci0JaW50ZWxfbG9naWNhbF9yaW5nX2Ns ZWFudXAoJmRldl9wcml2LT5yaW5nW1ZDUzJdKTsKIGNsZWFudXBfdmVib3hfcmluZzoKIAlpbnRl bF9sb2dpY2FsX3JpbmdfY2xlYW51cCgmZGV2X3ByaXYtPnJpbmdbVkVDU10pOwogY2xlYW51cF9i bHRfcmluZzoKQEAgLTIzNzAsMjYgKzI0MTAsOCBAQCBzdGF0aWMgdWludDMyX3QgZ2V0X2xyX2Nv bnRleHRfc2l6ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXJldHVybiByZXQ7CiB9 CiAKLXN0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVs dF9jdHhfb2JqKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmct PmRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7Ci0KLQkvKiBUaGUgSFdTUCBp cyBwYXJ0IG9mIHRoZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0IGluIExSQyBtb2RlLiAqLwotCXJp bmctPnN0YXR1c19wYWdlLmdmeF9hZGRyID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGRlZmF1 bHRfY3R4X29iaikKLQkJCSsgTFJDX1BQSFdTUF9QTiAqIFBBR0VfU0laRTsKLQlwYWdlID0gaTkx NV9nZW1fb2JqZWN0X2dldF9wYWdlKGRlZmF1bHRfY3R4X29iaiwgTFJDX1BQSFdTUF9QTik7Ci0J cmluZy0+c3RhdHVzX3BhZ2UucGFnZV9hZGRyID0ga21hcChwYWdlKTsKLQlyaW5nLT5zdGF0dXNf cGFnZS5vYmogPSBkZWZhdWx0X2N0eF9vYmo7Ci0KLQlJOTE1X1dSSVRFKFJJTkdfSFdTX1BHQShy aW5nLT5tbWlvX2Jhc2UpLAotCQkJKHUzMilyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRkcik7Ci0J UE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpKTsKLX0KLQogLyoqCi0g KiBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZSgpIC0gY3JlYXRlIHRoZSBMUkMgc3Bl Y2lmaWMgYml0cyBvZiBhIGNvbnRleHQKKyAqIGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxs b2MoKSAtIGNyZWF0ZSB0aGUgTFJDIHNwZWNpZmljIGJpdHMgb2YgYSBjb250ZXh0CiAgKiBAY3R4 OiBMUiBjb250ZXh0IHRvIGNyZWF0ZS4KICAqIEByaW5nOiBlbmdpbmUgdG8gYmUgdXNlZCB3aXRo IHRoZSBjb250ZXh0LgogICoKQEAgLTI0MDEsMTIgKzI0MjMsMTEgQEAgc3RhdGljIHZvaWQgbHJj X3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CiAgKgogICogUmV0dXJuOiBub24temVybyBvbiBlcnJvci4KICAqLwotaW50IGludGVsX2xyX2Nv bnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisKK2ludCBp bnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCWNvbnN0IGJvb2wg aXNfZ2xvYmFsX2RlZmF1bHRfY3R4ID0gKGN0eCA9PSByaW5nLT5kZWZhdWx0X2NvbnRleHQpOwog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqY3R4X29iajsKIAl1aW50MzJfdCBjb250ZXh0X3NpemU7CiAJc3RydWN0IGludGVs X3JpbmdidWZmZXIgKnJpbmdidWY7CkBAIC0yNDI2LDgyICsyNDQ3LDUwIEBAIGludCBpbnRlbF9s cl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQly ZXR1cm4gLUVOT01FTTsKIAl9CiAKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KSB7Ci0JCXJl dCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihjdHhfb2JqLCBHRU44X0xSX0NPTlRFWFRfQUxJR04s Ci0JCQkJUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1RPUCk7Ci0JCWlmIChyZXQpIHsKLQkJ CURSTV9ERUJVR19EUklWRVIoIlBpbiBMUkMgYmFja2luZyBvYmogZmFpbGVkOiAlZFxuIiwKLQkJ CQkJcmV0KTsKLQkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsK LQkJCXJldHVybiByZXQ7Ci0JCX0KLQotCQkvKiBJbnZhbGlkYXRlIEd1QyBUTEIuICovCi0JCWlm IChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKLQkJCUk5MTVfV1JJVEUoR0VOOF9HVENSLCBH RU44X0dUQ1JfSU5WQUxJREFURSk7Ci0JfQotCiAJcmluZ2J1ZiA9IGludGVsX2VuZ2luZV9jcmVh dGVfcmluZ2J1ZmZlcihyaW5nLCA0ICogUEFHRV9TSVpFKTsKIAlpZiAoSVNfRVJSKHJpbmdidWYp KSB7CiAJCXJldCA9IFBUUl9FUlIocmluZ2J1Zik7Ci0JCWdvdG8gZXJyb3JfdW5waW5fY3R4Owot CX0KLQotCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0ID0gaW50ZWxfcGluX2Fu ZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKLQkJaWYgKHJldCkgewotCQkJRFJN X0VSUk9SKAotCQkJCSAgIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxu IiwKLQkJCQkgIHJpbmctPm5hbWUsIHJldCk7Ci0JCQlnb3RvIGVycm9yX3JpbmdidWY7Ci0JCX0K KwkJZ290byBlcnJvcl9kZXJlZl9vYmo7CiAJfQogCiAJcmV0ID0gcG9wdWxhdGVfbHJfY29udGV4 dChjdHgsIGN0eF9vYmosIHJpbmcsIHJpbmdidWYpOwogCWlmIChyZXQpIHsKIAkJRFJNX0RFQlVH X0RSSVZFUigiRmFpbGVkIHRvIHBvcHVsYXRlIExSQzogJWRcbiIsIHJldCk7Ci0JCWdvdG8gZXJy b3I7CisJCWdvdG8gZXJyb3JfcmluZ2J1ZjsKIAl9CiAKIAljdHgtPmVuZ2luZVtyaW5nLT5pZF0u cmluZ2J1ZiA9IHJpbmdidWY7CiAJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gY3R4X29i ajsKIAotCWlmIChjdHggPT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KQotCQlscmNfc2V0dXBfaGFy ZHdhcmVfc3RhdHVzX3BhZ2UocmluZywgY3R4X29iaik7Ci0JZWxzZSBpZiAocmluZy0+aWQgPT0g UkNTICYmICFjdHgtPnJjc19pbml0aWFsaXplZCkgewotCQlpZiAocmluZy0+aW5pdF9jb250ZXh0 KSB7Ci0JCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQotCQkJcmV0ID0gaTkx NV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCBjdHgsICZyZXEpOwotCQkJaWYgKHJldCkKLQkJCQly ZXR1cm4gcmV0OworCWlmIChjdHggIT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0ICYmIHJpbmctPmlu aXRfY29udGV4dCkgeworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAotCQkJ cmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJlcSk7Ci0JCQlpZiAocmV0KSB7Ci0JCQkJRFJNX0VS Uk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIsIHJldCk7Ci0JCQkJaTkxNV9nZW1fcmVxdWVz dF9jYW5jZWwocmVxKTsKLQkJCQljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IE5VTEw7 Ci0JCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gTlVMTDsKLQkJCQlnb3RvIGVycm9y OwotCQkJfQotCi0JCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcSk7CisJCXJldCA9IGk5 MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywKKwkJCXJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJl cSk7CisJCWlmIChyZXQpIHsKKwkJCURSTV9FUlJPUigicmluZyBjcmVhdGUgcmVxOiAlZFxuIiwK KwkJCQlyZXQpOworCQkJaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwocmVxKTsKKwkJCWdvdG8gZXJy b3JfcmluZ2J1ZjsKIAkJfQogCi0JCWN0eC0+cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKKwkJcmV0 ID0gcmluZy0+aW5pdF9jb250ZXh0KHJlcSk7CisJCWlmIChyZXQpIHsKKwkJCURSTV9FUlJPUigi cmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLAorCQkJCXJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0 X2NhbmNlbChyZXEpOworCQkJZ290byBlcnJvcl9yaW5nYnVmOworCQl9CisJCWk5MTVfYWRkX3Jl cXVlc3Rfbm9fZmx1c2gocmVxKTsKIAl9Ci0KIAlyZXR1cm4gMDsKIAotZXJyb3I6Ci0JaWYgKGlz X2dsb2JhbF9kZWZhdWx0X2N0eCkKLQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1 Zik7CiBlcnJvcl9yaW5nYnVmOgogCWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsKLWVy cm9yX3VucGluX2N0eDoKLQlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4KQotCQlpOTE1X2dlbV9v YmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKK2Vycm9yX2RlcmVmX29iajoKIAlkcm1fZ2VtX29i amVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CisJY3R4LT5lbmdpbmVbcmluZy0+aWRd LnJpbmdidWYgPSBOVUxMOworCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSA9IE5VTEw7CiAJ cmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCA0Y2M1NGIzLi42 OWQ5OWYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtNzUsOCArNzUsOCBAQCBzdGF0 aWMgaW5saW5lIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQoc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYsCiAjZGVmaW5lIExSQ19TVEFURV9QTgkoTFJDX1BQSFdTUF9QTiArIDEp CiAKIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgp OwotaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCi0JCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2ludCBp bnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CisJCQkJICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9scl9j b250ZXh0X3VucGluKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIHZvaWQgaW50 ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCk7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK