From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/5] drm/i915: Pass dev_priv to INTEL_INFO everywhere apart from the gen use Date: Fri, 4 Nov 2016 14:42:47 +0000 Message-ID: <1478270568-7902-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1478270568-7902-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-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 859F86E9AE for ; Fri, 4 Nov 2016 14:43:04 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id p190so4248298wmp.1 for ; Fri, 04 Nov 2016 07:43:04 -0700 (PDT) In-Reply-To: <1478270568-7902-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFmdGVyIHRo aXMgcGF0Y2ggb25seSBjb252ZXJzaW9uIG9mIElOVEVMX0lORk8ocCktPmdlbiB0bwpJTlRFTF9H RU4oZGV2X3ByaXYpIHJlbWFpbnMgYmVmb3JlIHRoZSBfX0k5MTVfXyBtYWNybyBjYW4KYmUgcmVt b3ZlZC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgIHwgIDQgKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgIHwgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgICB8IDMxICsrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI4ICsrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2 LmMgICB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAg ICB8ICA3ICsrKystLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgNDMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggNzljZWE0OTE4M2IzLi4zNTk0 MDE5MmU1NjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTUwLDcgKzE1MCw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBJ biBhbGwgY3VycmVudCBjYXNlcywgbnVtX3BpcGVzIGlzIGVxdWl2YWxlbnQgdG8gdGhlIFBDSF9O T1Agc2V0dGluZwogCSAqICh3aGljaCByZWFsbHkgYW1vdW50cyB0byBhIFBDSCBidXQgbm8gU291 dGggRGlzcGxheSkuCiAJICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzID09IDAp IHsKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAwKSB7CiAJCWRldl9w cml2LT5wY2hfdHlwZSA9IFBDSF9OT1A7CiAJCXJldHVybjsKIAl9CkBAIC02MDcsNyArNjA3LDcg QEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAlpbnRlbF9tb2Rlc2V0X2dlbV9pbml0KGRldik7CiAKLQlpZiAoSU5URUxfSU5GTyhk ZXYpLT5udW1fcGlwZXMgPT0gMCkKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBl cyA9PSAwKQogCQlyZXR1cm4gMDsKIAogCXJldCA9IGludGVsX2ZiZGV2X2luaXQoZGV2KTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggY2FkNmRlNjU5NDdkLi5iOThmMTE3MzVj NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC03MTQsNyArNzE0LDcgQEAg c3RhdGljIGludCBnZW44XzQ4Yl9tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LAogICovCiBzdGF0aWMgdm9pZCBtYXJrX3RsYnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQg KnBwZ3R0KQogewotCXBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyA9IElOVEVMX0lORk8ocHBndHQtPmJh c2UuZGV2KS0+cmluZ19tYXNrOworCXBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyA9IElOVEVMX0lORk8o dG9faTkxNShwcGd0dC0+YmFzZS5kZXYpKS0+cmluZ19tYXNrOwogfQogCiAvKiBSZW1vdmVzIGVu dHJpZXMgZnJvbSBhIHNpbmdsZSBwYWdlIHRhYmxlLCByZWxlYXNpbmcgaXQgaWYgaXQncyBlbXB0 eS4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCmluZGV4IDQ0NTEwODg1NTI3NS4uMzc4NDk0 MGE0ZTdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKQEAgLTM0NSwxMSArMzQ1LDEw IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfbG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSkKIHN0YXRpYyB2b2lkIGJyb2Fkd2VsbF9sb2FkX2x1dHMoc3RydWN0IGRybV9j cnRjX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+Y3J0 YzsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CiAJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShzdGF0ZSk7CiAJZW51bSBw aXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwotCXVpbnQzMl90IGksIGx1dF9z aXplID0gSU5URUxfSU5GTyhkZXYpLT5jb2xvci5kZWdhbW1hX2x1dF9zaXplOworCXVpbnQzMl90 IGksIGx1dF9zaXplID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmRlZ2FtbWFfbHV0X3Np emU7CiAKIAlpZiAoY3J0Y19zdGF0ZV9pc19sZWdhY3koc3RhdGUpKSB7CiAJCWhhc3dlbGxfbG9h ZF9sdXRzKHN0YXRlKTsKQEAgLTQyOCw4ICs0MjcsNyBAQCBzdGF0aWMgdm9pZCBicm9hZHdlbGxf bG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCiBzdGF0aWMgdm9pZCBjaGVy cnl2aWV3X2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQogewogCXN0cnVj dCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0 Yy0+ZGV2KTsKIAllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7CiAJ c3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dDsKIAl1aW50MzJfdCBpLCBsdXRfc2l6ZTsKQEAgLTQ0 Niw3ICs0NDQsNyBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X2xvYWRfbHV0cyhzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKnN0YXRlKQogCiAJaWYgKHN0YXRlLT5kZWdhbW1hX2x1dCkgewogCQlsdXQg PSAoc3RydWN0IGRybV9jb2xvcl9sdXQgKikgc3RhdGUtPmRlZ2FtbWFfbHV0LT5kYXRhOwotCQls dXRfc2l6ZSA9IElOVEVMX0lORk8oZGV2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsKKwkJbHV0 X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsKIAkJ Zm9yIChpID0gMDsgaSA8IGx1dF9zaXplOyBpKyspIHsKIAkJCS8qIFdyaXRlIExVVCBpbiBVMC4x NCBmb3JtYXQuICovCiAJCQl3b3JkMCA9CkBAIC00NjEsNyArNDU5LDcgQEAgc3RhdGljIHZvaWQg Y2hlcnJ5dmlld19sb2FkX2x1dHMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIAogCWlm IChzdGF0ZS0+Z2FtbWFfbHV0KSB7CiAJCWx1dCA9IChzdHJ1Y3QgZHJtX2NvbG9yX2x1dCAqKSBz dGF0ZS0+Z2FtbWFfbHV0LT5kYXRhOwotCQlsdXRfc2l6ZSA9IElOVEVMX0lORk8oZGV2KS0+Y29s b3IuZ2FtbWFfbHV0X3NpemU7CisJCWx1dF9zaXplID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmNv bG9yLmdhbW1hX2x1dF9zaXplOwogCQlmb3IgKGkgPSAwOyBpIDwgbHV0X3NpemU7IGkrKykgewog CQkJLyogV3JpdGUgTFVUIGluIFUwLjEwIGZvcm1hdC4gKi8KIAkJCXdvcmQwID0KQEAgLTQ5Nywx MiArNDk1LDEyIEBAIHZvaWQgaW50ZWxfY29sb3JfbG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIGludCBpbnRlbF9jb2xvcl9jaGVjayhzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCSAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKIAlzaXplX3QgZ2FtbWFfbGVuZ3Ro LCBkZWdhbW1hX2xlbmd0aDsKIAotCWRlZ2FtbWFfbGVuZ3RoID0gSU5URUxfSU5GTyhkZXYpLT5j b2xvci5kZWdhbW1hX2x1dF9zaXplICoKKwlkZWdhbW1hX2xlbmd0aCA9IElOVEVMX0lORk8oZGV2 X3ByaXYpLT5jb2xvci5kZWdhbW1hX2x1dF9zaXplICoKIAkJc2l6ZW9mKHN0cnVjdCBkcm1fY29s b3JfbHV0KTsKLQlnYW1tYV9sZW5ndGggPSBJTlRFTF9JTkZPKGRldiktPmNvbG9yLmdhbW1hX2x1 dF9zaXplICoKKwlnYW1tYV9sZW5ndGggPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZ2Ft bWFfbHV0X3NpemUgKgogCQlzaXplb2Yoc3RydWN0IGRybV9jb2xvcl9sdXQpOwogCiAJLyoKQEAg LTUyOSw4ICs1MjcsNyBAQCBpbnQgaW50ZWxfY29sb3JfY2hlY2soc3RydWN0IGRybV9jcnRjICpj cnRjLAogCiB2b2lkIGludGVsX2NvbG9yX2luaXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKIAogCWRybV9tb2RlX2NydGNfc2V0X2dh bW1hX3NpemUoY3J0YywgMjU2KTsKIApAQCAtNTQ5LDEwICs1NDYsMTAgQEAgdm9pZCBpbnRlbF9j b2xvcl9pbml0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiAKIAkvKiBFbmFibGUgY29sb3Ig bWFuYWdlbWVudCBzdXBwb3J0IHdoZW4gd2UgaGF2ZSBkZWdhbW1hICYgZ2FtbWEgTFVUcy4gKi8K LQlpZiAoSU5URUxfSU5GTyhkZXYpLT5jb2xvci5kZWdhbW1hX2x1dF9zaXplICE9IDAgJiYKLQkg ICAgSU5URUxfSU5GTyhkZXYpLT5jb2xvci5nYW1tYV9sdXRfc2l6ZSAhPSAwKQorCWlmIChJTlRF TF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZSAhPSAwICYmCisJICAgIElO VEVMX0lORk8oZGV2X3ByaXYpLT5jb2xvci5nYW1tYV9sdXRfc2l6ZSAhPSAwKQogCQlkcm1fY3J0 Y19lbmFibGVfY29sb3JfbWdtdChjcnRjLAotCQkJCQlJTlRFTF9JTkZPKGRldiktPmNvbG9yLmRl Z2FtbWFfbHV0X3NpemUsCi0JCQkJCXRydWUsCi0JCQkJCUlOVEVMX0lORk8oZGV2KS0+Y29sb3Iu Z2FtbWFfbHV0X3NpemUpOworCQkJCQkgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZGVn YW1tYV9sdXRfc2l6ZSwKKwkJCQkJICAgdHJ1ZSwKKwkJCQkJICAgSU5URUxfSU5GTyhkZXZfcHJp diktPmNvbG9yLmdhbW1hX2x1dF9zaXplKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBiZjgwOTllZDBiMjAuLmFhZDI2NDU4MzM3OCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtNzA1Nyw3ICs3MDU3LDcgQEAgc3RhdGljIGludCBpcm9ubGFr ZV9jaGVja19mZGlfbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUs CiAJCX0KIAl9CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMgPT0gMikKKwlpZiAo SU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAyKQogCQlyZXR1cm4gMDsKIAogCS8q IEl2eWJyaWRnZSAzIHBpcGUgaXMgcmVhbGx5IGNvbXBsaWNhdGVkICovCkBAIC0xNDcwNiw4ICsx NDcwNiw3IEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiB7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPQogCQl0b19pbnRl bF9hdG9taWNfc3RhdGUobmV3X3N0YXRlLT5zdGF0ZSk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo cGxhbmUtPmRldik7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBuZXdfc3RhdGUtPmZi OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKHBsYW5l LT5zdGF0ZS0+ZmIpOwpAQCAtMTQ3NjQsNyArMTQ3NjMsNyBAQCBpbnRlbF9wcmVwYXJlX3BsYW5l X2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCX0KIAogCWlmIChwbGFuZS0+dHlwZSA9PSBE Uk1fUExBTkVfVFlQRV9DVVJTT1IgJiYKLQkgICAgSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVl ZHNfcGh5c2ljYWwpIHsKKwkgICAgSU5URUxfSU5GTyhkZXZfcHJpdiktPmN1cnNvcl9uZWVkc19w aHlzaWNhbCkgewogCQlpbnQgYWxpZ24gPSBJU19JODMwKGRldl9wcml2KSA/IDE2ICogMTAyNCA6 IDI1NjsKIAkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2F0dGFjaF9waHlzKG9iaiwgYWxpZ24pOwog CQlpZiAocmV0KSB7CkBAIC0xNDc5Nyw3ICsxNDc5Niw3IEBAIHZvaWQKIGludGVsX2NsZWFudXBf cGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX3Bs YW5lX3N0YXRlICpvbGRfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5l LT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFu ZS0+ZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9pbnRlbF9zdGF0ZTsKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX2ZiX29iaihvbGRfc3Rh dGUtPmZiKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2Jq KHBsYW5lLT5zdGF0ZS0+ZmIpOwpAQCAtMTQ4MDgsNyArMTQ4MDcsNyBAQCBpbnRlbF9jbGVhbnVw X3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlyZXR1cm47CiAKIAlpZiAob2xk X29iaiAmJiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SIHx8Ci0JICAgICFJ TlRFTF9JTkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkpCisJICAgICFJTlRFTF9JTkZP KGRldl9wcml2KS0+Y3Vyc29yX25lZWRzX3BoeXNpY2FsKSkKIAkJaW50ZWxfdW5waW5fZmJfb2Jq KG9sZF9zdGF0ZS0+ZmIsIG9sZF9zdGF0ZS0+cm90YXRpb24pOwogfQogCkBAIC0xNTEzMywxMyAr MTUxMzIsMTMgQEAgaW50ZWxfdXBkYXRlX2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjcnRjX3N0YXRlLT5iYXNlLmNydGM7 CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmRldik7CiAJc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihzdGF0ZS0+YmFzZS5mYik7CiAJdWludDMy X3QgYWRkcjsKIAogCWlmICghb2JqKQogCQlhZGRyID0gMDsKLQllbHNlIGlmICghSU5URUxfSU5G TyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpCisJZWxzZSBpZiAoIUlOVEVMX0lORk8oZGV2 X3ByaXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpCiAJCWFkZHIgPSBpOTE1X2dlbV9vYmplY3Rf Z2d0dF9vZmZzZXQob2JqLCBOVUxMKTsKIAllbHNlCiAJCWFkZHIgPSBvYmotPnBoeXNfaGFuZGxl LT5idXNhZGRyOwpAQCAtMTY0MjEsNyArMTY0MjAsNyBAQCBpbnQgaW50ZWxfbW9kZXNldF9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9pbml0X3BtKGRldl9wcml2KTsKIAot CWlmIChJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcyA9PSAwKQorCWlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+bnVtX3BpcGVzID09IDApCiAJCXJldHVybiAwOwogCiAJLyoKQEAgLTE2NDY3LDgg KzE2NDY2LDggQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWRldi0+bW9kZV9jb25maWcuZmJfYmFzZSA9IGdndHQtPm1hcHBhYmxlX2Jhc2U7CiAKIAlE Uk1fREVCVUdfS01TKCIlZCBkaXNwbGF5IHBpcGUlcyBhdmFpbGFibGUuXG4iLAotCQkgICAgICBJ TlRFTF9JTkZPKGRldiktPm51bV9waXBlcywKLQkJICAgICAgSU5URUxfSU5GTyhkZXYpLT5udW1f cGlwZXMgPiAxID8gInMiIDogIiIpOworCQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVt X3BpcGVzLAorCQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID4gMSA/ICJz IiA6ICIiKTsKIAogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKIAkJaW50IHJldDsK QEAgLTE2NTU2LDExICsxNjU1NSwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfcGlwZV9h KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiBzdGF0aWMgYm9vbAogaW50ZWxfY2hlY2tfcGxhbmVf bWFwcGluZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gY3J0Yy0+YmFzZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCXUzMiB2YWw7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYp LT5udW1fcGlwZXMgPT0gMSkKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9 PSAxKQogCQlyZXR1cm4gdHJ1ZTsKIAogCXZhbCA9IEk5MTVfUkVBRChEU1BDTlRSKCFjcnRjLT5w bGFuZSkpOwpAQCAtMTczMTMsNyArMTczMTEsNyBAQCBpbnRlbF9kaXNwbGF5X3ByaW50X2Vycm9y X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJaWYgKCFlcnJvcikK IAkJcmV0dXJuOwogCi0JZXJyX3ByaW50ZihtLCAiTnVtIFBpcGVzOiAlZFxuIiwgSU5URUxfSU5G TyhkZXYpLT5udW1fcGlwZXMpOworCWVycl9wcmludGYobSwgIk51bSBQaXBlczogJWRcbiIsIElO VEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMpOwogCWlmIChJU19IQVNXRUxMKGRldl9wcml2 KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQllcnJfcHJpbnRmKG0sICJQV1JfV0VMTF9D VEwyOiAlMDh4XG4iLAogCQkJICAgZXJyb3ItPnBvd2VyX3dlbGxfZHJpdmVyKTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IGI3MDk4Zjk4YmI2Ny4uZTNjZjY1NWJlYzNiIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTM1OSw3ICszNTksNyBAQCBzdGF0aWMgYm9v bCBpbnRlbF9mYl9pbml0aWFsX2NvbmZpZyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVy LAogCQkJCSAgICBzdHJ1Y3QgZHJtX2ZiX29mZnNldCAqb2Zmc2V0cywKIAkJCQkgICAgYm9vbCAq ZW5hYmxlZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBmYl9oZWxwZXItPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGZiX2hlbHBlci0+ZGV2KTsKIAl1bnNpZ25lZCBsb25nIGNvbm5fY29uZmlndXJl ZCwgbWFzazsKIAl1bnNpZ25lZCBpbnQgY291bnQgPSBtaW4oZmJfaGVscGVyLT5jb25uZWN0b3Jf Y291bnQsIEJJVFNfUEVSX0xPTkcpOwogCWludCBpLCBqOwpAQCAtNTEyLDcgKzUxMiw3IEBAIHN0 YXRpYyBib29sIGludGVsX2ZiX2luaXRpYWxfY29uZmlnKHN0cnVjdCBkcm1fZmJfaGVscGVyICpm Yl9oZWxwZXIsCiAJICogZmJkZXYgaGVscGVyIGxpYnJhcnkuCiAJICovCiAJaWYgKG51bV9jb25u ZWN0b3JzX2VuYWJsZWQgIT0gbnVtX2Nvbm5lY3RvcnNfZGV0ZWN0ZWQgJiYKLQkgICAgbnVtX2Nv bm5lY3RvcnNfZW5hYmxlZCA8IElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzKSB7CisJICAgIG51 bV9jb25uZWN0b3JzX2VuYWJsZWQgPCBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzKSB7 CiAJCURSTV9ERUJVR19LTVMoImZhbGxiYWNrOiBOb3QgYWxsIG91dHB1dHMgZW5hYmxlZFxuIik7 CiAJCURSTV9ERUJVR19LTVMoIkVuYWJsZWQ6ICVpLCBkZXRlY3RlZDogJWlcbiIsIG51bV9jb25u ZWN0b3JzX2VuYWJsZWQsCiAJCQkgICAgICBudW1fY29ubmVjdG9yc19kZXRlY3RlZCk7CkBAIC03 MDAsMTEgKzcwMCwxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmRldl9zdXNwZW5kX3dvcmtlcihz dHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAKIGludCBpbnRlbF9mYmRldl9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBpbnRl bF9mYmRldiAqaWZiZGV2OwogCWludCByZXQ7CiAKLQlpZiAoV0FSTl9PTihJTlRFTF9JTkZPKGRl diktPm51bV9waXBlcyA9PSAwKSkKKwlpZiAoV0FSTl9PTihJTlRFTF9JTkZPKGRldl9wcml2KS0+ bnVtX3BpcGVzID09IDApKQogCQlyZXR1cm4gLUVOT0RFVjsKIAogCWlmYmRldiA9IGt6YWxsb2Mo c2l6ZW9mKHN0cnVjdCBpbnRlbF9mYmRldiksIEdGUF9LRVJORUwpOwpAQCAtNzE3LDcgKzcxNyw3 IEBAIGludCBpbnRlbF9mYmRldl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmYmRl di0+cHJlZmVycmVkX2JwcCA9IDMyOwogCiAJcmV0ID0gZHJtX2ZiX2hlbHBlcl9pbml0KGRldiwg JmlmYmRldi0+aGVscGVyLAotCQkJCSBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcywgNCk7CisJ CQkJIElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMsIDQpOwogCWlmIChyZXQpIHsKIAkJ a2ZyZWUoaWZiZGV2KTsKIAkJcmV0dXJuIHJldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4 IDg4ZTI4Yzk4OWI5Yy4uNDUxMjA2OWU0NTU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg LTEwNjEsNyArMTA2MSw4IEBAIHN0YXRpYyB2b2lkIHZsdl9pbnZlcnRfd21zKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKQogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgd21fc3RhdGUtPm51bV9s ZXZlbHM7IGxldmVsKyspIHsKIAkJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2Uu ZGV2OwotCQljb25zdCBpbnQgc3JfZmlmb19zaXplID0gSU5URUxfSU5GTyhkZXYpLT5udW1fcGlw ZXMgKiA1MTIgLSAxOworCQljb25zdCBpbnQgc3JfZmlmb19zaXplID0KKwkJCUlOVEVMX0lORk8o dG9faTkxNShkZXYpKS0+bnVtX3BpcGVzICogNTEyIC0gMTsKIAkJc3RydWN0IGludGVsX3BsYW5l ICpwbGFuZTsKIAogCQl3bV9zdGF0ZS0+c3JbbGV2ZWxdLnBsYW5lID0gc3JfZmlmb19zaXplIC0g d21fc3RhdGUtPnNyW2xldmVsXS5wbGFuZTsKQEAgLTEwOTMsNyArMTA5NCw3IEBAIHN0YXRpYyB2 b2lkIHZsdl9jb21wdXRlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICp3bV9z dGF0ZSA9ICZjcnRjLT53bV9zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOwotCWlu dCBzcl9maWZvX3NpemUgPSBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcyAqIDUxMiAtIDE7CisJ aW50IHNyX2ZpZm9fc2l6ZSA9IElOVEVMX0lORk8odG9faTkxNShkZXYpKS0+bnVtX3BpcGVzICog NTEyIC0gMTsKIAlpbnQgbGV2ZWw7CiAKIAltZW1zZXQod21fc3RhdGUsIDAsIHNpemVvZigqd21f c3RhdGUpKTsKQEAgLTE5MjAsNyArMTkyMSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaWxrX3Bs YW5lX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJLyogSFNXIGFsbG93 cyBMUDErIHdhdGVybWFya3MgZXZlbiB3aXRoIG11bHRpcGxlIHBpcGVzICovCiAJaWYgKGxldmVs ID09IDAgfHwgY29uZmlnLT5udW1fcGlwZXNfYWN0aXZlID4gMSkgewotCQlmaWZvX3NpemUgLz0g SU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXM7CisJCWZpZm9fc2l6ZSAvPSBJTlRFTF9JTkZPKHRv X2k5MTUoZGV2KSktPm51bV9waXBlczsKIAogCQkvKgogCQkgKiBGb3Igc29tZSByZWFzb24gdGhl IG5vbiBzZWxmIHJlZnJlc2gKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK