From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 08/19] drm/i915: Make IS_IVYBRIDGE only take dev_priv Date: Tue, 11 Oct 2016 14:21:41 +0100 Message-ID: <1476192112-25336-9-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EFFD6E674 for ; Tue, 11 Oct 2016 13:22:17 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id l131so1045024lfl.0 for ; Tue, 11 Oct 2016 06:22:17 -0700 (PDT) In-Reply-To: <1476192112-25336-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDg0 OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjogQWRkIHBhcmFudGhlc2VzIGFyb3VuZCBk ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMgICAgICAgICB8IDE5ICsrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29u dGV4dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8 IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAg IHwgMTMgKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMg ICAgIHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYmZkYmJiNzQ1OTM5Li5mNmJhOGYy NjIyMzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTE0LDcgKzExNCw3IEBAIHN0YXRp YyBib29sIGk5MTVfZXJyb3JfaW5qZWN0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCQkgICAgICBmbXQsICMjX19WQV9BUkdTX18pCiAKIAotc3RhdGljIGVudW0gaW50ZWxf cGNoIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGlj IGVudW0gaW50ZWxfcGNoIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CiAJZW51bSBpbnRlbF9wY2ggcmV0ID0gUENIX05PUDsKIApAQCAt MTI1LDE2ICsxMjUsMTYgQEAgc3RhdGljIGVudW0gaW50ZWxfcGNoIGludGVsX3ZpcnRfZGV0ZWN0 X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIG1ha2UgYW4gZWR1Y2F0ZWQgZ3Vlc3Mg YXMgdG8gd2hpY2ggUENIIGlzIHJlYWxseSB0aGVyZS4KIAkgKi8KIAotCWlmIChJU19HRU41KGRl dikpIHsKKwlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJcmV0ID0gUENIX0lCWDsKIAkJRFJN X0RFQlVHX0tNUygiQXNzdW1pbmcgSWJleCBQZWFrIFBDSFxuIik7Ci0JfSBlbHNlIGlmIChJU19H RU42KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0dFTjYoZGV2 X3ByaXYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJcmV0ID0gUENIX0NQVDsKIAkJ RFJNX0RFQlVHX0tNUygiQXNzdW1pbmcgQ291YXJQb2ludCBQQ0hcbiIpOwotCX0gZWxzZSBpZiAo SVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKSB7CisJfSBlbHNlIGlmIChJU19I QVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCXJldCA9IFBD SF9MUFQ7CiAJCURSTV9ERUJVR19LTVMoIkFzc3VtaW5nIEx5bnhQb2ludCBQQ0hcbiIpOwotCX0g ZWxzZSBpZiAoSVNfU0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpIHsKKwl9IGVsc2Ug aWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewogCQly ZXQgPSBQQ0hfU1BUOwogCQlEUk1fREVCVUdfS01TKCJBc3N1bWluZyBTdW5yaXNlUG9pbnQgUENI XG4iKTsKIAl9CkBAIC0xNzgsMTIgKzE3OCwxNCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZXRlY3Rf cGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BD SF9DUFRfREVWSUNFX0lEX1RZUEUpIHsKIAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hfQ1BU OwogCQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIENvdWdhclBvaW50IFBDSFxuIik7Ci0JCQkJV0FS Tl9PTighKElTX0dFTjYoZGV2KSB8fCBJU19JVllCUklER0UoZGV2KSkpOworCQkJCVdBUk5fT04o IShJU19HRU42KGRldl9wcml2KSB8fAorCQkJCQlJU19JVllCUklER0UoZGV2X3ByaXYpKSk7CiAJ CQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BDSF9QUFRfREVWSUNFX0lEX1RZUEUpIHsKIAkJCQkv KiBQYW50aGVyUG9pbnQgaXMgQ1BUIGNvbXBhdGlibGUgKi8KIAkJCQlkZXZfcHJpdi0+cGNoX3R5 cGUgPSBQQ0hfQ1BUOwogCQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIFBhbnRoZXJQb2ludCBQQ0hc biIpOwotCQkJCVdBUk5fT04oIShJU19HRU42KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikpKTsK KwkJCQlXQVJOX09OKCEoSVNfR0VONihkZXZfcHJpdikgfHwKKwkJCQkJSVNfSVZZQlJJREdFKGRl dl9wcml2KSkpOwogCQkJfSBlbHNlIGlmIChpZCA9PSBJTlRFTF9QQ0hfTFBUX0RFVklDRV9JRF9U WVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0gUENIX0xQVDsKIAkJCQlEUk1fREVCVUdf S01TKCJGb3VuZCBMeW54UG9pbnQgUENIXG4iKTsKQEAgLTIxNyw3ICsyMTksOCBAQCBzdGF0aWMg dm9pZCBpbnRlbF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJCSAgICBQ Q0lfU1VCVkVORE9SX0lEX1JFREhBVF9RVU1SQU5FVCAmJgogCQkJCSAgICBwY2gtPnN1YnN5c3Rl bV9kZXZpY2UgPT0KIAkJCQkJICAgIFBDSV9TVUJERVZJQ0VfSURfUUVNVSkpIHsKLQkJCQlkZXZf cHJpdi0+cGNoX3R5cGUgPSBpbnRlbF92aXJ0X2RldGVjdF9wY2goZGV2KTsKKwkJCQlkZXZfcHJp di0+cGNoX3R5cGUgPQorCQkJCQlpbnRlbF92aXJ0X2RldGVjdF9wY2goZGV2X3ByaXYpOwogCQkJ fSBlbHNlCiAJCQkJY29udGludWU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDdhNDBk ZmE4MzBlNy4uM2YzMjE5MzJkMThhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NTUs NyArMjY1NSw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19QSU5F VklFVyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX3BpbmV2aWV3KQogI2RlZmluZSBJU19HMzMo ZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aXNfZzMzKQogI2RlZmluZSBJU19JUk9OTEFLRV9NKGRl dl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDA0NikKLSNkZWZpbmUgSVNfSVZZ QlJJREdFKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfaXZ5YnJpZGdlKQorI2RlZmluZSBJU19J VllCUklER0UoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2l2eWJyaWRnZSkKICNkZWZp bmUgSVNfSVZCX0dUMShkZXZfcHJpdikJKElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTYg fHwgXAogCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTUyIHx8IFwKIAkJCQkgSU5U RUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDE1YSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4 IGFmYWE0OTk0NjA0Mi4uNmRhODQxNTAwNTEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAg LTQzNjQsNyArNDM2NCw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJCSAgIExPV0VSX1NMSUNFX0VOQUJMRUQgOiBMT1dFUl9TTElDRV9ESVNBQkxFRCk7CiAK IAlpZiAoSEFTX1BDSF9OT1AoZGV2X3ByaXYpKSB7Ci0JCWlmIChJU19JVllCUklER0UoZGV2KSkg eworCQlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewogCQkJdTMyIHRlbXAgPSBJOTE1X1JF QUQoR0VON19NU0dfQ1RMKTsKIAkJCXRlbXAgJj0gfihXQUlUX0ZPUl9QQ0hfRkxSX0FDSyB8IFdB SVRfRk9SX1BDSF9SRVNFVF9BQ0spOwogCQkJSTkxNV9XUklURShHRU43X01TR19DVEwsIHRlbXAp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGRmMTBmNGU5NTcz Ni4uZTExN2I5OGM3MjZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j CkBAIC0xOTIsNyArMTkyLDcgQEAgaTkxNV9nZW1fYWxsb2NfY29udGV4dF9vYmooc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgc2l6ZV90IHNpemUpCiAJICogVGhpcyBpcyBvbmx5IGFwcGxpY2FibGUg Zm9yIEl2eSBCcmlkZ2UgZGV2aWNlcyBzaW5jZQogCSAqIGxhdGVyIHBsYXRmb3JtcyBkb24ndCBo YXZlIEwzIGNvbnRyb2wgYml0cyBpbiB0aGUgUFRFLgogCSAqLwotCWlmIChJU19JVllCUklER0Uo ZGV2KSkgeworCWlmIChJU19JVllCUklER0UodG9faTkxNShkZXYpKSkgewogCQlyZXQgPSBpOTE1 X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xldmVsKG9iaiwgSTkxNV9DQUNIRV9MM19MTEMpOwogCQkv KiBGYWlsdXJlIHNob3VsZG4ndCBldmVyIGhhcHBlbiB0aGlzIGVhcmx5ICovCiAJCWlmIChXQVJO X09OKHJldCkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlZTNiNTkz ZDNlYzIuLjc4OTQ2NzViZmNiOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMzcyOSw3ICszNzI5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJLyogZW5hYmxlIG5vcm1hbCB0cmFpbiAqLwogCXJlZyA9 IEZESV9UWF9DVEwocGlwZSk7CiAJdGVtcCA9IEk5MTVfUkVBRChyZWcpOwotCWlmIChJU19JVllC UklER0UoZGV2KSkgeworCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCXRlbXAgJj0g fkZESV9MSU5LX1RSQUlOX05PTkVfSVZCOwogCQl0ZW1wIHw9IEZESV9MSU5LX1RSQUlOX05PTkVf SVZCIHwgRkRJX1RYX0VOSEFOQ0VfRlJBTUVfRU5BQkxFOwogCX0gZWxzZSB7CkBAIC0zNzU0LDcg KzM3NTQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mZGlfbm9ybWFsX3RyYWluKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAl1ZGVsYXkoMTAwMCk7CiAKIAkvKiBJVkIgd2FudHMgZXJyb3IgY29ycmVj dGlvbiBlbmFibGVkICovCi0JaWYgKElTX0lWWUJSSURHRShkZXYpKQorCWlmIChJU19JVllCUklE R0UoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKHJlZywgSTkxNV9SRUFEKHJlZykgfCBGRElfRlNf RVJSQ19FTkFCTEUgfAogCQkJICAgRkRJX0ZFX0VSUkNfRU5BQkxFKTsKIH0KQEAgLTQ1NDAsNyAr NDU0MCw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9lbmFibGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCiAJYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2FibGVkKGRldl9wcml2LCBwaXBl KTsKIAotCWlmIChJU19JVllCUklER0UoZGV2KSkKKwlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2 KSkKIAkJaXZ5YnJpZGdlX3VwZGF0ZV9mZGlfYmNfYmlmdXJjYXRpb24oaW50ZWxfY3J0Yyk7CiAK IAkvKiBXcml0ZSB0aGUgVFUgc2l6ZSBiaXRzIGJlZm9yZSBmZGkgbGluayB0cmFpbmluZywgc28g dGhhdCBlcnJvcgpAQCAtNDg1NCw3ICs0ODU0LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGZp dF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCSAqIGFzIHNvbWUgcHJlLXByb2dy YW1tZWQgdmFsdWVzIGFyZSBicm9rZW4sCiAJCSAqIGUuZy4geDIwMS4KIAkJICovCi0JCWlmIChJ U19JVllCUklER0UoZGV2KSB8fCBJU19IQVNXRUxMKGRldikpCisJCWlmIChJU19JVllCUklER0Uo ZGV2X3ByaXYpIHx8IElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQkJSTkxNV9XUklURShQRl9DVEwo cGlwZSksIFBGX0VOQUJMRSB8IFBGX0ZJTFRFUl9NRURfM3gzIHwKIAkJCQkJCSBQRl9QSVBFX1NF TF9JVkIocGlwZSkpOwogCQllbHNlCkBAIC0xMjI1MSw3ICsxMjI1MSw3IEBAIHN0YXRpYyBpbnQg aW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpZiAoZmItPm1v ZGlmaWVyWzBdICE9IG9sZF9mYi0+bW9kaWZpZXJbMF0pCiAJCQkvKiB2bHY6IERJU1BMQVlfRkxJ UCBmYWlscyB0byBjaGFuZ2UgdGlsaW5nICovCiAJCQllbmdpbmUgPSBOVUxMOwotCX0gZWxzZSBp ZiAoSVNfSVZZQlJJREdFKGRldikgfHwgSVNfSEFTV0VMTChkZXYpKSB7CisJfSBlbHNlIGlmIChJ U19JVllCUklER0UoZGV2X3ByaXYpIHx8IElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWVuZ2lu ZSA9ICZkZXZfcHJpdi0+ZW5naW5lW0JDU107CiAJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA+PSA3KSB7CiAJCWVuZ2luZSA9IGk5MTVfZ2VtX2FjdGl2ZV9nZXRfZW5naW5lKCZvYmot Pmxhc3Rfd3JpdGUsCkBAIC0xMjUyNyw3ICsxMjUyNyw3IEBAIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkgKiBj c3RhdGUtPnVwZGF0ZV93bSB3YXMgYWxyZWFkeSBzZXQgYWJvdmUsIHNvIHRoaXMgZmxhZyB3aWxs CiAJICogdGFrZSBlZmZlY3Qgd2hlbiB3ZSBjb21taXQgYW5kIHByb2dyYW0gd2F0ZXJtYXJrcy4K IAkgKi8KLQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSAmJiBJU19J VllCUklER0UoZGV2KSAmJgorCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVS TEFZICYmIElTX0lWWUJSSURHRShkZXZfcHJpdikgJiYKIAkgICAgbmVlZHNfc2NhbGluZyh0b19p bnRlbF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSkpICYmCiAJICAgICFuZWVkc19zY2FsaW5nKG9s ZF9wbGFuZV9zdGF0ZSkpCiAJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2xwX3dtID0gdHJ1ZTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDA0YTM4YTM3YWYyZS4uOTE1NTczNWQwMWRmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIxOTEsMTQgKzIxOTEsMTUgQEAgc3RhdGljIHZvaWQg aW50ZWxfZml4dXBfc3ByX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDE2 X3Qgd21bNV0pCiAJCXdtWzBdID0gMTM7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2ZpeHVwX2N1 cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQxNl90IHdtWzVdKQorc3Rh dGljIHZvaWQgaW50ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAorCQkJCSAgICAgICB1aW50MTZfdCB3bVs1XSkKIHsKIAkvKiBJTEsgY3Vy c29yIExQMCBsYXRlbmN5IGlzIDEzMDAgbnMgKi8KLQlpZiAoSVNfR0VONShkZXYpKQorCWlmIChJ U19HRU41KGRldl9wcml2KSkKIAkJd21bMF0gPSAxMzsKIAogCS8qIFdhRG91YmxlQ3Vyc29yTFAz TGF0ZW5jeTppdmIgKi8KLQlpZiAoSVNfSVZZQlJJREdFKGRldikpCisJaWYgKElTX0lWWUJSSURH RShkZXZfcHJpdikpCiAJCXdtWzNdICo9IDI7CiB9CiAKQEAgLTIyOTQsNyArMjI5NSw3IEBAIHN0 YXRpYyB2b2lkIGlsa19zZXR1cF93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ ICAgICAgIHNpemVvZihkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3kpKTsKIAogCWludGVsX2ZpeHVw X3Nwcl93bV9sYXRlbmN5KGRldiwgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKLQlpbnRlbF9m aXh1cF9jdXJfd21fbGF0ZW5jeShkZXYsIGRldl9wcml2LT53bS5jdXJfbGF0ZW5jeSk7CisJaW50 ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koZGV2X3ByaXYsIGRldl9wcml2LT53bS5jdXJfbGF0ZW5j eSk7CiAKIAlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldiwgIlByaW1hcnkiLCBkZXZfcHJpdi0+ d20ucHJpX2xhdGVuY3kpOwogCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiU3ByaXRlIiwg ZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKQEAgLTI1MjIsNyArMjUyMyw3IEBAIHN0YXRpYyB2 b2lkIGlsa193bV9tZXJnZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWludCBsYXN0X2VuYWJs ZWRfbGV2ZWwgPSBtYXhfbGV2ZWw7CiAKIAkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1hcmtz IG9ubHkgdy8gc2luZ2xlIHBpcGUgKi8KLQlpZiAoKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYg fHwgSVNfSVZZQlJJREdFKGRldikpICYmCisJaWYgKChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDYg fHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkgJiYKIAkgICAgY29uZmlnLT5udW1fcGlwZXNfYWN0 aXZlID4gMSkKIAkJbGFzdF9lbmFibGVkX2xldmVsID0gMDsKIApAQCAtNDYxNyw3ICs0NjE4LDcg QEAgdm9pZCBpbGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYg KElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAkJaHctPnBhcnRpdGlvbmlu ZyA9IChJOTE1X1JFQUQoV01fTUlTQykgJiBXTV9NSVNDX0RBVEFfUEFSVElUSU9OXzVfNikgPwog CQkJSU5URUxfRERCX1BBUlRfNV82IDogSU5URUxfRERCX1BBUlRfMV8yOwotCWVsc2UgaWYgKElT X0lWWUJSSURHRShkZXYpKQorCWVsc2UgaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpCiAJCWh3 LT5wYXJ0aXRpb25pbmcgPSAoSTkxNV9SRUFEKERJU1BfQVJCX0NUTDIpICYgRElTUF9EQVRBX1BB UlRJVElPTl81XzYpID8KIAkJCUlOVEVMX0REQl9QQVJUXzVfNiA6IElOVEVMX0REQl9QQVJUXzFf MjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA3M2E1MjFmZGYxYmQuLmQw Zjc5OGNlNmJiMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEwODQsNyAr MTA4NCw3IEBAIGludGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBw aXBlIHBpcGUsIGludCBwbGFuZSkKIAogCWNhc2UgNzoKIAljYXNlIDg6Ci0JCWlmIChJU19JVllC UklER0UoZGV2KSkgeworCQlpZiAoSVNfSVZZQlJJREdFKHRvX2k5MTUoZGV2KSkpIHsKIAkJCWlu dGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0cnVlOwogCQkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2Nh bGUgPSAyOwogCQl9IGVsc2UgewotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=