From: Shashank Sharma Subject: [PATCH v2 3/7] drm/i915: Move infoframe vfuncs into intel_digital_port Date: Wed, 9 Aug 2017 12:16:22 +0530 Message-ID: <1502261186-10417-4-git-send-email-shashank.sharma@intel.com> References: <1502261186-10417-1-git-send-email-shashank.sharma@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 ESMTPS id 750786E1C8 for ; Wed, 9 Aug 2017 06:43:26 +0000 (UTC) In-Reply-To: <1502261186-10417-1-git-send-email-shashank.sharma@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, ville.syrjala@linux.intel.com, imre.deak@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkRQ IHBvcnRzIHdpbGwgYWxzbyB3YW50IHRvIHV0aWxpemUgdGhlIHZpZGVvIERJUCBmb3IgU0RQIHRy YW5zbWlzc2lvbi4KU28gbGV0J3MgbW92ZSB0aGUgdmZ1bmNzIGludG8gdGhlIGRpZ19wb3J0LgoK djI6IFJlYmFzZSBkdWUgdG8gRERJIGNoYW5nZXMKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBTaGFzaGFu ayBTaGFybWEgPHNoYXNoYW5rLnNoYXJtYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMgIHwgMjIgKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggIHwgMjEgKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaGRtaS5jIHwgNjYgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t CiAzIGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDUzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggZmRmYzMxNC4uNTU0ZDNjZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGRpLmMKQEAgLTIxNTUsMTIgKzIxNTUsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxf ZGRpX3ByZV9lbmFibGVfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkg ICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSwKIAkJCQkg ICAgICBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCkKIHsKLQlzdHJ1Y3QgaW50ZWxfaGRt aSAqaW50ZWxfaGRtaSA9IGVuY190b19pbnRlbF9oZG1pKCZlbmNvZGVyLT5iYXNlKTsKKwlzdHJ1 Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGVuY190b19kaWdfcG9ydCgmZW5jb2Rl ci0+YmFzZSk7CisJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSAmZGlnX3BvcnQtPmhk bWk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVy LT5iYXNlLmRldik7Ci0Jc3RydWN0IGRybV9lbmNvZGVyICpkcm1fZW5jb2RlciA9ICZlbmNvZGVy LT5iYXNlOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5j b2Rlcik7CiAJaW50IGxldmVsID0gaW50ZWxfZGRpX2hkbWlfbGV2ZWwoZGV2X3ByaXYsIHBvcnQp OwotCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZW5jX3RvX2RpZ19wb3J0 KCZlbmNvZGVyLT5iYXNlKTsKIAogCWludGVsX2RwX2R1YWxfbW9kZV9zZXRfdG1kc19vdXRwdXQo aW50ZWxfaGRtaSwgdHJ1ZSk7CiAJaW50ZWxfZGRpX2Nsa19zZWxlY3QoZW5jb2RlciwgcGxsKTsK QEAgLTIxNzYsOSArMjE3NSw5IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2hk bWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJZWxzZSBpZiAoSVNfQ0FOTk9OTEFL RShkZXZfcHJpdikpCiAJCWNubF9kZGlfdnN3aW5nX3NlcXVlbmNlKGVuY29kZXIsIGxldmVsKTsK IAotCWludGVsX2hkbWktPnNldF9pbmZvZnJhbWVzKGRybV9lbmNvZGVyLAotCQkJCSAgIGhhc19p bmZvZnJhbWUsCi0JCQkJICAgY3J0Y19zdGF0ZSwgY29ubl9zdGF0ZSk7CisJZGlnX3BvcnQtPnNl dF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAorCQkJCSBoYXNfaW5mb2ZyYW1lLAorCQkJCSBj cnRjX3N0YXRlLCBjb25uX3N0YXRlKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZGRpX3ByZV9l bmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCkBAIC0yMjM5LDkgKzIyMzgsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICppbnRlbF9lbmNvZGVyLAogCQlpbnRlbF93YWl0X2RkaV9idWZfaWRsZShkZXZfcHJpdiwgcG9y dCk7CiAKIAlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSkgewotCQlzdHJ1Y3QgaW50ZWxf aGRtaSAqaW50ZWxfaGRtaSA9IGVuY190b19pbnRlbF9oZG1pKGVuY29kZXIpOwotCi0JCWludGVs X2hkbWktPnNldF9pbmZvZnJhbWVzKGVuY29kZXIsIGZhbHNlLAorCQlkaWdfcG9ydC0+c2V0X2lu Zm9mcmFtZXMoZW5jb2RlciwgZmFsc2UsCiAJCQkJCW9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9z dGF0ZSk7CiAJfQogCkBAIC0yNDQyLDcgKzI0MzksNyBAQCB2b2lkIGludGVsX2RkaV9nZXRfY29u ZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwog CWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IHBpcGVfY29uZmlnLT5jcHVfdHJhbnNj b2RlcjsKLQlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaTsKKwlzdHJ1Y3QgaW50ZWxfZGln aXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydDsKIAl1MzIgdGVtcCwgZmxhZ3MgPSAwOwogCiAJLyog WFhYOiBEU0kgdHJhbnNjb2RlciBwYXJhbm9pYSAqLwpAQCAtMjQ4MSw5ICsyNDc4LDEwIEBAIHZv aWQgaW50ZWxfZGRpX2dldF9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ c3dpdGNoICh0ZW1wICYgVFJBTlNfRERJX01PREVfU0VMRUNUX01BU0spIHsKIAljYXNlIFRSQU5T X0RESV9NT0RFX1NFTEVDVF9IRE1JOgogCQlwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2luayA9IHRy dWU7Ci0JCWludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaSgmZW5jb2Rlci0+YmFzZSk7CisJ CWludGVsX2RpZ19wb3J0ID0gZW5jX3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKTsKIAotCQlp ZiAoaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2VuYWJsZWQoJmVuY29kZXItPmJhc2UsIHBpcGVfY29u ZmlnKSkKKwkJaWYgKGludGVsX2RpZ19wb3J0LT5pbmZvZnJhbWVfZW5hYmxlZCgmZW5jb2Rlci0+ YmFzZSwKKwkJCQkJCSAgICAgIHBpcGVfY29uZmlnKSkKIAkJCXBpcGVfY29uZmlnLT5oYXNfaW5m b2ZyYW1lID0gdHJ1ZTsKIAogCQlpZiAoKHRlbXAgJiBUUkFOU19ERElfSERNSV9TQ1JBTUJMSU5H X01BU0spID09CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGVlMGRhZWMuLmJkZTI1NDcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05MDksMTYgKzkwOSw2IEBAIHN0cnVjdCBp bnRlbF9oZG1pIHsKIAlib29sIGhhc19hdWRpbzsKIAlib29sIHJnYl9xdWFudF9yYW5nZV9zZWxl Y3RhYmxlOwogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmF0dGFjaGVkX2Nvbm5lY3RvcjsKLQl2 b2lkICgqd3JpdGVfaW5mb2ZyYW1lKShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCi0JCQkJ Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCi0JCQkJZW51bSBoZG1p X2luZm9mcmFtZV90eXBlIHR5cGUsCi0JCQkJY29uc3Qgdm9pZCAqZnJhbWUsIHNzaXplX3QgbGVu KTsKLQl2b2lkICgqc2V0X2luZm9mcmFtZXMpKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwK LQkJCSAgICAgICBib29sIGVuYWJsZSwKLQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKLQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rv cl9zdGF0ZSAqY29ubl9zdGF0ZSk7Ci0JYm9vbCAoKmluZm9mcmFtZV9lbmFibGVkKShzdHJ1Y3Qg ZHJtX2VuY29kZXIgKmVuY29kZXIsCi0JCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcpOwogfTsKIAogc3RydWN0IGludGVsX2RwX21zdF9lbmNvZGVyOwpAQCAt MTA2OSw2ICsxMDU5LDE3IEBAIHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgewogCWJvb2wgcmVs ZWFzZV9jbDJfb3ZlcnJpZGU7CiAJdWludDhfdCBtYXhfbGFuZXM7CiAJZW51bSBpbnRlbF9kaXNw bGF5X3Bvd2VyX2RvbWFpbiBkZGlfaW9fcG93ZXJfZG9tYWluOworCisJdm9pZCAoKndyaXRlX2lu Zm9mcmFtZSkoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAorCQkJCWNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJCWVudW0gaGRtaV9pbmZvZnJhbWVfdHlw ZSB0eXBlLAorCQkJCWNvbnN0IHZvaWQgKmZyYW1lLCBzc2l6ZV90IGxlbik7CisJdm9pZCAoKnNl dF9pbmZvZnJhbWVzKShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICAgICAgYm9v bCBlbmFibGUsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5f c3RhdGUpOworCWJvb2wgKCppbmZvZnJhbWVfZW5hYmxlZCkoc3RydWN0IGRybV9lbmNvZGVyICpl bmNvZGVyLAorCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln KTsKIH07CiAKIHN0cnVjdCBpbnRlbF9kcF9tc3RfZW5jb2RlciB7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMKaW5kZXggYmFiMWM1YS4uZDE5NzNmZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hk bWkuYwpAQCAtNDM0LDcgKzQzNCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3dyaXRlX2luZm9mcmFt ZShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgIHVuaW9uIGhkbWlfaW5mb2ZyYW1lICpmcmFt ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9IGVuY190b19pbnRlbF9oZG1p KGVuY29kZXIpOworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0g ZW5jX3RvX2RpZ19wb3J0KGVuY29kZXIpOwogCXVpbnQ4X3QgYnVmZmVyW1ZJREVPX0RJUF9EQVRB X1NJWkVdOwogCXNzaXplX3QgbGVuOwogCkBAIC00NTAsNyArNDUwLDggQEAgc3RhdGljIHZvaWQg aW50ZWxfd3JpdGVfaW5mb2ZyYW1lKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIAlidWZm ZXJbM10gPSAwOwogCWxlbisrOwogCi0JaW50ZWxfaGRtaS0+d3JpdGVfaW5mb2ZyYW1lKGVuY29k ZXIsIGNydGNfc3RhdGUsIGZyYW1lLT5hbnkudHlwZSwgYnVmZmVyLCBsZW4pOworCWludGVsX2Rp Z19wb3J0LT53cml0ZV9pbmZvZnJhbWUoZW5jb2RlciwgY3J0Y19zdGF0ZSwKKwkJCQkJZnJhbWUt PmFueS50eXBlLCBidWZmZXIsIGxlbik7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfc2V0 X2F2aV9pbmZvZnJhbWUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLApAQCAtOTQ1LDYgKzk0 Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2hkbWlfZ2V0X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwKIAkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZp ZykKIHsKIAlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9IGVuY190b19pbnRlbF9oZG1p KCZlbmNvZGVyLT5iYXNlKTsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9 IGhkbWlfdG9fZGlnX3BvcnQoaW50ZWxfaGRtaSk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGVuY29kZXItPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAl1MzIgdG1wLCBmbGFncyA9IDA7CkBAIC05NjUsNyArOTY3LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfaGRtaV9nZXRfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCWlmICh0bXAgJiBIRE1JX01PREVfU0VMRUNUX0hETUkpCiAJCXBpcGVfY29uZmln LT5oYXNfaGRtaV9zaW5rID0gdHJ1ZTsKIAotCWlmIChpbnRlbF9oZG1pLT5pbmZvZnJhbWVfZW5h YmxlZCgmZW5jb2Rlci0+YmFzZSwgcGlwZV9jb25maWcpKQorCWlmIChkaWdfcG9ydC0+aW5mb2Zy YW1lX2VuYWJsZWQoJmVuY29kZXItPmJhc2UsIHBpcGVfY29uZmlnKSkKIAkJcGlwZV9jb25maWct Pmhhc19pbmZvZnJhbWUgPSB0cnVlOwogCiAJaWYgKHRtcCAmIFNEVk9fQVVESU9fRU5BQkxFKQpA QCAtMTE0Miw2ICsxMTQ0LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9oZG1pKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNv ZGVyLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7CiAJc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxf aGRtaSgmZW5jb2Rlci0+YmFzZSk7CisJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxf ZGlnX3BvcnQgPQorCQloZG1pX3RvX2RpZ19wb3J0KGludGVsX2hkbWkpOwogCXN0cnVjdCBpbnRl bF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhvbGRfY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsK IAl1MzIgdGVtcDsKIApAQCAtMTE4NCw3ICsxMTg4LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlz YWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQlpbnRlbF9zZXRfcGNo X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBQSVBFX0EsIHRydWUpOwogCX0KIAot CWludGVsX2hkbWktPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLCBmYWxzZSwgb2xkX2Ny dGNfc3RhdGUsIG9sZF9jb25uX3N0YXRlKTsKKwlpbnRlbF9kaWdfcG9ydC0+c2V0X2luZm9mcmFt ZXMoJmVuY29kZXItPmJhc2UsIGZhbHNlLAorCQkJCSAgICAgICBvbGRfY3J0Y19zdGF0ZSwgb2xk X2Nvbm5fc3RhdGUpOwogCiAJaW50ZWxfZHBfZHVhbF9tb2RlX3NldF90bWRzX291dHB1dChpbnRl bF9oZG1pLCBmYWxzZSk7CiB9CkBAIC0xNjQ1LDEzICsxNjUwLDE0IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJCQkgIHN0cnVjdCBkcm1f Y29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewotCXN0cnVjdCBpbnRlbF9oZG1pICppbnRl bF9oZG1pID0gZW5jX3RvX2ludGVsX2hkbWkoJmVuY29kZXItPmJhc2UpOworCXN0cnVjdCBpbnRl bF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0KKwkJZW5jX3RvX2RpZ19wb3J0KCZlbmNv ZGVyLT5iYXNlKTsKIAogCWludGVsX2hkbWlfcHJlcGFyZShlbmNvZGVyLCBwaXBlX2NvbmZpZyk7 CiAKLQlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcygmZW5jb2Rlci0+YmFzZSwKLQkJCQkgICBw aXBlX2NvbmZpZy0+aGFzX2luZm9mcmFtZSwKLQkJCQkgICBwaXBlX2NvbmZpZywgY29ubl9zdGF0 ZSk7CisJaW50ZWxfZGlnX3BvcnQtPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAorCQkJ CSAgICAgICBwaXBlX2NvbmZpZy0+aGFzX2luZm9mcmFtZSwKKwkJCQkgICAgICAgcGlwZV9jb25m aWcsIGNvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9pZCB2bHZfaGRtaV9wcmVfZW5hYmxlKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLApAQCAtMTY1OSw3ICsxNjY1LDYgQEAgc3RhdGlj IHZvaWQgdmx2X2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAkJCQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKIAlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9wb3J0ICpkcG9ydCA9IGVuY190b19kaWdfcG9ydCgmZW5jb2Rlci0+YmFz ZSk7Ci0Jc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkgPSAmZHBvcnQtPmhkbWk7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIApAQCAtMTY2OSw5ICsxNjc0LDkg QEAgc3RhdGljIHZvaWQgdmx2X2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAl2bHZfc2V0X3BoeV9zaWduYWxfbGV2ZWwoZW5jb2RlciwgMHgyYjI0NWY1Ziwg MHgwMDAwMjAwMCwgMHg1NTc4YjgzYSwKIAkJCQkgMHgyYjI0Nzg3OCk7CiAKLQlpbnRlbF9oZG1p LT5zZXRfaW5mb2ZyYW1lcygmZW5jb2Rlci0+YmFzZSwKLQkJCQkgICBwaXBlX2NvbmZpZy0+aGFz X2luZm9mcmFtZSwKLQkJCQkgICBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CisJZHBvcnQtPnNl dF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAorCQkJICAgICAgcGlwZV9jb25maWctPmhhc19p bmZvZnJhbWUsCisJCQkgICAgICBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CiAKIAlnNHhfZW5h YmxlX2hkbWkoZW5jb2RlciwgcGlwZV9jb25maWcsIGNvbm5fc3RhdGUpOwogCkBAIC0xNzMxLDcg KzE3MzYsNiBAQCBzdGF0aWMgdm9pZCBjaHZfaGRtaV9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyLAogCQkJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0 YXRlKQogewogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRwb3J0ID0gZW5jX3RvX2RpZ19w b3J0KCZlbmNvZGVyLT5iYXNlKTsKLQlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9ICZk cG9ydC0+aGRtaTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCkBA IC0xNzQxLDkgKzE3NDUsOSBAQCBzdGF0aWMgdm9pZCBjaHZfaGRtaV9wcmVfZW5hYmxlKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCS8qIFVzZSA4MDBtVi0wZEIgKi8KIAljaHZfc2V0 X3BoeV9zaWduYWxfbGV2ZWwoZW5jb2RlciwgMTI4LCAxMDIsIGZhbHNlKTsKIAotCWludGVsX2hk bWktPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAotCQkJCSAgIHBpcGVfY29uZmlnLT5o YXNfaW5mb2ZyYW1lLAotCQkJCSAgIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKKwlkcG9ydC0+ c2V0X2luZm9mcmFtZXMoJmVuY29kZXItPmJhc2UsCisJCQkgICAgICBwaXBlX2NvbmZpZy0+aGFz X2luZm9mcmFtZSwKKwkJCSAgICAgIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIAogCWc0eF9l bmFibGVfaGRtaShlbmNvZGVyLCBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CiAKQEAgLTE5NDEs MjUgKzE5NDUsMjUgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRl bF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCX0KIAogCWlmIChJU19WQUxMRVlWSUVX KGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQlpbnRlbF9oZG1pLT53 cml0ZV9pbmZvZnJhbWUgPSB2bHZfd3JpdGVfaW5mb2ZyYW1lOwotCQlpbnRlbF9oZG1pLT5zZXRf aW5mb2ZyYW1lcyA9IHZsdl9zZXRfaW5mb2ZyYW1lczsKLQkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1l X2VuYWJsZWQgPSB2bHZfaW5mb2ZyYW1lX2VuYWJsZWQ7CisJCWludGVsX2RpZ19wb3J0LT53cml0 ZV9pbmZvZnJhbWUgPSB2bHZfd3JpdGVfaW5mb2ZyYW1lOworCQlpbnRlbF9kaWdfcG9ydC0+c2V0 X2luZm9mcmFtZXMgPSB2bHZfc2V0X2luZm9mcmFtZXM7CisJCWludGVsX2RpZ19wb3J0LT5pbmZv ZnJhbWVfZW5hYmxlZCA9IHZsdl9pbmZvZnJhbWVfZW5hYmxlZDsKIAl9IGVsc2UgaWYgKElTX0c0 WChkZXZfcHJpdikpIHsKLQkJaW50ZWxfaGRtaS0+d3JpdGVfaW5mb2ZyYW1lID0gZzR4X3dyaXRl X2luZm9mcmFtZTsKLQkJaW50ZWxfaGRtaS0+c2V0X2luZm9mcmFtZXMgPSBnNHhfc2V0X2luZm9m cmFtZXM7Ci0JCWludGVsX2hkbWktPmluZm9mcmFtZV9lbmFibGVkID0gZzR4X2luZm9mcmFtZV9l bmFibGVkOworCQlpbnRlbF9kaWdfcG9ydC0+d3JpdGVfaW5mb2ZyYW1lID0gZzR4X3dyaXRlX2lu Zm9mcmFtZTsKKwkJaW50ZWxfZGlnX3BvcnQtPnNldF9pbmZvZnJhbWVzID0gZzR4X3NldF9pbmZv ZnJhbWVzOworCQlpbnRlbF9kaWdfcG9ydC0+aW5mb2ZyYW1lX2VuYWJsZWQgPSBnNHhfaW5mb2Zy YW1lX2VuYWJsZWQ7CiAJfSBlbHNlIGlmIChIQVNfRERJKGRldl9wcml2KSkgewotCQlpbnRlbF9o ZG1pLT53cml0ZV9pbmZvZnJhbWUgPSBoc3dfd3JpdGVfaW5mb2ZyYW1lOwotCQlpbnRlbF9oZG1p LT5zZXRfaW5mb2ZyYW1lcyA9IGhzd19zZXRfaW5mb2ZyYW1lczsKLQkJaW50ZWxfaGRtaS0+aW5m b2ZyYW1lX2VuYWJsZWQgPSBoc3dfaW5mb2ZyYW1lX2VuYWJsZWQ7CisJCWludGVsX2RpZ19wb3J0 LT53cml0ZV9pbmZvZnJhbWUgPSBoc3dfd3JpdGVfaW5mb2ZyYW1lOworCQlpbnRlbF9kaWdfcG9y dC0+c2V0X2luZm9mcmFtZXMgPSBoc3dfc2V0X2luZm9mcmFtZXM7CisJCWludGVsX2RpZ19wb3J0 LT5pbmZvZnJhbWVfZW5hYmxlZCA9IGhzd19pbmZvZnJhbWVfZW5hYmxlZDsKIAl9IGVsc2UgaWYg KEhBU19QQ0hfSUJYKGRldl9wcml2KSkgewotCQlpbnRlbF9oZG1pLT53cml0ZV9pbmZvZnJhbWUg PSBpYnhfd3JpdGVfaW5mb2ZyYW1lOwotCQlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1lcyA9IGli eF9zZXRfaW5mb2ZyYW1lczsKLQkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2VuYWJsZWQgPSBpYnhf aW5mb2ZyYW1lX2VuYWJsZWQ7CisJCWludGVsX2RpZ19wb3J0LT53cml0ZV9pbmZvZnJhbWUgPSBp Ynhfd3JpdGVfaW5mb2ZyYW1lOworCQlpbnRlbF9kaWdfcG9ydC0+c2V0X2luZm9mcmFtZXMgPSBp Ynhfc2V0X2luZm9mcmFtZXM7CisJCWludGVsX2RpZ19wb3J0LT5pbmZvZnJhbWVfZW5hYmxlZCA9 IGlieF9pbmZvZnJhbWVfZW5hYmxlZDsKIAl9IGVsc2UgewotCQlpbnRlbF9oZG1pLT53cml0ZV9p bmZvZnJhbWUgPSBjcHRfd3JpdGVfaW5mb2ZyYW1lOwotCQlpbnRlbF9oZG1pLT5zZXRfaW5mb2Zy YW1lcyA9IGNwdF9zZXRfaW5mb2ZyYW1lczsKLQkJaW50ZWxfaGRtaS0+aW5mb2ZyYW1lX2VuYWJs ZWQgPSBjcHRfaW5mb2ZyYW1lX2VuYWJsZWQ7CisJCWludGVsX2RpZ19wb3J0LT53cml0ZV9pbmZv ZnJhbWUgPSBjcHRfd3JpdGVfaW5mb2ZyYW1lOworCQlpbnRlbF9kaWdfcG9ydC0+c2V0X2luZm9m cmFtZXMgPSBjcHRfc2V0X2luZm9mcmFtZXM7CisJCWludGVsX2RpZ19wb3J0LT5pbmZvZnJhbWVf ZW5hYmxlZCA9IGNwdF9pbmZvZnJhbWVfZW5hYmxlZDsKIAl9CiAKIAlpZiAoSEFTX0RESShkZXZf cHJpdikpCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==