From: Abhay Kumar Subject: [PATCH v2] drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled Date: Wed, 9 May 2018 18:25:32 -0700 Message-ID: <1525915532-4443-1-git-send-email-abhay.kumar@intel.com> References: <1525034353-4675-1-git-send-email-abhay.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id E83EE89A0E for ; Thu, 10 May 2018 01:27:03 +0000 (UTC) In-Reply-To: <1525034353-4675-1-git-send-email-abhay.kumar@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@intel.com Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNE Q0xLIGhhcyB0byBiZSBhdCBsZWFzdCB0d2ljZSB0aGUgQkxDSyByZWdhcmRsZXNzIG9mIGF1ZGlv LiBBdWRpbwpkcml2ZXIgaGFzIHRvIHByb2JlIHVzaW5nIHRoaXMgaG9vayBhbmQgaW5jcmVhc2Ug dGhlIGNsb2NrIGV2ZW4gaW4KYWJzZW5jZSBvZiBhbnkgZGlzcGxheS4KCnYyOiBVc2UgYXRvbWlj IHJlZmNvdW50IGZvciBnZXRfcG93ZXIsIHB1dF9wb3dlciBzbyB0aGF0IHdlIGNhbgogICAgY2Fs bCBlYWNoIG9uY2UoQWJoYXkpLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWJoYXkgS3VtYXIgPGFi aGF5Lmt1bWFyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyAgIHwgNjYg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jICAgfCAyOSArKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgNyArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgfCAgMiArKwogNSBmaWxlcyBjaGFuZ2VkLCA4MiBpbnNlcnRpb25zKCspLCAy NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyNGM1ZTQ3NjVhZmQu LjljNGVhNzY3Njg4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNjkyLDYgKzE2OTIs NyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJdW5zaWduZWQgaW50IGhwbGxfZnJlcTsK IAl1bnNpZ25lZCBpbnQgZmRpX3BsbF9mcmVxOwogCXVuc2lnbmVkIGludCBjemNsa19mcmVxOwor CWF0b21pY190IGdldF9wdXRfcmVmY291bnQ7CiAKIAlzdHJ1Y3QgewogCQkvKgpAQCAtMTcwOSw2 ICsxNzEwLDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCQlzdHJ1Y3QgaW50ZWxfY2Rj bGtfc3RhdGUgYWN0dWFsOwogCQkvKiBUaGUgY3VycmVudCBoYXJkd2FyZSBjZGNsayBzdGF0ZSAq LwogCQlzdHJ1Y3QgaW50ZWxfY2RjbGtfc3RhdGUgaHc7CisKKwkJaW50IGZvcmNlX21pbl9jZGNs azsKIAl9IGNkY2xrOwogCiAJLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdWRpby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwppbmRleCAz ZWE1NjZmOTk0NTAuLmExZTJjNGRhYWU2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5j CkBAIC02MTgsNyArNjE4LDYgQEAgdm9pZCBpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlpZiAoIWNvbm5lY3Rvci0+ZWxkWzBdKQogCQly ZXR1cm47Ci0KIAlEUk1fREVCVUdfRFJJVkVSKCJFTEQgb24gW0NPTk5FQ1RPUjolZDolc10sIFtF TkNPREVSOiVkOiVzXVxuIiwKIAkJCSBjb25uZWN0b3ItPmJhc2UuaWQsCiAJCQkgY29ubmVjdG9y LT5uYW1lLApAQCAtNzEzLDE0ICs3MTIsNzMgQEAgdm9pZCBpbnRlbF9pbml0X2F1ZGlvX2hvb2tz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiB9CiAKK3N0YXRpYyB2b2lk IGdsa19mb3JjZV9hdWRpb19jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CisJCQkJYm9vbCBlbmFibGUpCit7CisJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0 eDsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CisJaW50IHJldDsKKworCWRybV9t b2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVf YWxsb2MoJmRldl9wcml2LT5kcm0pOworCWlmIChXQVJOX09OKCFzdGF0ZSkpCisJCXJldHVybjsK KworCXN0YXRlLT5hY3F1aXJlX2N0eCA9ICZjdHg7CisKK3JldHJ5OgorCXRvX2ludGVsX2F0b21p Y19zdGF0ZShzdGF0ZSktPm1vZGVzZXQgPSB0cnVlOworCXRvX2ludGVsX2F0b21pY19zdGF0ZShz dGF0ZSktPmNkY2xrLmZvcmNlX21pbl9jZGNsayA9CisJCWVuYWJsZSA/IDIgKiA5NjAwMCA6IDA7 CisKKwkvKgorCSAqIFByb3RlY3RzIGRldl9wcml2LT5jZGNsay5mb3JjZV9taW5fY2RjbGsKKwkg KiBOZWVkIHRvIGxvY2sgdGhpcyBoZXJlIGluIGNhc2Ugd2UgaGF2ZSBubyBhY3RpdmUgcGlwZXMK KwkgKiBhbmQgdGh1cyB3b3VsZG4ndCBsb2NrIGl0IGR1cmluZyB0aGUgY29tbWl0IG90aGVyd2lz ZS4KKwkgKi8KKwlyZXQgPSBkcm1fbW9kZXNldF9sb2NrKCZkZXZfcHJpdi0+ZHJtLm1vZGVfY29u ZmlnLmNvbm5lY3Rpb25fbXV0ZXgsICZjdHgpOworCWlmICghcmV0KQorCQlyZXQgPSBkcm1fYXRv bWljX2NvbW1pdChzdGF0ZSk7CisKKwlpZiAocmV0ID09IC1FREVBRExLKSB7CisJCWRybV9hdG9t aWNfc3RhdGVfY2xlYXIoc3RhdGUpOworCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOworCQln b3RvIHJldHJ5OworCX0KKworCVdBUk5fT04ocmV0KTsKKworCWRybV9hdG9taWNfc3RhdGVfcHV0 KHN0YXRlKTsKKworCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CisJZHJtX21vZGVzZXRf YWNxdWlyZV9maW5pKCZjdHgpOworfQorCiBzdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVu dF9nZXRfcG93ZXIoc3RydWN0IGRldmljZSAqa2RldikKIHsKLQlpbnRlbF9kaXNwbGF5X3Bvd2Vy X2dldChrZGV2X3RvX2k5MTUoa2RldiksIFBPV0VSX0RPTUFJTl9BVURJTyk7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19pOTE1KGtkZXYpOworCisJaW50ZWxf ZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9BVURJTyk7CisJYXRvbWlj X2luYygmZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQpOworCisJLyogRm9yY2UgY2RjbGsgdG8g MipCQ0xLIGR1cmluZyBmaXJzdCB0aW1lIGdldCBwb3dlciBjYWxsICovCisJaWYgKGF0b21pY19y ZWFkKCZkZXZfcHJpdi0+Z2V0X3B1dF9yZWZjb3VudCkgPT0gMSkKKwkJaWYgKElTX0NBTk5PTkxB S0UoZGV2X3ByaXYpIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQkJZ2xrX2ZvcmNlX2F1 ZGlvX2NkY2xrKGRldl9wcml2LCB0cnVlKTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9hdWRpb19j b21wb25lbnRfcHV0X3Bvd2VyKHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7Ci0JaW50ZWxfZGlzcGxh eV9wb3dlcl9wdXQoa2Rldl90b19pOTE1KGtkZXYpLCBQT1dFUl9ET01BSU5fQVVESU8pOworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGtkZXZfdG9faTkxNShrZGV2KTsKKwor CWF0b21pY19kZWMoJmRldl9wcml2LT5nZXRfcHV0X3JlZmNvdW50KTsKKworCS8qIEZvcmNlIHJl cXVpcmVkIGNkY2xrIGR1cmluZyBsYXN0IHRpbWUgcHV0IHBvd2VyIGNhbGwgKi8KKwlpZiAoYXRv bWljX3JlYWQoJmRldl9wcml2LT5nZXRfcHV0X3JlZmNvdW50KSA9PSAwKQorCQlpZiAoSVNfQ0FO Tk9OTEFLRShkZXZfcHJpdikgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCQlnbGtfZm9y Y2VfYXVkaW9fY2RjbGsoZGV2X3ByaXYsIGZhbHNlKTsKKworCWludGVsX2Rpc3BsYXlfcG93ZXJf cHV0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fQVVESU8pOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1 X2F1ZGlvX2NvbXBvbmVudF9jb2RlY193YWtlX292ZXJyaWRlKHN0cnVjdCBkZXZpY2UgKmtkZXYs CkBAIC05NTksNyArMTAxNyw3IEBAIHZvaWQgaTkxNV9hdWRpb19jb21wb25lbnRfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCS8qIGNvbnRpbnVlIHdpdGggcmVkdWNl ZCBmdW5jdGlvbmFsaXR5ICovCiAJCXJldHVybjsKIAl9Ci0KKwlhdG9taWNfc2V0KCZkZXZfcHJp di0+Z2V0X3B1dF9yZWZjb3VudCwgMCk7CiAJZGV2X3ByaXYtPmF1ZGlvX2NvbXBvbmVudF9yZWdp c3RlcmVkID0gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY2RjbGsuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKaW5kZXggNzA0 ZGRiNGQzY2E3Li5hMGMyODFhOTBmZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2NkY2xrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwpA QCAtMjE0MywxOSArMjE0Myw4IEBAIGludCBpbnRlbF9jcnRjX2NvbXB1dGVfbWluX2NkY2xrKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCS8qCiAJICogQWNjb3Jk aW5nIHRvIEJTcGVjLCAiVGhlIENEIGNsb2NrIGZyZXF1ZW5jeSBtdXN0IGJlIGF0IGxlYXN0IHR3 aWNlCiAJICogdGhlIGZyZXF1ZW5jeSBvZiB0aGUgQXphbGlhIEJDTEsuIiBhbmQgQkNMSyBpcyA5 NiBNSHogYnkgZGVmYXVsdC4KLQkgKgotCSAqIEZJWE1FOiBDaGVjayB0aGUgYWN0dWFsLCBub3Qg ZGVmYXVsdCwgQkNMSyBiZWluZyB1c2VkLgotCSAqCi0JICogRklYTUU6IFRoaXMgZG9lcyBub3Qg ZGVwZW5kIG9uIC0+aGFzX2F1ZGlvIGJlY2F1c2UgdGhlIGhpZ2hlciBDRENMSwotCSAqIGlzIHJl cXVpcmVkIGZvciBhdWRpbyBwcm9iZSwgYWxzbyB3aGVuIHRoZXJlIGFyZSBubyBhdWRpbyBjYXBh YmxlCi0JICogZGlzcGxheXMgY29ubmVjdGVkIGF0IHByb2JlIHRpbWUuIFRoaXMgbGVhZHMgdG8g dW5uZWNlc3NhcmlseSBoaWdoCi0JICogQ0RDTEsgd2hlbiBhdWRpbyBpcyBub3QgcmVxdWlyZWQu Ci0JICoKLQkgKiBGSVhNRTogVGhpcyBsaW1pdCBpcyBvbmx5IGFwcGxpZWQgd2hlbiB0aGVyZSBh cmUgZGlzcGxheXMgY29ubmVjdGVkCi0JICogYXQgcHJvYmUgdGltZS4gSWYgd2UgcHJvYmUgd2l0 aG91dCBkaXNwbGF5cywgd2UnbGwgc3RpbGwgZW5kIHVwIHVzaW5nCi0JICogdGhlIHBsYXRmb3Jt IG1pbmltdW0gQ0RDTEssIGZhaWxpbmcgYXVkaW8gcHJvYmUuCiAJICovCi0JaWYgKElOVEVMX0dF TihkZXZfcHJpdikgPj0gOSkKKwlpZiAoY3J0Y19zdGF0ZS0+aGFzX2F1ZGlvICYmIElOVEVMX0dF TihkZXZfcHJpdikgPj0gOSkKIAkJbWluX2NkY2xrID0gbWF4KDIgKiA5NjAwMCwgbWluX2NkY2xr KTsKIAogCS8qCkBAIC0yMTk1LDcgKzIxODQsNyBAQCBzdGF0aWMgaW50IGludGVsX2NvbXB1dGVf bWluX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaW50ZWxfc3RhdGUt Pm1pbl9jZGNsa1tpXSA9IG1pbl9jZGNsazsKIAl9CiAKLQltaW5fY2RjbGsgPSAwOworCW1pbl9j ZGNsayA9IGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGs7CiAJZm9yX2VhY2hfcGlw ZShkZXZfcHJpdiwgcGlwZSkKIAkJbWluX2NkY2xrID0gbWF4KGludGVsX3N0YXRlLT5taW5fY2Rj bGtbcGlwZV0sIG1pbl9jZGNsayk7CiAKQEAgLTIyNTYsNyArMjI0NSw3IEBAIHN0YXRpYyBpbnQg dmx2X21vZGVzZXRfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJ CXZsdl9jYWxjX3ZvbHRhZ2VfbGV2ZWwoZGV2X3ByaXYsIGNkY2xrKTsKIAogCWlmICghaW50ZWxf c3RhdGUtPmFjdGl2ZV9jcnRjcykgewotCQljZGNsayA9IHZsdl9jYWxjX2NkY2xrKGRldl9wcml2 LCAwKTsKKwkJY2RjbGsgPSB2bHZfY2FsY19jZGNsayhkZXZfcHJpdiwgaW50ZWxfc3RhdGUtPmNk Y2xrLmZvcmNlX21pbl9jZGNsayk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNs ayA9IGNkY2xrOwogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2VfbGV2ZWwgPQpA QCAtMjI4OSw3ICsyMjc4LDcgQEAgc3RhdGljIGludCBiZHdfbW9kZXNldF9jYWxjX2NkY2xrKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJYmR3X2NhbGNfdm9sdGFnZV9sZXZlbChj ZGNsayk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBi ZHdfY2FsY19jZGNsaygwKTsKKwkJY2RjbGsgPSBiZHdfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+ Y2RjbGsuZm9yY2VfbWluX2NkY2xrKTsKIAogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLmNk Y2xrID0gY2RjbGs7CiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwudm9sdGFnZV9sZXZlbCA9 CkBAIC0yMzYxLDcgKzIzNTAsNyBAQCBzdGF0aWMgaW50IHNrbF9tb2Rlc2V0X2NhbGNfY2RjbGso c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlza2xfY2FsY192b2x0YWdlX2xldmVs KGNkY2xrKTsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykgewotCQljZGNsayA9 IHNrbF9jYWxjX2NkY2xrKDAsIHZjbyk7CisJCWNkY2xrID0gc2tsX2NhbGNfY2RjbGsoaW50ZWxf c3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsaywgdmNvKTsKIAogCQlpbnRlbF9zdGF0ZS0+Y2Rj bGsuYWN0dWFsLnZjbyA9IHZjbzsKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9 IGNkY2xrOwpAQCAtMjQwMCwxMCArMjM4OSwxMCBAQCBzdGF0aWMgaW50IGJ4dF9tb2Rlc2V0X2Nh bGNfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJaWYgKCFpbnRlbF9z dGF0ZS0+YWN0aXZlX2NydGNzKSB7CiAJCWlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewot CQkJY2RjbGsgPSBnbGtfY2FsY19jZGNsaygwKTsKKwkJCSBjZGNsayA9IGdsa19jYWxjX2NkY2xr KGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwogCQkJdmNvID0gZ2xrX2RlX3Bs bF92Y28oZGV2X3ByaXYsIGNkY2xrKTsKIAkJfSBlbHNlIHsKLQkJCWNkY2xrID0gYnh0X2NhbGNf Y2RjbGsoMCk7CisJCQljZGNsayA9IGJ4dF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5m b3JjZV9taW5fY2RjbGspOwogCQkJdmNvID0gYnh0X2RlX3BsbF92Y28oZGV2X3ByaXYsIGNkY2xr KTsKIAkJfQogCkBAIC0yNDM5LDcgKzI0MjgsNyBAQCBzdGF0aWMgaW50IGNubF9tb2Rlc2V0X2Nh bGNfY2RjbGsoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkgICAgY25sX2NvbXB1 dGVfbWluX3ZvbHRhZ2VfbGV2ZWwoaW50ZWxfc3RhdGUpKTsKIAogCWlmICghaW50ZWxfc3RhdGUt PmFjdGl2ZV9jcnRjcykgewotCQljZGNsayA9IGNubF9jYWxjX2NkY2xrKDApOworCQljZGNsayA9 IGNubF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwogCQl2 Y28gPSBjbmxfY2RjbGtfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGspOwogCiAJCWludGVsX3N0YXRl LT5jZGNsay5hY3R1YWwudmNvID0gdmNvOwpAQCAtMjQ3Miw3ICsyNDYxLDcgQEAgc3RhdGljIGlu dCBpY2xfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlpbnRlbF9zdGF0ZS0+Y2RjbGsubG9naWNhbC5jZGNsayA9IGNkY2xrOwogCiAJaWYgKCFpbnRl bF9zdGF0ZS0+YWN0aXZlX2NydGNzKSB7Ci0JCWNkY2xrID0gaWNsX2NhbGNfY2RjbGsoMCwgcmVm KTsKKwkJY2RjbGsgPSBpY2xfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWlu X2NkY2xrLCByZWYpOwogCQl2Y28gPSBpY2xfY2FsY19jZGNsa19wbGxfdmNvKGRldl9wcml2LCBj ZGNsayk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52Y28gPSB2Y287CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggY2RmZTA5NTFkMTcxLi4wYjBlNTE5ZmU4NDQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMDQxLDYgKzEyMDQxLDEw IEBAIHN0YXRpYyBpbnQgaW50ZWxfbW9kZXNldF9jaGVja3Moc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlKQogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKKwkvKiBrZWVwIHRoZSBjdXJyZW50 IHNldHRpbmcgKi8KKwlpZiAoIWludGVsX3N0YXRlLT5tb2Rlc2V0KQorCQlpbnRlbF9zdGF0ZS0+ Y2RjbGsuZm9yY2VfbWluX2NkY2xrID0gZGV2X3ByaXYtPmNkY2xrLmZvcmNlX21pbl9jZGNsazsK KwogCWludGVsX3N0YXRlLT5tb2Rlc2V0ID0gdHJ1ZTsKIAlpbnRlbF9zdGF0ZS0+YWN0aXZlX2Ny dGNzID0gZGV2X3ByaXYtPmFjdGl2ZV9jcnRjczsKIAlpbnRlbF9zdGF0ZS0+Y2RjbGsubG9naWNh bCA9IGRldl9wcml2LT5jZGNsay5sb2dpY2FsOwpAQCAtMTIxMzYsNyArMTIxNDAsNyBAQCBzdGF0 aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVj dCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl LCAqY3J0Y19zdGF0ZTsKIAlpbnQgcmV0LCBpOwotCWJvb2wgYW55X21zID0gZmFsc2U7CisJYm9v bCBhbnlfbXMgPSBpbnRlbF9zdGF0ZS0+bW9kZXNldDsKIAogCS8qIENhdGNoIEk5MTVfTU9ERV9G TEFHX0lOSEVSSVRFRCAqLwogCWZvcl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBj cnRjLCBvbGRfY3J0Y19zdGF0ZSwKQEAgLTEyNjg0LDYgKzEyNjg4LDcgQEAgc3RhdGljIGludCBp bnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWRldl9wcml2LT5h Y3RpdmVfY3J0Y3MgPSBpbnRlbF9zdGF0ZS0+YWN0aXZlX2NydGNzOwogCQlkZXZfcHJpdi0+Y2Rj bGsubG9naWNhbCA9IGludGVsX3N0YXRlLT5jZGNsay5sb2dpY2FsOwogCQlkZXZfcHJpdi0+Y2Rj bGsuYWN0dWFsID0gaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbDsKKwkJZGV2X3ByaXYtPmNkY2xr LmZvcmNlX21pbl9jZGNsayA9IGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGs7CiAJ fQogCiAJZHJtX2F0b21pY19zdGF0ZV9nZXQoc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAppbmRleCA1MjMzN2Y0ODdlYmMuLjdiNTNmNzJkNzI0MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKQEAgLTQ2MSw2ICs0NjEsOCBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKIAkJ ICogc3RhdGUgb25seSB3aGVuIGFsbCBjcnRjJ3MgYXJlIERQTVMgb2ZmLgogCQkgKi8KIAkJc3Ry dWN0IGludGVsX2NkY2xrX3N0YXRlIGFjdHVhbDsKKworCQlpbnQgZm9yY2VfbWluX2NkY2xrOwog CX0gY2RjbGs7CiAKIAlib29sIGRwbGxfc2V0LCBtb2Rlc2V0OwotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=