From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3658EC433E1 for ; Thu, 25 Mar 2021 21:48:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2F36619BA for ; Thu, 25 Mar 2021 21:48:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2F36619BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 789246EE58; Thu, 25 Mar 2021 21:48:28 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id D93E96EE57 for ; Thu, 25 Mar 2021 21:48:27 +0000 (UTC) IronPort-SDR: HgXeoOlnh4qwM2xGZqTelH+Zx6lCVzTsoKSqV3m2L6J8oY/ZTKFHFksGF6AzUa63FIk/A5OjDS oerKBM4ejXEA== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="171005066" X-IronPort-AV: E=Sophos;i="5.81,278,1610438400"; d="scan'208";a="171005066" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 14:48:27 -0700 IronPort-SDR: gUuV4wXDd3BcOD3hFetDm27+BBLsY5J15Dzib7RV8oh+6kyYtoGi5td0KDWUkGI5h5DnJJaEFX QtplM/Pt38vw== X-IronPort-AV: E=Sophos;i="5.81,278,1610438400"; d="scan'208";a="375235664" Received: from ideak-desk.fi.intel.com ([10.237.68.141]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 14:48:26 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Thu, 25 Mar 2021 23:47:55 +0200 Message-Id: <20210325214808.2071517-13-imre.deak@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210325214808.2071517-1-imre.deak@intel.com> References: <20210325214808.2071517-1-imre.deak@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 12/25] drm/i915/intel_fb: s/dev_priv/i915/ X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" UmVuYW1lIGRldl9wcml2IHRvIGk5MTUgaW4gdGhlIGludGVsX2ZiLltjaF0gZmlsZXMuCgpTaWdu ZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmIuYyB8IDY2ICsrKysrKysrKysrKy0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmIuaCB8ICA2ICst LQogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiLmMKaW5kZXggOGNjOTNkODlmYzBhYS4u ZjQ1NzlmMzA2NzMzZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9mYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmIuYwpA QCAtODAsOSArODAsOSBAQCBpbnQgc2tsX21haW5fdG9fYXV4X3BsYW5lKGNvbnN0IHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiLCBpbnQgbWFpbl9wbGFuZSkKIAkJcmV0dXJuIDA7CiB9CiAKLXVu c2lnbmVkIGludCBpbnRlbF90aWxlX3NpemUoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQordW5zaWduZWQgaW50IGludGVsX3RpbGVfc2l6ZShjb25zdCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlyZXR1cm4gSVNfRElTUExBWV9WRVIoZGV2X3ByaXYs IDIpID8gMjA0OCA6IDQwOTY7CisJcmV0dXJuIElTX0RJU1BMQVlfVkVSKGk5MTUsIDIpID8gMjA0 OCA6IDQwOTY7CiB9CiAKIHVuc2lnbmVkIGludCBpbnRlbF90aWxlX2hlaWdodChjb25zdCBzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IGNvbG9yX3BsYW5lKQpAQCAtMTE1LDEzICsxMTUs MTMgQEAgdW5zaWduZWQgaW50IGludGVsX3RpbGVfcm93X3NpemUoY29uc3Qgc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIsIGludCBjb2xvcl9wbGEKIAlyZXR1cm4gZmItPnBpdGNoZXNbY29sb3Jf cGxhbmVdICogdGlsZV9oZWlnaHQ7CiB9CiAKLXVuc2lnbmVkIGludCBpbnRlbF9jdXJzb3JfYWxp Z25tZW50KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3Vuc2lnbmVk IGludCBpbnRlbF9jdXJzb3JfYWxpZ25tZW50KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1KQogewotCWlmIChJU19JODMwKGRldl9wcml2KSkKKwlpZiAoSVNfSTgzMChpOTE1KSkK IAkJcmV0dXJuIDE2ICogMTAyNDsKLQllbHNlIGlmIChJU19JODVYKGRldl9wcml2KSkKKwllbHNl IGlmIChJU19JODVYKGk5MTUpKQogCQlyZXR1cm4gMjU2OwotCWVsc2UgaWYgKElTX0k4NDVHKGRl dl9wcml2KSB8fCBJU19JODY1RyhkZXZfcHJpdikpCisJZWxzZSBpZiAoSVNfSTg0NUcoaTkxNSkg fHwgSVNfSTg2NUcoaTkxNSkpCiAJCXJldHVybiAzMjsKIAllbHNlCiAJCXJldHVybiA0ICogMTAy NDsKQEAgLTIxNiwxNiArMjE2LDE2IEBAIHN0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X2FsaWduZWRf b2Zmc2V0KGludCAqeCwgaW50ICp5LAogCQkJCSAgICAgICB1bnNpZ25lZCBpbnQgcGl0Y2gsCiAJ CQkJICAgICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIgbmV3X29mZnNldCkKIHsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGZiLT5kZXYpOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1ID0gdG9faTkxNShmYi0+ZGV2KTsKIAl1bnNpZ25lZCBpbnQgY3Bw ID0gZmItPmZvcm1hdC0+Y3BwW2NvbG9yX3BsYW5lXTsKIAotCWRybV9XQVJOX09OKCZkZXZfcHJp di0+ZHJtLCBuZXdfb2Zmc2V0ID4gb2xkX29mZnNldCk7CisJZHJtX1dBUk5fT04oJmk5MTUtPmRy bSwgbmV3X29mZnNldCA+IG9sZF9vZmZzZXQpOwogCiAJaWYgKCFpc19zdXJmYWNlX2xpbmVhcihm YiwgY29sb3JfcGxhbmUpKSB7CiAJCXVuc2lnbmVkIGludCB0aWxlX3NpemUsIHRpbGVfd2lkdGgs IHRpbGVfaGVpZ2h0OwogCQl1bnNpZ25lZCBpbnQgcGl0Y2hfdGlsZXM7CiAKLQkJdGlsZV9zaXpl ID0gaW50ZWxfdGlsZV9zaXplKGRldl9wcml2KTsKKwkJdGlsZV9zaXplID0gaW50ZWxfdGlsZV9z aXplKGk5MTUpOwogCQlpbnRlbF90aWxlX2RpbXMoZmIsIGNvbG9yX3BsYW5lLCAmdGlsZV93aWR0 aCwgJnRpbGVfaGVpZ2h0KTsKIAogCQlpZiAoZHJtX3JvdGF0aW9uXzkwX29yXzI3MChyb3RhdGlv bikpIHsKQEAgLTI3Nyw3ICsyNzcsNyBAQCB1MzIgaW50ZWxfcGxhbmVfYWRqdXN0X2FsaWduZWRf b2Zmc2V0KGludCAqeCwgaW50ICp5LAogICogdXNlZC4gVGhpcyBpcyB3aHkgdGhlIHVzZXIgaGFz IHRvIHBhc3MgaW4gdGhlIHBpdGNoIHNpbmNlIGl0CiAgKiBpcyBzcGVjaWZpZWQgaW4gdGhlIHJv dGF0ZWQgb3JpZW50YXRpb24uCiAgKi8KLXN0YXRpYyB1MzIgaW50ZWxfY29tcHV0ZV9hbGlnbmVk X29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCitzdGF0aWMgdTMyIGlu dGVsX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUs CiAJCQkJCWludCAqeCwgaW50ICp5LAogCQkJCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiwKIAkJCQkJaW50IGNvbG9yX3BsYW5lLApAQCAtMjkyLDcgKzI5Miw3IEBAIHN0YXRpYyB1 MzIgaW50ZWxfY29tcHV0ZV9hbGlnbmVkX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCXVuc2lnbmVkIGludCB0aWxlX3NpemUsIHRpbGVfd2lkdGgsIHRpbGVfaGVp Z2h0OwogCQl1bnNpZ25lZCBpbnQgdGlsZV9yb3dzLCB0aWxlcywgcGl0Y2hfdGlsZXM7CiAKLQkJ dGlsZV9zaXplID0gaW50ZWxfdGlsZV9zaXplKGRldl9wcml2KTsKKwkJdGlsZV9zaXplID0gaW50 ZWxfdGlsZV9zaXplKGk5MTUpOwogCQlpbnRlbF90aWxlX2RpbXMoZmIsIGNvbG9yX3BsYW5lLCAm dGlsZV93aWR0aCwgJnRpbGVfaGVpZ2h0KTsKIAogCQlpZiAoZHJtX3JvdGF0aW9uXzkwX29yXzI3 MChyb3RhdGlvbikpIHsKQEAgLTMzNywxOCArMzM3LDE4IEBAIHUzMiBpbnRlbF9wbGFuZV9jb21w dXRlX2FsaWduZWRfb2Zmc2V0KGludCAqeCwgaW50ICp5LAogCQkJCSAgICAgICBpbnQgY29sb3Jf cGxhbmUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3Bs YW5lKHN0YXRlLT51YXBpLnBsYW5lKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGludGVsX3BsYW5lLT5iYXNlLmRldik7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUgPSB0b19pOTE1KGludGVsX3BsYW5lLT5iYXNlLmRldik7CiAJY29uc3Qgc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+aHcuZmI7CiAJdW5zaWduZWQgaW50IHJv dGF0aW9uID0gc3RhdGUtPmh3LnJvdGF0aW9uOwogCWludCBwaXRjaCA9IHN0YXRlLT5jb2xvcl9w bGFuZVtjb2xvcl9wbGFuZV0uc3RyaWRlOwogCXUzMiBhbGlnbm1lbnQ7CiAKIAlpZiAoaW50ZWxf cGxhbmUtPmlkID09IFBMQU5FX0NVUlNPUikKLQkJYWxpZ25tZW50ID0gaW50ZWxfY3Vyc29yX2Fs aWdubWVudChkZXZfcHJpdik7CisJCWFsaWdubWVudCA9IGludGVsX2N1cnNvcl9hbGlnbm1lbnQo aTkxNSk7CiAJZWxzZQogCQlhbGlnbm1lbnQgPSBpbnRlbF9zdXJmX2FsaWdubWVudChmYiwgY29s b3JfcGxhbmUpOwogCi0JcmV0dXJuIGludGVsX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoZGV2X3By aXYsIHgsIHksIGZiLCBjb2xvcl9wbGFuZSwKKwlyZXR1cm4gaW50ZWxfY29tcHV0ZV9hbGlnbmVk X29mZnNldChpOTE1LCB4LCB5LCBmYiwgY29sb3JfcGxhbmUsCiAJCQkJCSAgICBwaXRjaCwgcm90 YXRpb24sIGFsaWdubWVudCk7CiB9CiAKQEAgLTM1NywyMCArMzU3LDIwIEBAIHN0YXRpYyBpbnQg aW50ZWxfZmJfb2Zmc2V0X3RvX3h5KGludCAqeCwgaW50ICp5LAogCQkJCSBjb25zdCBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCQkgaW50IGNvbG9yX3BsYW5lKQogewotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZmItPmRldik7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB0b19pOTE1KGZiLT5kZXYpOwogCXVuc2lnbmVkIGludCBo ZWlnaHQ7CiAJdTMyIGFsaWdubWVudDsKIAotCWlmIChESVNQTEFZX1ZFUihkZXZfcHJpdikgPj0g MTIgJiYKKwlpZiAoRElTUExBWV9WRVIoaTkxNSkgPj0gMTIgJiYKIAkgICAgaXNfc2VtaXBsYW5h cl91dl9wbGFuZShmYiwgY29sb3JfcGxhbmUpKQogCQlhbGlnbm1lbnQgPSBpbnRlbF90aWxlX3Jv d19zaXplKGZiLCBjb2xvcl9wbGFuZSk7CiAJZWxzZSBpZiAoZmItPm1vZGlmaWVyICE9IERSTV9G T1JNQVRfTU9EX0xJTkVBUikKLQkJYWxpZ25tZW50ID0gaW50ZWxfdGlsZV9zaXplKGRldl9wcml2 KTsKKwkJYWxpZ25tZW50ID0gaW50ZWxfdGlsZV9zaXplKGk5MTUpOwogCWVsc2UKIAkJYWxpZ25t ZW50ID0gMDsKIAogCWlmIChhbGlnbm1lbnQgIT0gMCAmJiBmYi0+b2Zmc2V0c1tjb2xvcl9wbGFu ZV0gJSBhbGlnbm1lbnQpIHsKLQkJZHJtX2RiZ19rbXMoJmRldl9wcml2LT5kcm0sCisJCWRybV9k Ymdfa21zKCZpOTE1LT5kcm0sCiAJCQkgICAgIk1pc2FsaWduZWQgb2Zmc2V0IDB4JTA4eCBmb3Ig Y29sb3IgcGxhbmUgJWRcbiIsCiAJCQkgICAgZmItPm9mZnNldHNbY29sb3JfcGxhbmVdLCBjb2xv cl9wbGFuZSk7CiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzgyLDcgKzM4Miw3IEBAIHN0YXRpYyBp bnQgaW50ZWxfZmJfb2Zmc2V0X3RvX3h5KGludCAqeCwgaW50ICp5LAogCS8qIENhdGNoIHBvdGVu dGlhbCBvdmVyZmxvd3MgZWFybHkgKi8KIAlpZiAoYWRkX292ZXJmbG93c190KHUzMiwgbXVsX3Uz Ml91MzIoaGVpZ2h0LCBmYi0+cGl0Y2hlc1tjb2xvcl9wbGFuZV0pLAogCQkJICAgIGZiLT5vZmZz ZXRzW2NvbG9yX3BsYW5lXSkpIHsKLQkJZHJtX2RiZ19rbXMoJmRldl9wcml2LT5kcm0sCisJCWRy bV9kYmdfa21zKCZpOTE1LT5kcm0sCiAJCQkgICAgIkJhZCBvZmZzZXQgMHglMDh4IG9yIHBpdGNo ICVkIGZvciBjb2xvciBwbGFuZSAlZFxuIiwKIAkJCSAgICBmYi0+b2Zmc2V0c1tjb2xvcl9wbGFu ZV0sIGZiLT5waXRjaGVzW2NvbG9yX3BsYW5lXSwKIAkJCSAgICBjb2xvcl9wbGFuZSk7CkBAIC00 NDcsNyArNDQ3LDcgQEAgc3RhdGljIGludCBpbnRlbF9mYl9jaGVja19jY3NfeHkoc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciAqZmIsIGludCBjY3NfcGxhbmUsIGludAogc3RhdGljIGJvb2wgaW50ZWxf cGxhbmVfY2FuX3JlbWFwKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh dGUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5l X3N0YXRlLT51YXBpLnBsYW5lKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUgPSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7CiAJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+aHcuZmI7CiAJaW50IGk7CiAKQEAgLTQ2MSw3ICs0NjEs NyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wbGFuZV9jYW5fcmVtYXAoY29uc3Qgc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAkgKiBXb3VsZCBhbHNvIG5lZWQgdG8gZGVhbCB3 aXRoIHRoZSBmZW5jZSBQT1QgYWxpZ25tZW50CiAJICogYW5kIGdlbjIgMktpQiBHVFQgdGlsZSBz aXplLgogCSAqLwotCWlmIChESVNQTEFZX1ZFUihkZXZfcHJpdikgPCA0KQorCWlmIChESVNQTEFZ X1ZFUihpOTE1KSA8IDQpCiAJCXJldHVybiBmYWxzZTsKIAogCS8qCkBAIC00NzMsNyArNDczLDcg QEAgc3RhdGljIGJvb2wgaW50ZWxfcGxhbmVfY2FuX3JlbWFwKGNvbnN0IHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiAKIAkvKiBMaW5lYXIgbmVlZHMgYSBwYWdlIGFsaWdu ZWQgc3RyaWRlIGZvciByZW1hcHBpbmcgKi8KIAlpZiAoZmItPm1vZGlmaWVyID09IERSTV9GT1JN QVRfTU9EX0xJTkVBUikgewotCQl1bnNpZ25lZCBpbnQgYWxpZ25tZW50ID0gaW50ZWxfdGlsZV9z aXplKGRldl9wcml2KSAtIDE7CisJCXVuc2lnbmVkIGludCBhbGlnbm1lbnQgPSBpbnRlbF90aWxl X3NpemUoaTkxNSkgLSAxOwogCiAJCWZvciAoaSA9IDA7IGkgPCBmYi0+Zm9ybWF0LT5udW1fcGxh bmVzOyBpKyspIHsKIAkJCWlmIChmYi0+cGl0Y2hlc1tpXSAmIGFsaWdubWVudCkKQEAgLTU4MCwx NCArNTgwLDE0IEBAIHN0YXRpYyB1MzIgc2V0dXBfZmJfcm90YXRpb24oaW50IHBsYW5lLCBjb25z dCBzdHJ1Y3QgaW50ZWxfcmVtYXBwZWRfcGxhbmVfaW5mbyAqCiAJcmV0dXJuIHBsYW5lX2luZm8t PndpZHRoICogcGxhbmVfaW5mby0+aGVpZ2h0OwogfQogCi1pbnQgaW50ZWxfZmlsbF9mYl9pbmZv KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIpCitpbnQgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIHsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVi dWZmZXIgKmludGVsX2ZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoZmIpOwogCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXUzMiBndHRfb2Zmc2V0 X3JvdGF0ZWQgPSAwOwogCXVuc2lnbmVkIGludCBtYXhfc2l6ZSA9IDA7CiAJaW50IGksIG51bV9w bGFuZXMgPSBmYi0+Zm9ybWF0LT5udW1fcGxhbmVzOwotCXVuc2lnbmVkIGludCB0aWxlX3NpemUg PSBpbnRlbF90aWxlX3NpemUoZGV2X3ByaXYpOworCXVuc2lnbmVkIGludCB0aWxlX3NpemUgPSBp bnRlbF90aWxlX3NpemUoaTkxNSk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgbnVtX3BsYW5lczsgaSsr KSB7CiAJCXVuc2lnbmVkIGludCB3aWR0aCwgaGVpZ2h0OwpAQCAtNjEzLDcgKzYxMyw3IEBAIGlu dCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyCiAKIAkJcmV0ID0gaW50ZWxfZmJfb2Zmc2V0X3RvX3h5KCZ4 LCAmeSwgZmIsIGkpOwogCQlpZiAocmV0KSB7Ci0JCQlkcm1fZGJnX2ttcygmZGV2X3ByaXYtPmRy bSwKKwkJCWRybV9kYmdfa21zKCZpOTE1LT5kcm0sCiAJCQkJICAgICJiYWQgZmIgcGxhbmUgJWQg b2Zmc2V0OiAweCV4XG4iLAogCQkJCSAgICBpLCBmYi0+b2Zmc2V0c1tpXSk7CiAJCQlyZXR1cm4g cmV0OwpAQCAtNjM0LDcgKzYzNCw3IEBAIGludCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyCiAJCSAqLwog CQlpZiAoaSA9PSAwICYmIGk5MTVfZ2VtX29iamVjdF9pc190aWxlZChvYmopICYmCiAJCSAgICAo eCArIHdpZHRoKSAqIGNwcCA+IGZiLT5waXRjaGVzW2ldKSB7Ci0JCQlkcm1fZGJnX2ttcygmZGV2 X3ByaXYtPmRybSwKKwkJCWRybV9kYmdfa21zKCZpOTE1LT5kcm0sCiAJCQkJICAgICJiYWQgZmIg cGxhbmUgJWQgb2Zmc2V0OiAweCV4XG4iLAogCQkJCSAgICAgaSwgZmItPm9mZnNldHNbaV0pOwog CQkJcmV0dXJuIC1FSU5WQUw7CkBAIC02NDcsNyArNjQ3LDcgQEAgaW50IGludGVsX2ZpbGxfZmJf aW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIKIAkJaW50ZWxfZmItPm5vcm1hbFtpXS54ID0geDsKIAkJaW50ZWxfZmItPm5vcm1hbFtp XS55ID0geTsKIAotCQlvZmZzZXQgPSBpbnRlbF9jb21wdXRlX2FsaWduZWRfb2Zmc2V0KGRldl9w cml2LCAmeCwgJnksIGZiLCBpLAorCQlvZmZzZXQgPSBpbnRlbF9jb21wdXRlX2FsaWduZWRfb2Zm c2V0KGk5MTUsICZ4LCAmeSwgZmIsIGksCiAJCQkJCQkgICAgICBmYi0+cGl0Y2hlc1tpXSwKIAkJ CQkJCSAgICAgIERSTV9NT0RFX1JPVEFURV8wLAogCQkJCQkJICAgICAgdGlsZV9zaXplKTsKQEAg LTY5Miw3ICs2OTIsNyBAQCBpbnQgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlcgogCX0KIAogCWlmIChtdWxf dTMyX3UzMihtYXhfc2l6ZSwgdGlsZV9zaXplKSA+IG9iai0+YmFzZS5zaXplKSB7Ci0JCWRybV9k Ymdfa21zKCZkZXZfcHJpdi0+ZHJtLAorCQlkcm1fZGJnX2ttcygmaTkxNS0+ZHJtLAogCQkJICAg ICJmYiB0b28gYmlnIGZvciBibyAobmVlZCAlbGx1IGJ5dGVzLCBoYXZlICV6dSBieXRlcylcbiIs CiAJCQkgICAgbXVsX3UzMl91MzIobWF4X3NpemUsIHRpbGVfc2l6ZSksIG9iai0+YmFzZS5zaXpl KTsKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC03MDMsMTQgKzcwMywxNCBAQCBpbnQgaW50ZWxfZmls bF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGRybV9m cmFtZWJ1ZmZlcgogCiBzdGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9yZW1hcF9ndHQoc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPQorCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KIAkJdG9faTkx NShwbGFuZV9zdGF0ZS0+dWFwaS5wbGFuZS0+ZGV2KTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IHBsYW5lX3N0YXRlLT5ody5mYjsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmlu dGVsX2ZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoZmIpOwogCXN0cnVjdCBpbnRlbF9yb3RhdGlv bl9pbmZvICppbmZvID0gJnBsYW5lX3N0YXRlLT52aWV3LnJvdGF0ZWQ7CiAJdW5zaWduZWQgaW50 IHJvdGF0aW9uID0gcGxhbmVfc3RhdGUtPmh3LnJvdGF0aW9uOwogCWludCBpLCBudW1fcGxhbmVz ID0gZmItPmZvcm1hdC0+bnVtX3BsYW5lczsKLQl1bnNpZ25lZCBpbnQgdGlsZV9zaXplID0gaW50 ZWxfdGlsZV9zaXplKGRldl9wcml2KTsKKwl1bnNpZ25lZCBpbnQgdGlsZV9zaXplID0gaW50ZWxf dGlsZV9zaXplKGk5MTUpOwogCXVuc2lnbmVkIGludCBzcmNfeCwgc3JjX3k7CiAJdW5zaWduZWQg aW50IHNyY193LCBzcmNfaDsKIAl1MzIgZ3R0X29mZnNldCA9IDA7CkBAIC03MjQsNyArNzI0LDcg QEAgc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfcmVtYXBfZ3R0KHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGUpCiAJc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUt PnVhcGkuc3JjKSA+PiAxNjsKIAlzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUt PnVhcGkuc3JjKSA+PiAxNjsKIAotCWRybV9XQVJOX09OKCZkZXZfcHJpdi0+ZHJtLCBpc19jY3Nf bW9kaWZpZXIoZmItPm1vZGlmaWVyKSk7CisJZHJtX1dBUk5fT04oJmk5MTUtPmRybSwgaXNfY2Nz X21vZGlmaWVyKGZiLT5tb2RpZmllcikpOwogCiAJLyogTWFrZSBzcmMgY29vcmRpbmF0ZXMgcmVs YXRpdmUgdG8gdGhlIHZpZXdwb3J0ICovCiAJZHJtX3JlY3RfdHJhbnNsYXRlKCZwbGFuZV9zdGF0 ZS0+dWFwaS5zcmMsCkBAIC03NjAsMTIgKzc2MCwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wbGFu ZV9yZW1hcF9ndHQoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAkJeCAr PSBpbnRlbF9mYi0+bm9ybWFsW2ldLng7CiAJCXkgKz0gaW50ZWxfZmItPm5vcm1hbFtpXS55Owog Ci0JCW9mZnNldCA9IGludGVsX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoZGV2X3ByaXYsICZ4LCAm eSwKKwkJb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV9hbGlnbmVkX29mZnNldChpOTE1LCAmeCwgJnks CiAJCQkJCQkgICAgICBmYiwgaSwgZmItPnBpdGNoZXNbaV0sCiAJCQkJCQkgICAgICBEUk1fTU9E RV9ST1RBVEVfMCwgdGlsZV9zaXplKTsKIAkJb2Zmc2V0IC89IHRpbGVfc2l6ZTsKIAotCQlkcm1f V0FSTl9PTigmZGV2X3ByaXYtPmRybSwgaSA+PSBBUlJBWV9TSVpFKGluZm8tPnBsYW5lKSk7CisJ CWRybV9XQVJOX09OKCZpOTE1LT5kcm0sIGkgPj0gQVJSQVlfU0laRShpbmZvLT5wbGFuZSkpOwog CQlpbmZvLT5wbGFuZVtpXS5vZmZzZXQgPSBvZmZzZXQ7CiAJCWluZm8tPnBsYW5lW2ldLnN0cmlk ZSA9IERJVl9ST1VORF9VUChmYi0+cGl0Y2hlc1tpXSwKIAkJCQkJCSAgICAgdGlsZV93aWR0aCAq IGNwcCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Zi LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiLmgKaW5kZXggMDQyOTQ2 ZjQ1MmYwOS4uYmQxNTUxYzY5NGViMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9mYi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZmIuaApAQCAtMjgsMTEgKzI4LDExIEBAIGludCBtYWluX3RvX2Njc19wbGFuZShjb25zdCBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IG1haW5fcGxhbmUpOwogaW50IHNrbF9jY3Nf dG9fbWFpbl9wbGFuZShjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IGNjc19w bGFuZSk7CiBpbnQgc2tsX21haW5fdG9fYXV4X3BsYW5lKGNvbnN0IHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiLCBpbnQgbWFpbl9wbGFuZSk7CiAKLXVuc2lnbmVkIGludCBpbnRlbF90aWxlX3Np emUoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3Vuc2lnbmVkIGlu dCBpbnRlbF90aWxlX3NpemUoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpOwog dW5zaWduZWQgaW50IGludGVsX3RpbGVfaGVpZ2h0KGNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiLCBpbnQgY29sb3JfcGxhbmUpOwogdW5zaWduZWQgaW50IGludGVsX3RpbGVfcm93X3Np emUoY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBjb2xvcl9wbGFuZSk7CiAK LXVuc2lnbmVkIGludCBpbnRlbF9jdXJzb3JfYWxpZ25tZW50KGNvbnN0IHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7Cit1bnNpZ25lZCBpbnQgaW50ZWxfY3Vyc29yX2FsaWdubWVu dChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CiAKIHZvaWQgaW50ZWxfZmJf cGxhbmVfZ2V0X3N1YnNhbXBsaW5nKGludCAqaHN1YiwgaW50ICp2c3ViLAogCQkJCSAgICBjb25z dCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKQEAgLTQ4LDcgKzQ4LDcgQEAgdTMyIGludGVs X3BsYW5lX2NvbXB1dGVfYWxpZ25lZF9vZmZzZXQoaW50ICp4LCBpbnQgKnksCiAKIGludCBpbnRl bF9mYl9waXRjaChjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IGNvbG9yX3Bs YW5lLCB1bnNpZ25lZCBpbnQgcm90YXRpb24pOwogCi1pbnQgaW50ZWxfZmlsbF9mYl9pbmZvKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIpOworaW50IGludGVsX2ZpbGxfZmJfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpOwogdm9pZCBpbnRlbF9maWxsX2ZiX2dndHRf dmlldyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIGNvbnN0IHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiLAogCQkJICAgICB1bnNpZ25lZCBpbnQgcm90YXRpb24pOwogaW50IGludGVsX3Bs YW5lX2NvbXB1dGVfZ3R0KHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwot LSAKMi4yNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK