From: Tvrtko Ursulin Subject: [PATCH v2 4/5] drm/i915: Pass dev_priv to INTEL_INFO everywhere apart from the gen use Date: Wed, 9 Nov 2016 11:30:45 +0000 Message-ID: <1478691045-18433-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20161109084459.bueob7ehzjyuvyqs@boom> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01AE26E66D for ; Wed, 9 Nov 2016 11:30:54 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id p190so28626484wmp.1 for ; Wed, 09 Nov 2016 03:30:54 -0800 (PST) In-Reply-To: <20161109084459.bueob7ehzjyuvyqs@boom> 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFmdGVyIHRo aXMgcGF0Y2ggb25seSBjb252ZXJzaW9uIG9mIElOVEVMX0lORk8ocCktPmdlbiB0bwpJTlRFTF9H RU4oZGV2X3ByaXYpIHJlbWFpbnMgYmVmb3JlIHRoZSBfX0k5MTVfXyBtYWNybyBjYW4KYmUgcmVt b3ZlZC4KCnYyOiBUaWR5IHZsdl9jb21wdXRlX3dtLiAoRGF2aWQgV2VpbmVoYWxsKQoKU2lnbmVk LW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IERh dmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYyAgIHwgMzEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjggKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyAgIHwgMTAgKysrKyst LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMTIgKysrKysrKy0t LS0tCiA2IGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQ1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDAyMTNhMzA5MGFiMy4uMjBiMWUxOWQ5ODJiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJLyogSW4gYWxsIGN1cnJl bnQgY2FzZXMsIG51bV9waXBlcyBpcyBlcXVpdmFsZW50IHRvIHRoZSBQQ0hfTk9QIHNldHRpbmcK IAkgKiAod2hpY2ggcmVhbGx5IGFtb3VudHMgdG8gYSBQQ0ggYnV0IG5vIFNvdXRoIERpc3BsYXkp LgogCSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcyA9PSAwKSB7CisJaWYgKElO VEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMCkgewogCQlkZXZfcHJpdi0+cGNoX3R5 cGUgPSBQQ0hfTk9QOwogCQlyZXR1cm47CiAJfQpAQCAtNjA3LDcgKzYwNyw3IEBAIHN0YXRpYyBp bnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50 ZWxfbW9kZXNldF9nZW1faW5pdChkZXYpOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+bnVtX3Bp cGVzID09IDApCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMCkKIAkJ cmV0dXJuIDA7CiAKIAlyZXQgPSBpbnRlbF9mYmRldl9pbml0KGRldik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGE1ZmFmYTNkNGZjOC4uMmViMjJiYTA2YmMwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNzE0LDcgKzcxNCw3IEBAIHN0YXRpYyBpbnQg Z2VuOF80OGJfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKICAqLwogc3Rh dGljIHZvaWQgbWFya190bGJzX2RpcnR5KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIHsK LQlwcGd0dC0+cGRfZGlydHlfcmluZ3MgPSBJTlRFTF9JTkZPKHBwZ3R0LT5iYXNlLmRldiktPnJp bmdfbWFzazsKKwlwcGd0dC0+cGRfZGlydHlfcmluZ3MgPSBJTlRFTF9JTkZPKHRvX2k5MTUocHBn dHQtPmJhc2UuZGV2KSktPnJpbmdfbWFzazsKIH0KIAogLyogUmVtb3ZlcyBlbnRyaWVzIGZyb20g YSBzaW5nbGUgcGFnZSB0YWJsZSwgcmVsZWFzaW5nIGl0IGlmIGl0J3MgZW1wdHkuCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfY29sb3IuYwppbmRleCA0NDUxMDg4NTUyNzUuLjM3ODQ5NDBhNGU3YSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCkBAIC0zNDUsMTEgKzM0NSwxMCBAQCBzdGF0aWMg dm9pZCBoYXN3ZWxsX2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp CiBzdGF0aWMgdm9pZCBicm9hZHdlbGxfbG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq c3RhdGUpCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmNydGM7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShjcnRjLT5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRl bF9zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoc3RhdGUpOwogCWVudW0gcGlwZSBwaXBlID0g dG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKLQl1aW50MzJfdCBpLCBsdXRfc2l6ZSA9IElOVEVM X0lORk8oZGV2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsKKwl1aW50MzJfdCBpLCBsdXRfc2l6 ZSA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5jb2xvci5kZWdhbW1hX2x1dF9zaXplOwogCiAJaWYg KGNydGNfc3RhdGVfaXNfbGVnYWN5KHN0YXRlKSkgewogCQloYXN3ZWxsX2xvYWRfbHV0cyhzdGF0 ZSk7CkBAIC00MjgsOCArNDI3LDcgQEAgc3RhdGljIHZvaWQgYnJvYWR3ZWxsX2xvYWRfbHV0cyhz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQogc3RhdGljIHZvaWQgY2hlcnJ5dmlld19sb2Fk X2x1dHMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMg KmNydGMgPSBzdGF0ZS0+Y3J0YzsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2 OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CiAJ ZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwogCXN0cnVjdCBkcm1f Y29sb3JfbHV0ICpsdXQ7CiAJdWludDMyX3QgaSwgbHV0X3NpemU7CkBAIC00NDYsNyArNDQ0LDcg QEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19sb2FkX2x1dHMoc3RydWN0IGRybV9jcnRjX3N0YXRl ICpzdGF0ZSkKIAogCWlmIChzdGF0ZS0+ZGVnYW1tYV9sdXQpIHsKIAkJbHV0ID0gKHN0cnVjdCBk cm1fY29sb3JfbHV0ICopIHN0YXRlLT5kZWdhbW1hX2x1dC0+ZGF0YTsKLQkJbHV0X3NpemUgPSBJ TlRFTF9JTkZPKGRldiktPmNvbG9yLmRlZ2FtbWFfbHV0X3NpemU7CisJCWx1dF9zaXplID0gSU5U RUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmRlZ2FtbWFfbHV0X3NpemU7CiAJCWZvciAoaSA9IDA7 IGkgPCBsdXRfc2l6ZTsgaSsrKSB7CiAJCQkvKiBXcml0ZSBMVVQgaW4gVTAuMTQgZm9ybWF0LiAq LwogCQkJd29yZDAgPQpAQCAtNDYxLDcgKzQ1OSw3IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdf bG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCiAKIAlpZiAoc3RhdGUtPmdh bW1hX2x1dCkgewogCQlsdXQgPSAoc3RydWN0IGRybV9jb2xvcl9sdXQgKikgc3RhdGUtPmdhbW1h X2x1dC0+ZGF0YTsKLQkJbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldiktPmNvbG9yLmdhbW1hX2x1 dF9zaXplOworCQlsdXRfc2l6ZSA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5jb2xvci5nYW1tYV9s dXRfc2l6ZTsKIAkJZm9yIChpID0gMDsgaSA8IGx1dF9zaXplOyBpKyspIHsKIAkJCS8qIFdyaXRl IExVVCBpbiBVMC4xMCBmb3JtYXQuICovCiAJCQl3b3JkMCA9CkBAIC00OTcsMTIgKzQ5NSwxMiBA QCB2b2lkIGludGVsX2NvbG9yX2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiBpbnQgaW50ZWxfY29sb3JfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkg ICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNydGMtPmRldik7CiAJc2l6ZV90IGdhbW1hX2xlbmd0aCwgZGVnYW1tYV9s ZW5ndGg7CiAKLQlkZWdhbW1hX2xlbmd0aCA9IElOVEVMX0lORk8oZGV2KS0+Y29sb3IuZGVnYW1t YV9sdXRfc2l6ZSAqCisJZGVnYW1tYV9sZW5ndGggPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29s b3IuZGVnYW1tYV9sdXRfc2l6ZSAqCiAJCXNpemVvZihzdHJ1Y3QgZHJtX2NvbG9yX2x1dCk7Ci0J Z2FtbWFfbGVuZ3RoID0gSU5URUxfSU5GTyhkZXYpLT5jb2xvci5nYW1tYV9sdXRfc2l6ZSAqCisJ Z2FtbWFfbGVuZ3RoID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmdhbW1hX2x1dF9zaXpl ICoKIAkJc2l6ZW9mKHN0cnVjdCBkcm1fY29sb3JfbHV0KTsKIAogCS8qCkBAIC01MjksOCArNTI3 LDcgQEAgaW50IGludGVsX2NvbG9yX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogdm9p ZCBpbnRlbF9jb2xvcl9pbml0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGNydGMtPmRldik7CiAKIAlkcm1fbW9kZV9jcnRjX3NldF9nYW1tYV9zaXplKGNy dGMsIDI1Nik7CiAKQEAgLTU0OSwxMCArNTQ2LDEwIEBAIHZvaWQgaW50ZWxfY29sb3JfaW5pdChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJfQogCiAJLyogRW5hYmxlIGNvbG9yIG1hbmFnZW1lbnQg c3VwcG9ydCB3aGVuIHdlIGhhdmUgZGVnYW1tYSAmIGdhbW1hIExVVHMuICovCi0JaWYgKElOVEVM X0lORk8oZGV2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZSAhPSAwICYmCi0JICAgIElOVEVMX0lO Rk8oZGV2KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemUgIT0gMCkKKwlpZiAoSU5URUxfSU5GTyhkZXZf cHJpdiktPmNvbG9yLmRlZ2FtbWFfbHV0X3NpemUgIT0gMCAmJgorCSAgICBJTlRFTF9JTkZPKGRl dl9wcml2KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemUgIT0gMCkKIAkJZHJtX2NydGNfZW5hYmxlX2Nv bG9yX21nbXQoY3J0YywKLQkJCQkJSU5URUxfSU5GTyhkZXYpLT5jb2xvci5kZWdhbW1hX2x1dF9z aXplLAotCQkJCQl0cnVlLAotCQkJCQlJTlRFTF9JTkZPKGRldiktPmNvbG9yLmdhbW1hX2x1dF9z aXplKTsKKwkJCQkJICAgSU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmRlZ2FtbWFfbHV0X3Np emUsCisJCQkJCSAgIHRydWUsCisJCQkJCSAgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5jb2xvci5n YW1tYV9sdXRfc2l6ZSk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg MmExYWJmMjkzYTM1Li5lMGFkMDk3NTc1NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTcwNTMsNyArNzA1Myw3IEBAIHN0YXRpYyBpbnQgaXJvbmxha2VfY2hlY2tfZmRp X2xhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLAogCQl9CiAJfQog Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzID09IDIpCisJaWYgKElOVEVMX0lORk8o ZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMikKIAkJcmV0dXJuIDA7CiAKIAkvKiBJdnlicmlkZ2Ug MyBwaXBlIGlzIHJlYWxseSBjb21wbGljYXRlZCAqLwpAQCAtMTQ3MjUsOCArMTQ3MjUsNyBAQCBp bnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogewogCXN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0KIAkJdG9faW50ZWxfYXRvbWljX3N0 YXRlKG5ld19zdGF0ZS0+c3RhdGUpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYp OwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gbmV3X3N0YXRlLT5mYjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+c3RhdGUtPmZi KTsKQEAgLTE0NzgzLDcgKzE0NzgyLDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAl9CiAKIAlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZ UEVfQ1VSU09SICYmCi0JICAgIElOVEVMX0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3BoeXNpY2Fs KSB7CisJICAgIElOVEVMX0lORk8oZGV2X3ByaXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsK IAkJaW50IGFsaWduID0gSVNfSTgzMChkZXZfcHJpdikgPyAxNiAqIDEwMjQgOiAyNTY7CiAJCXJl dCA9IGk5MTVfZ2VtX29iamVjdF9hdHRhY2hfcGh5cyhvYmosIGFsaWduKTsKIAkJaWYgKHJldCkg ewpAQCAtMTQ4MTYsNyArMTQ4MTUsNyBAQCB2b2lkCiBpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkgICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq b2xkX3N0YXRlKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmRldik7CiAJ c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfaW50ZWxfc3RhdGU7CiAJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoob2xkX3N0YXRlLT5mYik7CiAJ c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihwbGFuZS0+c3Rh dGUtPmZiKTsKQEAgLTE0ODI3LDcgKzE0ODI2LDcgQEAgaW50ZWxfY2xlYW51cF9wbGFuZV9mYihz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJcmV0dXJuOwogCiAJaWYgKG9sZF9vYmogJiYgKHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8fAotCSAgICAhSU5URUxfSU5GTyhk ZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpKQorCSAgICAhSU5URUxfSU5GTyhkZXZfcHJpdikt PmN1cnNvcl9uZWVkc19waHlzaWNhbCkpCiAJCWludGVsX3VucGluX2ZiX29iaihvbGRfc3RhdGUt PmZiLCBvbGRfc3RhdGUtPnJvdGF0aW9uKTsKIH0KIApAQCAtMTUxNTIsMTMgKzE1MTUxLDEzIEBA IGludGVsX3VwZGF0ZV9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiB7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjID0gY3J0Y19zdGF0ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmogPSBpbnRlbF9mYl9vYmooc3RhdGUtPmJhc2UuZmIpOwogCXVpbnQzMl90IGFkZHI7CiAK IAlpZiAoIW9iaikKIAkJYWRkciA9IDA7Ci0JZWxzZSBpZiAoIUlOVEVMX0lORk8oZGV2KS0+Y3Vy c29yX25lZWRzX3BoeXNpY2FsKQorCWVsc2UgaWYgKCFJTlRFTF9JTkZPKGRldl9wcml2KS0+Y3Vy c29yX25lZWRzX3BoeXNpY2FsKQogCQlhZGRyID0gaTkxNV9nZW1fb2JqZWN0X2dndHRfb2Zmc2V0 KG9iaiwgTlVMTCk7CiAJZWxzZQogCQlhZGRyID0gb2JqLT5waHlzX2hhbmRsZS0+YnVzYWRkcjsK QEAgLTE2NDQwLDcgKzE2NDM5LDcgQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJaW50ZWxfaW5pdF9wbShkZXZfcHJpdik7CiAKLQlpZiAoSU5URUxf SU5GTyhkZXYpLT5udW1fcGlwZXMgPT0gMCkKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51 bV9waXBlcyA9PSAwKQogCQlyZXR1cm4gMDsKIAogCS8qCkBAIC0xNjQ4Niw4ICsxNjQ4NSw4IEBA IGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlkZXYtPm1v ZGVfY29uZmlnLmZiX2Jhc2UgPSBnZ3R0LT5tYXBwYWJsZV9iYXNlOwogCiAJRFJNX0RFQlVHX0tN UygiJWQgZGlzcGxheSBwaXBlJXMgYXZhaWxhYmxlLlxuIiwKLQkJICAgICAgSU5URUxfSU5GTyhk ZXYpLT5udW1fcGlwZXMsCi0JCSAgICAgIElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzID4gMSA/ ICJzIiA6ICIiKTsKKwkJICAgICAgSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcywKKwkJ ICAgICAgSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA+IDEgPyAicyIgOiAiIik7CiAK IAlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKSB7CiAJCWludCByZXQ7CkBAIC0xNjU3NSwx MSArMTY1NzQsMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX3BpcGVfYShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogc3RhdGljIGJvb2wKIGludGVsX2NoZWNrX3BsYW5lX21hcHBpbmcoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMt PmJhc2UuZGV2KTsKIAl1MzIgdmFsOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVz ID09IDEpCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMSkKIAkJcmV0 dXJuIHRydWU7CiAKIAl2YWwgPSBJOTE1X1JFQUQoRFNQQ05UUighY3J0Yy0+cGxhbmUpKTsKQEAg LTE3MzMyLDcgKzE3MzMwLDcgQEAgaW50ZWxfZGlzcGxheV9wcmludF9lcnJvcl9zdGF0ZShzdHJ1 Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCWlmICghZXJyb3IpCiAJCXJldHVybjsK IAotCWVycl9wcmludGYobSwgIk51bSBQaXBlczogJWRcbiIsIElOVEVMX0lORk8oZGV2KS0+bnVt X3BpcGVzKTsKKwllcnJfcHJpbnRmKG0sICJOdW0gUGlwZXM6ICVkXG4iLCBJTlRFTF9JTkZPKGRl dl9wcml2KS0+bnVtX3BpcGVzKTsKIAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJP QURXRUxMKGRldl9wcml2KSkKIAkJZXJyX3ByaW50ZihtLCAiUFdSX1dFTExfQ1RMMjogJTA4eFxu IiwKIAkJCSAgIGVycm9yLT5wb3dlcl93ZWxsX2RyaXZlcik7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYwppbmRleCBiNzA5OGY5OGJiNjcuLmUzY2Y2NTViZWMzYiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmRldi5jCkBAIC0zNTksNyArMzU5LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJf aW5pdGlhbF9jb25maWcoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKIAkJCQkgICAg c3RydWN0IGRybV9mYl9vZmZzZXQgKm9mZnNldHMsCiAJCQkJICAgIGJvb2wgKmVuYWJsZWQsIGlu dCB3aWR0aCwgaW50IGhlaWdodCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZmJfaGVs cGVyLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShm Yl9oZWxwZXItPmRldik7CiAJdW5zaWduZWQgbG9uZyBjb25uX2NvbmZpZ3VyZWQsIG1hc2s7CiAJ dW5zaWduZWQgaW50IGNvdW50ID0gbWluKGZiX2hlbHBlci0+Y29ubmVjdG9yX2NvdW50LCBCSVRT X1BFUl9MT05HKTsKIAlpbnQgaSwgajsKQEAgLTUxMiw3ICs1MTIsNyBAQCBzdGF0aWMgYm9vbCBp bnRlbF9mYl9pbml0aWFsX2NvbmZpZyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAog CSAqIGZiZGV2IGhlbHBlciBsaWJyYXJ5LgogCSAqLwogCWlmIChudW1fY29ubmVjdG9yc19lbmFi bGVkICE9IG51bV9jb25uZWN0b3JzX2RldGVjdGVkICYmCi0JICAgIG51bV9jb25uZWN0b3JzX2Vu YWJsZWQgPCBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcykgeworCSAgICBudW1fY29ubmVjdG9y c19lbmFibGVkIDwgSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcykgewogCQlEUk1fREVC VUdfS01TKCJmYWxsYmFjazogTm90IGFsbCBvdXRwdXRzIGVuYWJsZWRcbiIpOwogCQlEUk1fREVC VUdfS01TKCJFbmFibGVkOiAlaSwgZGV0ZWN0ZWQ6ICVpXG4iLCBudW1fY29ubmVjdG9yc19lbmFi bGVkLAogCQkJICAgICAgbnVtX2Nvbm5lY3RvcnNfZGV0ZWN0ZWQpOwpAQCAtNzAwLDExICs3MDAs MTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJkZXZfc3VzcGVuZF93b3JrZXIoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKQogCiBpbnQgaW50ZWxfZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogewotCXN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2OwogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfZmJkZXYgKmlm YmRldjsKIAlpbnQgcmV0OwogCi0JaWYgKFdBUk5fT04oSU5URUxfSU5GTyhkZXYpLT5udW1fcGlw ZXMgPT0gMCkpCisJaWYgKFdBUk5fT04oSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9 PSAwKSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKIAlpZmJkZXYgPSBremFsbG9jKHNpemVvZihzdHJ1 Y3QgaW50ZWxfZmJkZXYpLCBHRlBfS0VSTkVMKTsKQEAgLTcxNyw3ICs3MTcsNyBAQCBpbnQgaW50 ZWxfZmJkZXZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZmJkZXYtPnByZWZlcnJl ZF9icHAgPSAzMjsKIAogCXJldCA9IGRybV9mYl9oZWxwZXJfaW5pdChkZXYsICZpZmJkZXYtPmhl bHBlciwKLQkJCQkgSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMsIDQpOworCQkJCSBJTlRFTF9J TkZPKGRldl9wcml2KS0+bnVtX3BpcGVzLCA0KTsKIAlpZiAocmV0KSB7CiAJCWtmcmVlKGlmYmRl dik7CiAJCXJldHVybiByZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA4OGUyOGM5ODli OWMuLjM2OGY4MDFhZWUwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xMDYxLDcgKzEw NjEsOCBAQCBzdGF0aWMgdm9pZCB2bHZfaW52ZXJ0X3dtcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IHdtX3N0YXRlLT5udW1fbGV2ZWxzOyBsZXZl bCsrKSB7CiAJCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKLQkJY29u c3QgaW50IHNyX2ZpZm9fc2l6ZSA9IElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzICogNTEyIC0g MTsKKwkJY29uc3QgaW50IHNyX2ZpZm9fc2l6ZSA9CisJCQlJTlRFTF9JTkZPKHRvX2k5MTUoZGV2 KSktPm51bV9waXBlcyAqIDUxMiAtIDE7CiAJCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CiAK IAkJd21fc3RhdGUtPnNyW2xldmVsXS5wbGFuZSA9IHNyX2ZpZm9fc2l6ZSAtIHdtX3N0YXRlLT5z cltsZXZlbF0ucGxhbmU7CkBAIC0xMDkxLDE1ICsxMDkyLDE2IEBAIHN0YXRpYyB2b2lkIHZsdl9p bnZlcnRfd21zKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogc3RhdGljIHZvaWQgdmx2X2NvbXB1 dGVfd20oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICp3bV9zdGF0ZSA9ICZjcnRjLT53 bV9zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOwotCWludCBzcl9maWZvX3NpemUg PSBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcyAqIDUxMiAtIDE7CisJaW50IHNyX2ZpZm9fc2l6 ZSA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgKiA1MTIgLSAxOwogCWludCBsZXZl bDsKIAogCW1lbXNldCh3bV9zdGF0ZSwgMCwgc2l6ZW9mKCp3bV9zdGF0ZSkpOwogCiAJd21fc3Rh dGUtPmN4c3IgPSBjcnRjLT5waXBlICE9IFBJUEVfQyAmJiBjcnRjLT53bS5jeHNyX2FsbG93ZWQ7 Ci0Jd21fc3RhdGUtPm51bV9sZXZlbHMgPSB0b19pOTE1KGRldiktPndtLm1heF9sZXZlbCArIDE7 CisJd21fc3RhdGUtPm51bV9sZXZlbHMgPSBkZXZfcHJpdi0+d20ubWF4X2xldmVsICsgMTsKIAog CXdtX3N0YXRlLT5udW1fYWN0aXZlX3BsYW5lcyA9IDA7CiAKQEAgLTExNzksNyArMTE4MSw3IEBA IHN0YXRpYyB2b2lkIHZsdl9jb21wdXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCX0K IAogCS8qIGNsZWFyIGFueSAocGFydGlhbGx5KSBmaWxsZWQgaW52YWxpZCBsZXZlbHMgKi8KLQlm b3IgKGxldmVsID0gd21fc3RhdGUtPm51bV9sZXZlbHM7IGxldmVsIDwgdG9faTkxNShkZXYpLT53 bS5tYXhfbGV2ZWwgKyAxOyBsZXZlbCsrKSB7CisJZm9yIChsZXZlbCA9IHdtX3N0YXRlLT5udW1f bGV2ZWxzOyBsZXZlbCA8IGRldl9wcml2LT53bS5tYXhfbGV2ZWwgKyAxOyBsZXZlbCsrKSB7CiAJ CW1lbXNldCgmd21fc3RhdGUtPndtW2xldmVsXSwgMCwgc2l6ZW9mKHdtX3N0YXRlLT53bVtsZXZl bF0pKTsKIAkJbWVtc2V0KCZ3bV9zdGF0ZS0+c3JbbGV2ZWxdLCAwLCBzaXplb2Yod21fc3RhdGUt PnNyW2xldmVsXSkpOwogCX0KQEAgLTE5MjAsNyArMTkyMiw3IEBAIHN0YXRpYyB1bnNpZ25lZCBp bnQgaWxrX3BsYW5lX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJLyog SFNXIGFsbG93cyBMUDErIHdhdGVybWFya3MgZXZlbiB3aXRoIG11bHRpcGxlIHBpcGVzICovCiAJ aWYgKGxldmVsID09IDAgfHwgY29uZmlnLT5udW1fcGlwZXNfYWN0aXZlID4gMSkgewotCQlmaWZv X3NpemUgLz0gSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXM7CisJCWZpZm9fc2l6ZSAvPSBJTlRF TF9JTkZPKHRvX2k5MTUoZGV2KSktPm51bV9waXBlczsKIAogCQkvKgogCQkgKiBGb3Igc29tZSBy ZWFzb24gdGhlIG5vbiBzZWxmIHJlZnJlc2gKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK