From: Imre Deak Subject: [PATCH 4/7] drm/i915: Move load time display/audio callback init earlier Date: Wed, 9 Mar 2016 17:31:43 +0200 Message-ID: <1457537506-12455-5-git-send-email-imre.deak@intel.com> References: <1457537506-12455-1-git-send-email-imre.deak@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 14E906E1A8 for ; Wed, 9 Mar 2016 15:33:30 +0000 (UTC) In-Reply-To: <1457537506-12455-1-git-send-email-imre.deak@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 QWxsIG9mIHRoaXMgaXMgU1cgb25seSBpbml0aWFsaXphdGlvbiBzbyB3ZSBjYW4gbW92ZSB0aGVt IGVhcmxpZXIuIE1vdmUKdGhlIG11dGV4IGluaXQgd2hlcmUgdGhlIHJlc3Qgb2YgdGhlIGxvY2tz IGFyZSBpbml0ZWQuIFdoaWxlIGF0IGl0IGFsc28KY29udmVydCBkZXYgdG8gZGV2X3ByaXYuCgpT aWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F1ZGlvLmMgICB8IDEyICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIHwgNzcgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMyArLQogNCBmaWxlcyBjaGFu Z2VkLCA0NSBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k bWEuYwppbmRleCA5YjNlZDAwLi41NWIwYzYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAg LTEwMTYsNiArMTAxNiw3IEBAIGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPm1vZGVz ZXRfcmVzdG9yZV9sb2NrKTsKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+YXZfbXV0ZXgpOwogCW11 dGV4X2luaXQoJmRldl9wcml2LT53bS53bV9tdXRleCk7CisJbXV0ZXhfaW5pdCgmZGV2X3ByaXYt PnBwc19tdXRleCk7CiAKIAlyZXQgPSBpOTE1X3dvcmtxdWV1ZXNfaW5pdChkZXZfcHJpdik7CiAJ aWYgKHJldCA8IDApCkBAIC0xMDI4LDYgKzEwMjksOCBAQCBpbnQgaTkxNV9kcml2ZXJfbG9hZChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCWludGVsX2luaXRf ZHBpbyhkZXZfcHJpdik7CiAJaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KGRldl9wcml2KTsKIAlp bnRlbF9pcnFfaW5pdChkZXZfcHJpdik7CisJaW50ZWxfaW5pdF9kaXNwbGF5X2NhbGxiYWNrcyhk ZXZfcHJpdik7CisJaW50ZWxfaW5pdF9hdWRpb19jYWxsYmFja3MoZGV2X3ByaXYpOwogCiAJaW50 ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdWRpby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8u YwppbmRleCAzMGY5MjE0Li4xOTM2NzUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9hdWRpby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMK QEAgLTU2NywyMCArNTY3LDE4IEBAIHZvaWQgaW50ZWxfYXVkaW9fY29kZWNfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKICAqIGludGVsX2luaXRfYXVkaW8gLSBT ZXQgdXAgY2hpcCBzcGVjaWZpYyBhdWRpbyBmdW5jdGlvbnMKICAqIEBkZXY6IGRybSBkZXZpY2UK ICAqLwotdm9pZCBpbnRlbF9pbml0X2F1ZGlvKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lk IGludGVsX2luaXRfYXVkaW9fY2FsbGJhY2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwotCi0JaWYgKElTX0c0WChkZXYpKSB7CisJaWYgKElTX0c0WChkZXZfcHJpdikpIHsK IAkJZGV2X3ByaXYtPmRpc3BsYXkuYXVkaW9fY29kZWNfZW5hYmxlID0gZzR4X2F1ZGlvX2NvZGVj X2VuYWJsZTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuYXVkaW9fY29kZWNfZGlzYWJsZSA9IGc0eF9h dWRpb19jb2RlY19kaXNhYmxlOwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikg fHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuYXVkaW9f Y29kZWNfZW5hYmxlID0gaWxrX2F1ZGlvX2NvZGVjX2VuYWJsZTsKIAkJZGV2X3ByaXYtPmRpc3Bs YXkuYXVkaW9fY29kZWNfZGlzYWJsZSA9IGlsa19hdWRpb19jb2RlY19kaXNhYmxlOwotCX0gZWxz ZSBpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKKwl9 IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElOVEVMX0lORk8oZGV2X3ByaXYpLT5n ZW4gPj0gOCkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5hdWRpb19jb2RlY19lbmFibGUgPSBoc3df YXVkaW9fY29kZWNfZW5hYmxlOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5hdWRpb19jb2RlY19kaXNh YmxlID0gaHN3X2F1ZGlvX2NvZGVjX2Rpc2FibGU7Ci0JfSBlbHNlIGlmIChIQVNfUENIX1NQTElU KGRldikpIHsKKwl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWRldl9w cml2LT5kaXNwbGF5LmF1ZGlvX2NvZGVjX2VuYWJsZSA9IGlsa19hdWRpb19jb2RlY19lbmFibGU7 CiAJCWRldl9wcml2LT5kaXNwbGF5LmF1ZGlvX2NvZGVjX2Rpc2FibGUgPSBpbGtfYXVkaW9fY29k ZWNfZGlzYWJsZTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjJk MzZhNy4uNTE3MDcxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUw OTUsMjIgKzE1MDk1LDIwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1 bmNzIGludGVsX21vZGVfZnVuY3MgPSB7CiB9OwogCiAvKiBTZXQgdXAgY2hpcCBzcGVjaWZpYyBk aXNwbGF5IGZ1bmN0aW9ucyAqLwotc3RhdGljIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX2luaXRfZGlzcGxheV9jYWxsYmFja3Moc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlpZiAoSEFTX1BDSF9TUExJVChk ZXYpIHx8IElTX0c0WChkZXYpKQorCWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSB8fCBJU19H NFgoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5maW5kX2RwbGwgPSBnNHhfZmluZF9i ZXN0X2RwbGw7Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX0NI RVJSWVZJRVcoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5maW5kX2RwbGwgPSBjaHZf ZmluZF9iZXN0X2RwbGw7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQorCWVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5maW5kX2RwbGwg PSB2bHZfZmluZF9iZXN0X2RwbGw7Ci0JZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2KSkKKwllbHNl IGlmIChJU19QSU5FVklFVyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmZpbmRfZHBs bCA9IHBudl9maW5kX2Jlc3RfZHBsbDsKIAllbHNlCiAJCWRldl9wcml2LT5kaXNwbGF5LmZpbmRf ZHBsbCA9IGk5eHhfZmluZF9iZXN0X2RwbGw7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gOSkgeworCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDkpIHsKIAkJZGV2X3By aXYtPmRpc3BsYXkuZ2V0X3BpcGVfY29uZmlnID0gaGFzd2VsbF9nZXRfcGlwZV9jb25maWc7CiAJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9pbml0aWFsX3BsYW5lX2NvbmZpZyA9CiAJCQlza3lsYWtl X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZzsKQEAgLTE1MTE4LDcgKzE1MTE2LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQloYXN3 ZWxsX2NydGNfY29tcHV0ZV9jbG9jazsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUg PSBoYXN3ZWxsX2NydGNfZW5hYmxlOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUg PSBoYXN3ZWxsX2NydGNfZGlzYWJsZTsKLQl9IGVsc2UgaWYgKEhBU19EREkoZGV2KSkgeworCX0g ZWxzZSBpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X3Bp cGVfY29uZmlnID0gaGFzd2VsbF9nZXRfcGlwZV9jb25maWc7CiAJCWRldl9wcml2LT5kaXNwbGF5 LmdldF9pbml0aWFsX3BsYW5lX2NvbmZpZyA9CiAJCQlpcm9ubGFrZV9nZXRfaW5pdGlhbF9wbGFu ZV9jb25maWc7CkBAIC0xNTEyNiw3ICsxNTEyNCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2luaXRf ZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJaGFzd2VsbF9jcnRjX2NvbXB1dGVf Y2xvY2s7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlID0gaGFzd2VsbF9jcnRjX2Vu YWJsZTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlID0gaGFzd2VsbF9jcnRjX2Rp c2FibGU7Ci0JfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikpIHsKKwl9IGVsc2UgaWYgKEhB U19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2Nv bmZpZyA9IGlyb25sYWtlX2dldF9waXBlX2NvbmZpZzsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0 X2luaXRpYWxfcGxhbmVfY29uZmlnID0KIAkJCWlyb25sYWtlX2dldF9pbml0aWFsX3BsYW5lX2Nv bmZpZzsKQEAgLTE1MTM0LDcgKzE1MTMyLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfaW5pdF9kaXNw bGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpcm9ubGFrZV9jcnRjX2NvbXB1dGVfY2xv Y2s7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlID0gaXJvbmxha2VfY3J0Y19lbmFi bGU7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSA9IGlyb25sYWtlX2NydGNfZGlz YWJsZTsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRl dikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyA9IGk5 eHhfZ2V0X3BpcGVfY29uZmlnOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfaW5pdGlhbF9wbGFu ZV9jb25maWcgPQogCQkJaTl4eF9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWc7CkBAIC0xNTE1MSw4 OSArMTUxNDksODkgQEAgc3RhdGljIHZvaWQgaW50ZWxfaW5pdF9kaXNwbGF5KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJfQogCiAJLyogUmV0dXJucyB0aGUgY29yZSBkaXNwbGF5IGNsb2NrIHNw ZWVkICovCi0JaWYgKElTX1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKQorCWlmIChJ U19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCWRldl9wcml2 LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCXNreWxha2VfZ2V0X2Rpc3Bs YXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQorCWVsc2UgaWYgKElT X0JST1hUT04oZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9j a19zcGVlZCA9CiAJCQlicm94dG9uX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkOwotCWVsc2UgaWYg KElTX0JST0FEV0VMTChkZXYpKQorCWVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJ CWRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCWJyb2Fkd2Vs bF9nZXRfZGlzcGxheV9jbG9ja19zcGVlZDsKLQllbHNlIGlmIChJU19IQVNXRUxMKGRldikpCisJ ZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9k aXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCWhhc3dlbGxfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQ7 Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKKwll bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQgPQogCQkJdmFs bGV5dmlld19nZXRfZGlzcGxheV9jbG9ja19zcGVlZDsKLQllbHNlIGlmIChJU19HRU41KGRldikp CisJZWxzZSBpZiAoSVNfR0VONShkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9k aXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCWlsa19nZXRfZGlzcGxheV9jbG9ja19zcGVlZDsKLQll bHNlIGlmIChJU19JOTQ1RyhkZXYpIHx8IElTX0JST0FEV0FURVIoZGV2KSB8fAotCQkgSVNfR0VO NihkZXYpIHx8IElTX0lWWUJSSURHRShkZXYpKQorCWVsc2UgaWYgKElTX0k5NDVHKGRldl9wcml2 KSB8fCBJU19CUk9BRFdBVEVSKGRldl9wcml2KSB8fAorCQkgSVNfR0VONihkZXZfcHJpdikgfHwg SVNfSVZZQlJJREdFKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rpc3BsYXlf Y2xvY2tfc3BlZWQgPQogCQkJaTk0NV9nZXRfZGlzcGxheV9jbG9ja19zcGVlZDsKLQllbHNlIGlm IChJU19HTTQ1KGRldikpCisJZWxzZSBpZiAoSVNfR000NShkZXZfcHJpdikpCiAJCWRldl9wcml2 LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCWdtNDVfZ2V0X2Rpc3BsYXlf Y2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfQ1JFU1RMSU5FKGRldikpCisJZWxzZSBpZiAoSVNf Q1JFU1RMSU5FKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2Rpc3BsYXlfY2xv Y2tfc3BlZWQgPQogCQkJaTk2NWdtX2dldF9kaXNwbGF5X2Nsb2NrX3NwZWVkOwotCWVsc2UgaWYg KElTX1BJTkVWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2X3ByaXYpKQogCQlk ZXZfcHJpdi0+ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZCA9CiAJCQlwbnZfZ2V0X2Rp c3BsYXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfRzMzKGRldikgfHwgSVNfRzRYKGRldikp CisJZWxzZSBpZiAoSVNfRzMzKGRldl9wcml2KSB8fCBJU19HNFgoZGV2X3ByaXYpKQogCQlkZXZf cHJpdi0+ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZCA9CiAJCQlnMzNfZ2V0X2Rpc3Bs YXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfSTkxNUcoZGV2KSkKKwllbHNlIGlmIChJU19J OTE1RyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3Nw ZWVkID0KIAkJCWk5MTVfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfSTk0 NUdNKGRldikgfHwgSVNfODQ1RyhkZXYpKQorCWVsc2UgaWYgKElTX0k5NDVHTShkZXZfcHJpdikg fHwgSVNfODQ1RyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Ns b2NrX3NwZWVkID0KIAkJCWk5eHhfbWlzY19nZXRfZGlzcGxheV9jbG9ja19zcGVlZDsKLQllbHNl IGlmIChJU19JOTE1R00oZGV2KSkKKwllbHNlIGlmIChJU19JOTE1R00oZGV2X3ByaXYpKQogCQlk ZXZfcHJpdi0+ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZCA9CiAJCQlpOTE1Z21fZ2V0 X2Rpc3BsYXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAoSVNfSTg2NUcoZGV2KSkKKwllbHNlIGlm IChJU19JODY1RyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Ns b2NrX3NwZWVkID0KIAkJCWk4NjVfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQ7Ci0JZWxzZSBpZiAo SVNfSTg1WChkZXYpKQorCWVsc2UgaWYgKElTX0k4NVgoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ ZGlzcGxheS5nZXRfZGlzcGxheV9jbG9ja19zcGVlZCA9CiAJCQlpODV4X2dldF9kaXNwbGF5X2Ns b2NrX3NwZWVkOwogCWVsc2UgeyAvKiA4MzAgKi8KLQkJV0FSTighSVNfSTgzMChkZXYpLCAiVW5r bm93biBwbGF0Zm9ybS4gQXNzdW1pbmcgMTMzIE1IeiBDRENMS1xuIik7CisJCVdBUk4oIUlTX0k4 MzAoZGV2X3ByaXYpLCAiVW5rbm93biBwbGF0Zm9ybS4gQXNzdW1pbmcgMTMzIE1IeiBDRENMS1xu Iik7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkID0KIAkJCWk4 MzBfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQ7CiAJfQogCi0JaWYgKElTX0dFTjUoZGV2KSkgewor CWlmIChJU19HRU41KGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5mZGlfbGlua190 cmFpbiA9IGlyb25sYWtlX2ZkaV9saW5rX3RyYWluOwotCX0gZWxzZSBpZiAoSVNfR0VONihkZXYp KSB7CisJfSBlbHNlIGlmIChJU19HRU42KGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxh eS5mZGlfbGlua190cmFpbiA9IGdlbjZfZmRpX2xpbmtfdHJhaW47Ci0JfSBlbHNlIGlmIChJU19J VllCUklER0UoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewog CQkvKiBGSVhNRTogZGV0ZWN0IEIwKyBzdGVwcGluZyBhbmQgdXNlIGF1dG8gdHJhaW5pbmcgKi8K IAkJZGV2X3ByaXYtPmRpc3BsYXkuZmRpX2xpbmtfdHJhaW4gPSBpdmJfbWFudWFsX2ZkaV9saW5r X3RyYWluOwotCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYp KSB7CisJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2 X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmZkaV9saW5rX3RyYWluID0gaHN3X2ZkaV9s aW5rX3RyYWluOwotCQlpZiAoSVNfQlJPQURXRUxMKGRldikpIHsKKwkJaWYgKElTX0JST0FEV0VM TChkZXZfcHJpdikpIHsKIAkJCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY29tbWl0X2NkY2xr ID0KIAkJCQlicm9hZHdlbGxfbW9kZXNldF9jb21taXRfY2RjbGs7CiAJCQlkZXZfcHJpdi0+ZGlz cGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQogCQkJCWJyb2Fkd2VsbF9tb2Rlc2V0X2NhbGNfY2Rj bGs7CiAJCX0KLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVX KGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJS WVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY29tbWl0X2Nk Y2xrID0KIAkJCXZhbGxleXZpZXdfbW9kZXNldF9jb21taXRfY2RjbGs7CiAJCWRldl9wcml2LT5k aXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9CiAJCQl2YWxsZXl2aWV3X21vZGVzZXRfY2FsY19j ZGNsazsKLQl9IGVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jb21taXRfY2Rj bGsgPQogCQkJYnJveHRvbl9tb2Rlc2V0X2NvbW1pdF9jZGNsazsKIAkJZGV2X3ByaXYtPmRpc3Bs YXkubW9kZXNldF9jYWxjX2NkY2xrID0KIAkJCWJyb3h0b25fbW9kZXNldF9jYWxjX2NkY2xrOwog CX0KIAotCXN3aXRjaCAoSU5URUxfSU5GTyhkZXYpLT5nZW4pIHsKKwlzd2l0Y2ggKElOVEVMX0lO Rk8oZGV2X3ByaXYpLT5nZW4pIHsKIAljYXNlIDI6CiAJCWRldl9wcml2LT5kaXNwbGF5LnF1ZXVl X2ZsaXAgPSBpbnRlbF9nZW4yX3F1ZXVlX2ZsaXA7CiAJCWJyZWFrOwpAQCAtMTUyNjAsOCArMTUy NTgsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJLyogRGVmYXVsdCBqdXN0IHJldHVybnMgLUVOT0RFViB0byBpbmRpY2F0ZSB1bnN1 cHBvcnRlZCAqLwogCQlkZXZfcHJpdi0+ZGlzcGxheS5xdWV1ZV9mbGlwID0gaW50ZWxfZGVmYXVs dF9xdWV1ZV9mbGlwOwogCX0KLQotCW11dGV4X2luaXQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwog fQogCiAvKgpAQCAtMTU1ODgsOSArMTU1ODQsNiBAQCB2b2lkIGludGVsX21vZGVzZXRfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9CiAJfQogCi0JaW50ZWxfaW5pdF9kaXNwbGF5KGRl dik7Ci0JaW50ZWxfaW5pdF9hdWRpbyhkZXYpOwotCiAJaWYgKElTX0dFTjIoZGV2KSkgewogCQlk ZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCA9IDIwNDg7CiAJCWRldi0+bW9kZV9jb25maWcubWF4 X2hlaWdodCA9IDIwNDg7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDdiMmQ2NmQuLjUy NjQ5MDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMTEwLDcgKzExMTAsNyBAQCB1 MzIgaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkgICAgICB1aW50NjRfdCBmYl9tb2RpZmllciwgdWludDMyX3QgcGl4 ZWxfZm9ybWF0KTsKIAogLyogaW50ZWxfYXVkaW8uYyAqLwotdm9pZCBpbnRlbF9pbml0X2F1ZGlv KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCBpbnRlbF9pbml0X2F1ZGlvX2NhbGxiYWNr cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9hdWRpb19j b2RlY19lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwogdm9pZCBpbnRlbF9h dWRpb19jb2RlY19kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKTsKIHZvaWQg aTkxNV9hdWRpb19jb21wb25lbnRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwpAQCAtMTExOCw2ICsxMTE4LDcgQEAgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9jbGVh bnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGludGVsX2Rpc3Bs YXkuYyAqLwogZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVf ZnVuY3M7Cit2b2lkIGludGVsX2luaXRfZGlzcGxheV9jYWxsYmFja3Moc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIHVuc2lnbmVkIGludCBpbnRlbF9yb3RhdGlvbl9pbmZvX3Np emUoY29uc3Qgc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKnJvdF9pbmZvKTsKIGJvb2wgaW50 ZWxfaGFzX3BlbmRpbmdfZmJfdW5waW4oc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGlu dGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLS0gCjIuNS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK