From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v6 1/2] drm/i915: Force 2*96 MHz cdclk on glk/cnl when audio power is enabled Date: Mon, 18 Mar 2019 16:34:34 +0200 Message-ID: <20190318143435.1686-2-imre.deak@intel.com> References: <20190318143435.1686-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1266589823 for ; Mon, 18 Mar 2019 14:34:45 +0000 (UTC) In-Reply-To: <20190318143435.1686-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNE Q0xLIGhhcyB0byBiZSBhdCBsZWFzdCB0d2ljZSB0aGUgQkxDSyByZWdhcmRsZXNzIG9mIGF1ZGlv LiBBdWRpbwpkcml2ZXIgaGFzIHRvIHByb2JlIHVzaW5nIHRoaXMgaG9vayBhbmQgaW5jcmVhc2Ug dGhlIGNsb2NrIGV2ZW4gaW4KYWJzZW5jZSBvZiBhbnkgZGlzcGxheS4KCnYyOiBVc2UgYXRvbWlj IHJlZmNvdW50IGZvciBnZXRfcG93ZXIsIHB1dF9wb3dlciBzbyB0aGF0IHdlIGNhbgogICAgY2Fs bCBlYWNoIG9uY2UoQWJoYXkpLgp2MzogUmVzZXQgcG93ZXIgd2VsbCAyIHRvIGF2b2lkIGFueSB0 cmFuc2FjdGlvbiBvbiBpRGlzcCBsaW5rCiAgICBkdXJpbmcgY2RjbGsgY2hhbmdlKEFiaGF5KS4K djQ6IFJlbW92ZSBQb3dlciB3ZWxsIDIgcmVzZXQgd29ya2Fyb3VuZChWaWxsZSkuCnY1OiBSZW1v dmUgdW53YW50ZWQgUG93ZXIgd2VsbCAyIHJlZ2lzdGVyIGRlZmluZWQgaW4gdjQoQWJoYXkpLgp2 NjoKLSBVc2UgYSBkZWRpY2F0ZWQgZmxhZyBpbnN0ZWFkIG9mIHN0YXRlLT5tb2Rlc2V0IGZvciBt aW4gQ0RDTEsgY2hhbmdlcwotIE1ha2UgZ2V0L3B1dCBhdWRpbyBwb3dlciBkb21haW4gc3ltbWV0 cmljCi0gUmViYXNlZCBvbiB0b3Agb2YgaW50ZWxfd2FrcmVmIHRyYWNraW5nIGNoYW5nZXMuCgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBBYmhheSBLdW1hciA8YWJoYXkua3VtYXJAaW50ZWwuY29tPgpU ZXN0ZWQtYnk6IEFiaGF5IEt1bWFyIDxhYmhheS5rdW1hckBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXVkaW8uYyAgIHwgNjQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jICAgfCAzMCArKysrKystLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDkgKysrKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAzICsrCiA1IGZpbGVzIGNoYW5nZWQsIDg2 IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IGM2NWMyZTY2NDlkZi4uNmIxMGNlZTRlNzdmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK QEAgLTE2MjQsNiArMTYyNCw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJc3RydWN0 IGludGVsX2NkY2xrX3N0YXRlIGFjdHVhbDsKIAkJLyogVGhlIGN1cnJlbnQgaGFyZHdhcmUgY2Rj bGsgc3RhdGUgKi8KIAkJc3RydWN0IGludGVsX2NkY2xrX3N0YXRlIGh3OworCisJCWludCBmb3Jj ZV9taW5fY2RjbGs7CiAJfSBjZGNsazsKIAogCS8qKgpAQCAtMTc0Myw2ICsxNzQ1LDcgQEAgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgewogCSAqCiAJICovCiAJc3RydWN0IG11dGV4IGF2X211dGV4 OworCWludCBhdWRpb19wb3dlcl9yZWZjb3VudDsKIAogCXN0cnVjdCB7CiAJCXN0cnVjdCBtdXRl eCBtdXRleDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCmluZGV4IDUwMmI1N2NlNzJhYi4u NTdkNjM0Yzk0YzdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRp by5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKQEAgLTc0MSwxOCAr NzQxLDc4IEBAIHZvaWQgaW50ZWxfaW5pdF9hdWRpb19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJfQogfQogCitzdGF0aWMgdm9pZCBnbGtfZm9yY2VfYXVkaW9fY2Rj bGsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCWJvb2wgZW5hYmxlKQor eworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CisJc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlOworCWludCByZXQ7CisKKwlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQo JmN0eCwgMCk7CisJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKCZkZXZfcHJpdi0+ZHJt KTsKKwlpZiAoV0FSTl9PTighc3RhdGUpKQorCQlyZXR1cm47CisKKwlzdGF0ZS0+YWNxdWlyZV9j dHggPSAmY3R4OworCityZXRyeToKKwl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5jZGNs ay5mb3JjZV9taW5fY2RjbGtfY2hhbmdlZCA9IHRydWU7CisJdG9faW50ZWxfYXRvbWljX3N0YXRl KHN0YXRlKS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrID0KKwkJZW5hYmxlID8gMiAqIDk2MDAwIDog MDsKKworCS8qCisJICogUHJvdGVjdHMgZGV2X3ByaXYtPmNkY2xrLmZvcmNlX21pbl9jZGNsawor CSAqIE5lZWQgdG8gbG9jayB0aGlzIGhlcmUgaW4gY2FzZSB3ZSBoYXZlIG5vIGFjdGl2ZSBwaXBl cworCSAqIGFuZCB0aHVzIHdvdWxkbid0IGxvY2sgaXQgZHVyaW5nIHRoZSBjb21taXQgb3RoZXJ3 aXNlLgorCSAqLworCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmRldl9wcml2LT5kcm0ubW9kZV9j b25maWcuY29ubmVjdGlvbl9tdXRleCwKKwkJCSAgICAgICAmY3R4KTsKKwlpZiAoIXJldCkKKwkJ cmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCisJaWYgKHJldCA9PSAtRURFQURMSykg eworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKKwkJZHJtX21vZGVzZXRfYmFja29m ZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlXQVJOX09OKHJldCk7CisKKwlkcm1fYXRv bWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOwor CWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKK30KKwogc3RhdGljIHVuc2lnbmVkIGxv bmcgaTkxNV9hdWRpb19jb21wb25lbnRfZ2V0X3Bvd2VyKHN0cnVjdCBkZXZpY2UgKmtkZXYpCiB7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19pOTE1KGtkZXYp OworCWludGVsX3dha2VyZWZfdCByZXQ7CisKIAkvKiBDYXRjaCBwb3RlbnRpYWwgaW1wZWRhbmNl IG1pc21hdGNoZXMgYmVmb3JlIHRoZXkgb2NjdXIhICovCiAJQlVJTERfQlVHX09OKHNpemVvZihp bnRlbF93YWtlcmVmX3QpID4gc2l6ZW9mKHVuc2lnbmVkIGxvbmcpKTsKIAotCXJldHVybiBpbnRl bF9kaXNwbGF5X3Bvd2VyX2dldChrZGV2X3RvX2k5MTUoa2RldiksIFBPV0VSX0RPTUFJTl9BVURJ Tyk7CisJcmV0ID0gaW50ZWxfZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJ Tl9BVURJTyk7CisKKwkvKiBGb3JjZSBDRENMSyB0byAyKkJDTEsgYXMgbG9uZyBhcyB3ZSBuZWVk IGF1ZGlvIHRvIGJlIHBvd2VyZWQuICovCisJaWYgKGRldl9wcml2LT5hdWRpb19wb3dlcl9yZWZj b3VudCsrID09IDApCisJCWlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSB8fCBJU19HRU1JTklM QUtFKGRldl9wcml2KSkKKwkJCWdsa19mb3JjZV9hdWRpb19jZGNsayhkZXZfcHJpdiwgdHJ1ZSk7 CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9w dXRfcG93ZXIoc3RydWN0IGRldmljZSAqa2RldiwKIAkJCQkJICAgdW5zaWduZWQgbG9uZyBjb29r aWUpCiB7Ci0JaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoa2Rldl90b19pOTE1KGtkZXYpLCBQT1dF Ul9ET01BSU5fQVVESU8sIGNvb2tpZSk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0ga2Rldl90b19pOTE1KGtkZXYpOworCisJLyogU3RvcCBmb3JjaW5nIENEQ0xLIHRvIDIq QkNMSyBpZiBubyBuZWVkIGZvciBhdWRpbyB0byBiZSBwb3dlcmVkLiAqLworCWlmICgtLWRldl9w cml2LT5hdWRpb19wb3dlcl9yZWZjb3VudCA9PSAwKQorCQlpZiAoSVNfQ0FOTk9OTEFLRShkZXZf cHJpdikgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCQlnbGtfZm9yY2VfYXVkaW9fY2Rj bGsoZGV2X3ByaXYsIGZhbHNlKTsKKworCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9wcml2 LCBQT1dFUl9ET01BSU5fQVVESU8sIGNvb2tpZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGk5MTVfYXVk aW9fY29tcG9uZW50X2NvZGVjX3dha2Vfb3ZlcnJpZGUoc3RydWN0IGRldmljZSAqa2RldiwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCmluZGV4IDIxZmI0ZTBkNmM0ZS4uN2RjY2E4NGYzMWQx IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKQEAgLTIxODcsMTkgKzIxODcsOCBAQCBp bnQgaW50ZWxfY3J0Y19jb21wdXRlX21pbl9jZGNsayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAkvKgogCSAqIEFjY29yZGluZyB0byBCU3BlYywgIlRoZSBDRCBj bG9jayBmcmVxdWVuY3kgbXVzdCBiZSBhdCBsZWFzdCB0d2ljZQogCSAqIHRoZSBmcmVxdWVuY3kg b2YgdGhlIEF6YWxpYSBCQ0xLLiIgYW5kIEJDTEsgaXMgOTYgTUh6IGJ5IGRlZmF1bHQuCi0JICoK LQkgKiBGSVhNRTogQ2hlY2sgdGhlIGFjdHVhbCwgbm90IGRlZmF1bHQsIEJDTEsgYmVpbmcgdXNl ZC4KLQkgKgotCSAqIEZJWE1FOiBUaGlzIGRvZXMgbm90IGRlcGVuZCBvbiAtPmhhc19hdWRpbyBi ZWNhdXNlIHRoZSBoaWdoZXIgQ0RDTEsKLQkgKiBpcyByZXF1aXJlZCBmb3IgYXVkaW8gcHJvYmUs IGFsc28gd2hlbiB0aGVyZSBhcmUgbm8gYXVkaW8gY2FwYWJsZQotCSAqIGRpc3BsYXlzIGNvbm5l Y3RlZCBhdCBwcm9iZSB0aW1lLiBUaGlzIGxlYWRzIHRvIHVubmVjZXNzYXJpbHkgaGlnaAotCSAq IENEQ0xLIHdoZW4gYXVkaW8gaXMgbm90IHJlcXVpcmVkLgotCSAqCi0JICogRklYTUU6IFRoaXMg bGltaXQgaXMgb25seSBhcHBsaWVkIHdoZW4gdGhlcmUgYXJlIGRpc3BsYXlzIGNvbm5lY3RlZAot CSAqIGF0IHByb2JlIHRpbWUuIElmIHdlIHByb2JlIHdpdGhvdXQgZGlzcGxheXMsIHdlJ2xsIHN0 aWxsIGVuZCB1cCB1c2luZwotCSAqIHRoZSBwbGF0Zm9ybSBtaW5pbXVtIENEQ0xLLCBmYWlsaW5n IGF1ZGlvIHByb2JlLgogCSAqLwotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJaWYg KGNydGNfc3RhdGUtPmhhc19hdWRpbyAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCW1p bl9jZGNsayA9IG1heCgyICogOTYwMDAsIG1pbl9jZGNsayk7CiAKIAkvKgpAQCAtMjIzOSw3ICsy MjI4LDcgQEAgc3RhdGljIGludCBpbnRlbF9jb21wdXRlX21pbl9jZGNsayhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJCWludGVsX3N0YXRlLT5taW5fY2RjbGtbaV0gPSBtaW5fY2Rj bGs7CiAJfQogCi0JbWluX2NkY2xrID0gMDsKKwltaW5fY2RjbGsgPSBpbnRlbF9zdGF0ZS0+Y2Rj bGsuZm9yY2VfbWluX2NkY2xrOwogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpCiAJCW1p bl9jZGNsayA9IG1heChpbnRlbF9zdGF0ZS0+bWluX2NkY2xrW3BpcGVdLCBtaW5fY2RjbGspOwog CkBAIC0yMzAwLDcgKzIyODksOCBAQCBzdGF0aWMgaW50IHZsdl9tb2Rlc2V0X2NhbGNfY2RjbGso c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQl2bHZfY2FsY192b2x0YWdlX2xldmVs KGRldl9wcml2LCBjZGNsayk7CiAKIAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsK LQkJY2RjbGsgPSB2bHZfY2FsY19jZGNsayhkZXZfcHJpdiwgMCk7CisJCWNkY2xrID0gdmx2X2Nh bGNfY2RjbGsoZGV2X3ByaXYsCisJCQkJICAgICAgIGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9t aW5fY2RjbGspOwogCiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsK IAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52b2x0YWdlX2xldmVsID0KQEAgLTIzMzMsNyAr MjMyMyw3IEBAIHN0YXRpYyBpbnQgYmR3X21vZGVzZXRfY2FsY19jZGNsayhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJCWJkd19jYWxjX3ZvbHRhZ2VfbGV2ZWwoY2RjbGspOwogCiAJ aWYgKCFpbnRlbF9zdGF0ZS0+YWN0aXZlX2NydGNzKSB7Ci0JCWNkY2xrID0gYmR3X2NhbGNfY2Rj bGsoMCk7CisJCWNkY2xrID0gYmR3X2NhbGNfY2RjbGsoaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNl X21pbl9jZGNsayk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC5jZGNsayA9IGNkY2xr OwogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZvbHRhZ2VfbGV2ZWwgPQpAQCAtMjQwNSw3 ICsyMzk1LDcgQEAgc3RhdGljIGludCBza2xfbW9kZXNldF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJc2tsX2NhbGNfdm9sdGFnZV9sZXZlbChjZGNsayk7CiAK IAlpZiAoIWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBza2xfY2FsY19j ZGNsaygwLCB2Y28pOworCQljZGNsayA9IHNrbF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNs ay5mb3JjZV9taW5fY2RjbGssIHZjbyk7CiAKIAkJaW50ZWxfc3RhdGUtPmNkY2xrLmFjdHVhbC52 Y28gPSB2Y287CiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1YWwuY2RjbGsgPSBjZGNsazsKQEAg LTI0NDQsMTAgKzI0MzQsMTAgQEAgc3RhdGljIGludCBieHRfbW9kZXNldF9jYWxjX2NkY2xrKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2 ZV9jcnRjcykgewogCQlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKLQkJCWNkY2xrID0g Z2xrX2NhbGNfY2RjbGsoMCk7CisJCQljZGNsayA9IGdsa19jYWxjX2NkY2xrKGludGVsX3N0YXRl LT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwogCQkJdmNvID0gZ2xrX2RlX3BsbF92Y28oZGV2X3By aXYsIGNkY2xrKTsKIAkJfSBlbHNlIHsKLQkJCWNkY2xrID0gYnh0X2NhbGNfY2RjbGsoMCk7CisJ CQljZGNsayA9IGJ4dF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2Rj bGspOwogCQkJdmNvID0gYnh0X2RlX3BsbF92Y28oZGV2X3ByaXYsIGNkY2xrKTsKIAkJfQogCkBA IC0yNDgzLDcgKzI0NzMsNyBAQCBzdGF0aWMgaW50IGNubF9tb2Rlc2V0X2NhbGNfY2RjbGsoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkgICAgY25sX2NvbXB1dGVfbWluX3ZvbHRh Z2VfbGV2ZWwoaW50ZWxfc3RhdGUpKTsKIAogCWlmICghaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRj cykgewotCQljZGNsayA9IGNubF9jYWxjX2NkY2xrKDApOworCQljZGNsayA9IGNubF9jYWxjX2Nk Y2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGspOwogCQl2Y28gPSBjbmxfY2Rj bGtfcGxsX3ZjbyhkZXZfcHJpdiwgY2RjbGspOwogCiAJCWludGVsX3N0YXRlLT5jZGNsay5hY3R1 YWwudmNvID0gdmNvOwpAQCAtMjUxOSw3ICsyNTA5LDcgQEAgc3RhdGljIGludCBpY2xfbW9kZXNl dF9jYWxjX2NkY2xrKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJICAgIGNubF9j b21wdXRlX21pbl92b2x0YWdlX2xldmVsKGludGVsX3N0YXRlKSk7CiAKIAlpZiAoIWludGVsX3N0 YXRlLT5hY3RpdmVfY3J0Y3MpIHsKLQkJY2RjbGsgPSBpY2xfY2FsY19jZGNsaygwLCByZWYpOwor CQljZGNsayA9IGljbF9jYWxjX2NkY2xrKGludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2Rj bGssIHJlZik7CiAJCXZjbyA9IGljbF9jYWxjX2NkY2xrX3BsbF92Y28oZGV2X3ByaXYsIGNkY2xr KTsKIAogCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsLnZjbyA9IHZjbzsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2MWFjYmFmMmFmNzUuLmI0MTk5Y2Q1MzM0OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI5NzMsNiArMTI5NzMsMTEgQEAg c3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAorCS8qIGtlZXAgdGhlIGN1cnJlbnQgc2V0 dGluZyAqLworCWlmICghaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNlX21pbl9jZGNsa19jaGFuZ2Vk KQorCQlpbnRlbF9zdGF0ZS0+Y2RjbGsuZm9yY2VfbWluX2NkY2xrID0KKwkJCWRldl9wcml2LT5j ZGNsay5mb3JjZV9taW5fY2RjbGs7CisKIAlpbnRlbF9zdGF0ZS0+bW9kZXNldCA9IHRydWU7CiAJ aW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVfY3J0Y3M7CiAJaW50 ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWwgPSBkZXZfcHJpdi0+Y2RjbGsubG9naWNhbDsKQEAgLTEz MDY4LDcgKzEzMDczLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKmNydGNfc3RhdGU7CiAJaW50IHJldCwgaTsKLQlib29s IGFueV9tcyA9IGZhbHNlOworCWJvb2wgYW55X21zID0gaW50ZWxfc3RhdGUtPmNkY2xrLmZvcmNl X21pbl9jZGNsa19jaGFuZ2VkOwogCiAJLyogQ2F0Y2ggSTkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVE ICovCiAJZm9yX2VhY2hfb2xkbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRj X3N0YXRlLApAQCAtMTM2NjAsNiArMTM2NjUsOCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19j b21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJZGV2X3ByaXYtPmFjdGl2ZV9jcnRjcyA9 IGludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3M7CiAJCWRldl9wcml2LT5jZGNsay5sb2dpY2FsID0g aW50ZWxfc3RhdGUtPmNkY2xrLmxvZ2ljYWw7CiAJCWRldl9wcml2LT5jZGNsay5hY3R1YWwgPSBp bnRlbF9zdGF0ZS0+Y2RjbGsuYWN0dWFsOworCQlkZXZfcHJpdi0+Y2RjbGsuZm9yY2VfbWluX2Nk Y2xrID0KKwkJCWludGVsX3N0YXRlLT5jZGNsay5mb3JjZV9taW5fY2RjbGs7CiAJfQogCiAJZHJt X2F0b21pY19zdGF0ZV9nZXQoc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBk OWYxODhlZjIxZjQuLjBiODRlNTU3YzI2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTU1Niw2ICs1NTYsOSBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKIAkJICogc3RhdGUg b25seSB3aGVuIGFsbCBjcnRjJ3MgYXJlIERQTVMgb2ZmLgogCQkgKi8KIAkJc3RydWN0IGludGVs X2NkY2xrX3N0YXRlIGFjdHVhbDsKKworCQlpbnQgZm9yY2VfbWluX2NkY2xrOworCQlib29sIGZv cmNlX21pbl9jZGNsa19jaGFuZ2VkOwogCX0gY2RjbGs7CiAKIAlib29sIGRwbGxfc2V0LCBtb2Rl c2V0OwotLSAKMi4xMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZng=