From: Abhay Kumar Subject: [PATCH v5] drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled Date: Tue, 19 Jun 2018 15:01:11 -0700 Message-ID: <1529445671-6159-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 F413B6E617 for ; Tue, 19 Jun 2018 22:02:58 +0000 (UTC) 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@intel.com Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNE Q0xLIGhhcyB0byBiZSBhdCBsZWFzdCB0d2ljZSB0aGUgQkxDSyByZWdhcmRsZXNzIG9mIGF1ZGlv LiBBdWRpbwpkcml2ZXIgaGFzIHRvIHByb2JlIHVzaW5nIHRoaXMgaG9vayBhbmQgaW5jcmVhc2Ug dGhlIGNsb2NrIGV2ZW4gaW4KYWJzZW5jZSBvZiBhbnkgZGlzcGxheS4KCnYyOiBVc2UgYXRvbWlj IHJlZmNvdW50IGZvciBnZXRfcG93ZXIsIHB1dF9wb3dlciBzbyB0aGF0IHdlIGNhbgogICAgY2Fs bCBlYWNoIG9uY2UoQWJoYXkpLgp2MzogUmVzZXQgcG93ZXIgd2VsbCAyIHRvIGF2b2lkIGFueSB0 cmFuc2FjdGlvbiBvbiBpRGlzcCBsaW5rCiAgICBkdXJpbmcgY2RjbGsgY2hhbmdlKEFiaGF5KS4K djQ6IFJlbW92ZSBQb3dlciB3ZWxsIDIgcmVzZXQgd29ya2Fyb3VuZChWaWxsZSkuCnY1OiBSZW1v dmUgdW53YW50ZWQgUG93ZXIgd2VsbCAyIHJlZ2lzdGVyIGRlZmluZWQgaW4gdjQoQWJoYXkpLgoK U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQWJoYXkgS3VtYXIgPGFiaGF5Lmt1bWFyQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMyArKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyAgIHwgNjcgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jICAgfCAy OSArKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAgNyArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArKwog NSBmaWxlcyBjaGFuZ2VkLCA4MyBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCA2MTA0ZDcxMTUwNTQuLmE0YTM4NmE1ZGI2OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNzAyLDYgKzE3MDIsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSB7CiAJdW5zaWduZWQgaW50IGhwbGxfZnJlcTsKIAl1bnNpZ25lZCBpbnQgZmRpX3Bs bF9mcmVxOwogCXVuc2lnbmVkIGludCBjemNsa19mcmVxOworCXUzMiBnZXRfcHV0X3JlZmNvdW50 OwogCiAJc3RydWN0IHsKIAkJLyoKQEAgLTE3MTksNiArMTcyMCw4IEBAIHN0cnVjdCBkcm1faTkx NV9wcml2YXRlIHsKIAkJc3RydWN0IGludGVsX2NkY2xrX3N0YXRlIGFjdHVhbDsKIAkJLyogVGhl IGN1cnJlbnQgaGFyZHdhcmUgY2RjbGsgc3RhdGUgKi8KIAkJc3RydWN0IGludGVsX2NkY2xrX3N0 YXRlIGh3OworCisJCWludCBmb3JjZV9taW5fY2RjbGs7CiAJfSBjZGNsazsKIAogCS8qKgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKaW5kZXggM2VhNTY2Zjk5NDUwLi5jYThmMDRjN2NiYjMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwpAQCAtNjE4LDcgKzYxOCw2IEBAIHZvaWQg aW50ZWxfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog CiAJaWYgKCFjb25uZWN0b3ItPmVsZFswXSkKIAkJcmV0dXJuOwotCiAJRFJNX0RFQlVHX0RSSVZF UigiRUxEIG9uIFtDT05ORUNUT1I6JWQ6JXNdLCBbRU5DT0RFUjolZDolc11cbiIsCiAJCQkgY29u bmVjdG9yLT5iYXNlLmlkLAogCQkJIGNvbm5lY3Rvci0+bmFtZSwKQEAgLTcxMywxNCArNzEyLDc0 IEBAIHZvaWQgaW50ZWxfaW5pdF9hdWRpb19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJfQogfQogCitzdGF0aWMgdm9pZCBnbGtfZm9yY2VfYXVkaW9fY2RjbGsoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCWJvb2wgZW5hYmxlKQoreworCXN0 cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CisJc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlOworCWludCByZXQ7CisKKwlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwg MCk7CisJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKCZkZXZfcHJpdi0+ZHJtKTsKKwlp ZiAoV0FSTl9PTighc3RhdGUpKQorCQlyZXR1cm47CisKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSAm Y3R4OworCityZXRyeToKKwl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5tb2Rlc2V0ID0g dHJ1ZTsKKwl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5jZGNsay5mb3JjZV9taW5fY2Rj bGsgPQorCQllbmFibGUgPyAyICogOTYwMDAgOiAwOworCisJLyoKKwkgKiBQcm90ZWN0cyBkZXZf cHJpdi0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrCisJICogTmVlZCB0byBsb2NrIHRoaXMgaGVyZSBp biBjYXNlIHdlIGhhdmUgbm8gYWN0aXZlIHBpcGVzCisJICogYW5kIHRodXMgd291bGRuJ3QgbG9j ayBpdCBkdXJpbmcgdGhlIGNvbW1pdCBvdGhlcndpc2UuCisJICovCisJcmV0ID0gZHJtX21vZGVz ZXRfbG9jaygmZGV2X3ByaXYtPmRybS5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCAmY3R4 KTsKKwlpZiAoIXJldCkKKwkJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCisJaWYg KHJldCA9PSAtRURFQURMSykgeworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKKwkJ ZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlXQVJOX09O KHJldCk7CisKKwlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9k cm9wX2xvY2tzKCZjdHgpOworCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKK30KKwog c3RhdGljIHZvaWQgaTkxNV9hdWRpb19jb21wb25lbnRfZ2V0X3Bvd2VyKHN0cnVjdCBkZXZpY2Ug KmtkZXYpCiB7Ci0JaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoa2Rldl90b19pOTE1KGtkZXYpLCBQ T1dFUl9ET01BSU5fQVVESU8pOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGtkZXZfdG9faTkxNShrZGV2KTsKKworCWRldl9wcml2LT5nZXRfcHV0X3JlZmNvdW50Kys7CisK KwkvKiBGb3JjZSBjZGNsayB0byAyKkJDTEsgZHVyaW5nIGZpcnN0IHRpbWUgZ2V0IHBvd2VyIGNh bGwgKi8KKwlpZiAoZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQgPT0gMSkKKwkJaWYgKElTX0NB Tk5PTkxBS0UoZGV2X3ByaXYpIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQkJZ2xrX2Zv cmNlX2F1ZGlvX2NkY2xrKGRldl9wcml2LCB0cnVlKTsKKworCWludGVsX2Rpc3BsYXlfcG93ZXJf Z2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fQVVESU8pOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1 X2F1ZGlvX2NvbXBvbmVudF9wdXRfcG93ZXIoc3RydWN0IGRldmljZSAqa2RldikKIHsKLQlpbnRl bF9kaXNwbGF5X3Bvd2VyX3B1dChrZGV2X3RvX2k5MTUoa2RldiksIFBPV0VSX0RPTUFJTl9BVURJ Tyk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19pOTE1KGtk ZXYpOworCisJZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQtLTsKKworCS8qIEZvcmNlIHJlcXVp cmVkIGNkY2xrIGR1cmluZyBsYXN0IHRpbWUgcHV0IHBvd2VyIGNhbGwgKi8KKwlpZiAoZGV2X3By aXYtPmdldF9wdXRfcmVmY291bnQgPT0gMCkKKwkJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYp IHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQkJZ2xrX2ZvcmNlX2F1ZGlvX2NkY2xrKGRl dl9wcml2LCBmYWxzZSk7CisKKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgUE9X RVJfRE9NQUlOX0FVRElPKTsKIH0KIAogc3RhdGljIHZvaWQgaTkxNV9hdWRpb19jb21wb25lbnRf Y29kZWNfd2FrZV9vdmVycmlkZShzdHJ1Y3QgZGV2aWNlICprZGV2LApAQCAtOTU5LDcgKzEwMTgs NyBAQCB2b2lkIGk5MTVfYXVkaW9fY29tcG9uZW50X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCQkvKiBjb250aW51ZSB3aXRoIHJlZHVjZWQgZnVuY3Rpb25hbGl0eSAq LwogCQlyZXR1cm47CiAJfQotCisJZGV2X3ByaXYtPmdldF9wdXRfcmVmY291bnQgPSAwOwogCWRl dl9wcml2LT5hdWRpb19jb21wb25lbnRfcmVnaXN0ZXJlZCA9IHRydWU7CiB9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDhlZDdiZDA1MmU0Ni4uMGYwYWVhOTAwY2ViIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKQEAgLTIxNTMsMTkgKzIxNTMsOCBAQCBpbnQgaW50 ZWxfY3J0Y19jb21wdXRlX21pbl9jZGNsayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSkKIAkvKgogCSAqIEFjY29yZGluZyB0byBCU3BlYywgIlRoZSBDRCBjbG9jayBm cmVxdWVuY3kgbXVzdCBiZSBhdCBsZWFzdCB0d2ljZQogCSAqIHRoZSBmcmVxdWVuY3kgb2YgdGhl IEF6YWxpYSBCQ0xLLiIgYW5kIEJDTEsgaXMgOTYgTUh6IGJ5IGRlZmF1bHQuCi0JICoKLQkgKiBG SVhNRTogQ2hlY2sgdGhlIGFjdHVhbCwgbm90IGRlZmF1bHQsIEJDTEsgYmVpbmcgdXNlZC4KLQkg KgotCSAqIEZJWE1FOiBUaGlzIGRvZXMgbm90IGRlcGVuZCBvbiAtPmhhc19hdWRpbyBiZWNhdXNl IHRoZSBoaWdoZXIgQ0RDTEsKLQkgKiBpcyByZXF1aXJlZCBmb3IgYXVkaW8gcHJvYmUsIGFsc28g d2hlbiB0aGVyZSBhcmUgbm8gYXVkaW8gY2FwYWJsZQotCSAqIGRpc3BsYXlzIGNvbm5lY3RlZCBh dCBwcm9iZSB0aW1lLiBUaGlzIGxlYWRzIHRvIHVubmVjZXNzYXJpbHkgaGlnaAotCSAqIENEQ0xL IHdoZW4gYXVkaW8gaXMgbm90IHJlcXVpcmVkLgotCSAqCi0JICogRklYTUU6IFRoaXMgbGltaXQg aXMgb25seSBhcHBsaWVkIHdoZW4gdGhlcmUgYXJlIGRpc3BsYXlzIGNvbm5lY3RlZAotCSAqIGF0 IHByb2JlIHRpbWUuIElmIHdlIHByb2JlIHdpdGhvdXQgZGlzcGxheXMsIHdlJ2xsIHN0aWxsIGVu ZCB1cCB1c2luZwotCSAqIHRoZSBwbGF0Zm9ybSBtaW5pbXVtIENEQ0xLLCBmYWlsaW5nIGF1ZGlv IHByb2JlLgogCSAqLwotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJaWYgKGNydGNf c3RhdGUtPmhhc19hdWRpbyAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCW1pbl9jZGNs ayA9IG1heCgyICogOTYwMDAsIG1pbl9jZGNsayk7CiAKIAkvKgpAQCAtMjIwNSw3ICsyMTk0LDcg QEAgc3RhdGljIGludCBpbnRlbF9jb21wdXRlX21pbl9jZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpCiAJCWludGVsX3N0YXRlLT5taW5fY2RjbGtbaV0gPSBtaW5fY2RjbGs7CiAJ fQogCi0JbWluX2NkY2xrID0gMDsKKwltaW5fY2RjbGsgPSBpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9y Y2VfbWluX2NkY2xrOwogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpCiAJCW1pbl9jZGNs ayA9IG1heChpbnRlbF9zdGF0ZS0+bWluX2NkY2xrW3BpcGVdLCBtaW5fY2RjbGspOwogCkBAIC0y MjY2LDcgKzIyNTUsNyBAQCBzdGF0aWMgaW50IHZsdl9tb2Rlc2V0X2NhbGNfY2RjbGsoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQl2bHZfY2FsY192b2x0YWdlX2xldmVsKGRldl9w cml2LCBjZGNsayk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2Rj bGsgPSB2bHZfY2FsY19jZGNsayhkZXZfcHJpdiwgMCk7CisJCWNkY2xrID0gdmx2X2NhbGNfY2Rj bGsoZGV2X3ByaXYsIGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwogCiAJCWlu dGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKIAkJaW50ZWxfc3RhdGUtPmNk Y2xrLmFjdHVhbC52b2x0YWdlX2xldmVsID0KQEAgLTIyOTksNyArMjI4OCw3IEBAIHN0YXRpYyBp bnQgYmR3X21vZGVzZXRfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUp CiAJCWJkd19jYWxjX3ZvbHRhZ2VfbGV2ZWwoY2RjbGspOwogCiAJaWYgKCFpbnRlbF9zdGF0ZS0+ YWN0aXZlX2NydGNzKSB7Ci0JCWNkY2xrID0gYmR3X2NhbGNfY2RjbGsoMCk7CisJCWNkY2xrID0g YmR3X2NhbGNfY2RjbGsoaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsayk7CiAKIAkJ aW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9IGNkY2xrOwogCQlpbnRlbF9zdGF0ZS0+ Y2RjbGsuYWN0dWFsLnZvbHRhZ2VfbGV2ZWwgPQpAQCAtMjM3MSw3ICsyMzYwLDcgQEAgc3RhdGlj IGludCBza2xfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIAkJc2tsX2NhbGNfdm9sdGFnZV9sZXZlbChjZGNsayk7CiAKIAlpZiAoIWludGVsX3N0YXRl LT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBza2xfY2FsY19jZGNsaygwLCB2Y28pOworCQlj ZGNsayA9IHNrbF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGss IHZjbyk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52Y28gPSB2Y287CiAJCWludGVs X3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKQEAgLTI0MTAsMTAgKzIzOTksMTAg QEAgc3RhdGljIGludCBieHRfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykgewogCQlpZiAo SVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKLQkJCWNkY2xrID0gZ2xrX2NhbGNfY2RjbGsoMCk7 CisJCQkgY2RjbGsgPSBnbGtfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWlu X2NkY2xrKTsKIAkJCXZjbyA9IGdsa19kZV9wbGxfdmNvKGRldl9wcml2LCBjZGNsayk7CiAJCX0g ZWxzZSB7Ci0JCQljZGNsayA9IGJ4dF9jYWxjX2NkY2xrKDApOworCQkJY2RjbGsgPSBieHRfY2Fs Y19jZGNsayhpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrKTsKIAkJCXZjbyA9IGJ4 dF9kZV9wbGxfdmNvKGRldl9wcml2LCBjZGNsayk7CiAJCX0KIApAQCAtMjQ0OSw3ICsyNDM4LDcg QEAgc3RhdGljIGludCBjbmxfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKIAkJICAgIGNubF9jb21wdXRlX21pbl92b2x0YWdlX2xldmVsKGludGVsX3N0 YXRlKSk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBj bmxfY2FsY19jZGNsaygwKTsKKwkJY2RjbGsgPSBjbmxfY2FsY19jZGNsayhpbnRlbF9zdGF0ZS0+ Y2RjbGsuZm9yY2VfbWluX2NkY2xrKTsKIAkJdmNvID0gY25sX2NkY2xrX3BsbF92Y28oZGV2X3By aXYsIGNkY2xrKTsKIAogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZjbyA9IHZjbzsKQEAg LTI0ODIsNyArMjQ3MSw3IEBAIHN0YXRpYyBpbnQgaWNsX21vZGVzZXRfY2FsY19jZGNsayhzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwu Y2RjbGsgPSBjZGNsazsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcykgewotCQlj ZGNsayA9IGljbF9jYWxjX2NkY2xrKDAsIHJlZik7CisJCWNkY2xrID0gaWNsX2NhbGNfY2RjbGso aW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsaywgcmVmKTsKIAkJdmNvID0gaWNsX2Nh bGNfY2RjbGtfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGspOwogCiAJCWludGVsX3N0YXRlLT5jZGNs ay5hY3R1YWwudmNvID0gdmNvOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDE3YzU5MGI0MmZkNy4uM2VlMWMxZjU0MTlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0xMjE2Miw2ICsxMjE2MiwxMCBAQCBzdGF0aWMgaW50IGludGVsX21vZGVzZXRf Y2hlY2tzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJcmV0dXJuIC1FSU5WQUw7 CiAJfQogCisJLyoga2VlcCB0aGUgY3VycmVudCBzZXR0aW5nICovCisJaWYgKCFpbnRlbF9zdGF0 ZS0+bW9kZXNldCkKKwkJaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsayA9IGRldl9w cml2LT5jZGNsay5mb3JjZV9taW5fY2RjbGs7CisKIAlpbnRlbF9zdGF0ZS0+bW9kZXNldCA9IHRy dWU7CiAJaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVfY3J0Y3M7 CiAJaW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwgPSBkZXZfcHJpdi0+Y2RjbGsubG9naWNhbDsK QEAgLTEyMjU3LDcgKzEyMjYxLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRy bV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKmNydGNfc3RhdGU7CiAJaW50IHJldCwgaTsK LQlib29sIGFueV9tcyA9IGZhbHNlOworCWJvb2wgYW55X21zID0gaW50ZWxfc3RhdGUtPm1vZGVz ZXQ7CiAKIAkvKiBDYXRjaCBJOTE1X01PREVfRkxBR19JTkhFUklURUQgKi8KIAlmb3JfZWFjaF9v bGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsCkBAIC0xMjgw NSw2ICsxMjgwOSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQlkZXZfcHJpdi0+YWN0aXZlX2NydGNzID0gaW50ZWxfc3RhdGUtPmFj dGl2ZV9jcnRjczsKIAkJZGV2X3ByaXYtPmNkY2xrLmxvZ2ljYWwgPSBpbnRlbF9zdGF0ZS0+Y2Rj bGsubG9naWNhbDsKIAkJZGV2X3ByaXYtPmNkY2xrLmFjdHVhbCA9IGludGVsX3N0YXRlLT5jZGNs ay5hY3R1YWw7CisJCWRldl9wcml2LT5jZGNsay5mb3JjZV9taW5fY2RjbGsgPSBpbnRlbF9zdGF0 ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrOwogCX0KIAogCWRybV9hdG9taWNfc3RhdGVfZ2V0KHN0 YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODY0MTU4Mzg0MmJlLi4wZGExN2Fk MDU2ZWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00NTksNiArNDU5LDggQEAgc3Ry dWN0IGludGVsX2F0b21pY19zdGF0ZSB7CiAJCSAqIHN0YXRlIG9ubHkgd2hlbiBhbGwgY3J0Yydz IGFyZSBEUE1TIG9mZi4KIAkJICovCiAJCXN0cnVjdCBpbnRlbF9jZGNsa19zdGF0ZSBhY3R1YWw7 CisKKwkJaW50IGZvcmNlX21pbl9jZGNsazsKIAl9IGNkY2xrOwogCiAJYm9vbCBkcGxsX3NldCwg bW9kZXNldDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK