From: Tvrtko Ursulin Subject: [RFC 11/15] drm/i915: Use INTEL_GEN everywhere Date: Thu, 8 Feb 2018 13:06:02 +0000 Message-ID: <20180208130606.15556-12-tvrtko.ursulin@linux.intel.com> References: <20180208130606.15556-1-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-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71E4F6E60D for ; Thu, 8 Feb 2018 13:06:31 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id f6so4626646wra.6 for ; Thu, 08 Feb 2018 05:06:31 -0800 (PST) In-Reply-To: <20180208130606.15556-1-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvY2NpbmVs bGUgcGF0Y2g6CgogQEAKIGlkZW50aWZpZXIgcDsKIEBACiAtSU5URUxfSU5GTyhwKS0+Z2VuCiAr SU5URUxfR0VOKHApCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3Vs aW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAg ICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICB8ICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyAgfCAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Jpb3MuYyAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyAgICB8IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAg ICAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAgICAg IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuYyAgICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jICAgICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgIHwgIDggKysrKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Bzci5jICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYyAgICAgfCAgNiArKystLS0KIDE2IGZpbGVzIGNoYW5nZWQsIDI5IGluc2Vy dGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGMx YjgwY2Q1MmY5ZS4uMWQ1MjA4ZjI0YjYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTU0 MjAsMTAgKzU0MjAsMTAgQEAgaTkxNV9nZW1fbG9hZF9pbml0X2ZlbmNlcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IGk7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXZf cHJpdiktPmdlbiA+PSA3ICYmICFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJgorCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDcgJiYgIUlTX1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmCiAJICAg ICFJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzID0g MzI7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA0IHx8CisJZWxzZSBp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0IHx8CiAJCSBJU19JOTQ1RyhkZXZfcHJpdikgfHwg SVNfSTk0NUdNKGRldl9wcml2KSB8fAogCQkgSVNfRzMzKGRldl9wcml2KSB8fCBJU19QSU5FVklF VyhkZXZfcHJpdikpCiAJCWRldl9wcml2LT5udW1fZmVuY2VfcmVncyA9IDE2OwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA5NTVjZTdiZWU0NDguLjBjMGYxYWZmZGRhZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIxMDksNyArMjEwOSw3IEBAIHN0YXRp YyBpbnQgX19od19wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlwcGd0 dC0+YmFzZS5pOTE1ID0gZGV2X3ByaXY7CiAJcHBndHQtPmJhc2UuZG1hID0gJmRldl9wcml2LT5k cm0ucGRldi0+ZGV2OwogCi0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA4KQorCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkKIAkJcmV0dXJuIGdlbjZfcHBndHRfaW5pdChwcGd0 dCk7CiAJZWxzZQogCQlyZXR1cm4gZ2VuOF9wcGd0dF9pbml0KHBwZ3R0KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKaW5kZXggZDNmMjIyZmE2MzU2Li5mMThkYTllMmJlOGUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC0zNTYsNyArMzU2LDcg QEAgaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAlyZXNlcnZlZF9iYXNlID0gMDsKIAlyZXNlcnZlZF9zaXplID0gMDsKIAotCXN3aXRj aCAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbikgeworCXN3aXRjaCAoSU5URUxfR0VOKGRldl9w cml2KSkgewogCWNhc2UgMjoKIAljYXNlIDM6CiAJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F1ZGlvLmMKaW5kZXggNTIyZDU0ZmVjYjUzLi5mZjQ1NWM3MjQ3NzUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYwpAQCAtNzA0LDcgKzcwNCw3IEBAIHZvaWQgaW50ZWxfaW5pdF9hdWRp b19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNlIGlmIChJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlk ZXZfcHJpdi0+ZGlzcGxheS5hdWRpb19jb2RlY19lbmFibGUgPSBpbGtfYXVkaW9fY29kZWNfZW5h YmxlOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5hdWRpb19jb2RlY19kaXNhYmxlID0gaWxrX2F1ZGlv X2NvZGVjX2Rpc2FibGU7Ci0JfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJTlRF TF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDgpIHsKKwl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2 X3ByaXYpIHx8IElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQlkZXZfcHJpdi0+ZGlzcGxh eS5hdWRpb19jb2RlY19lbmFibGUgPSBoc3dfYXVkaW9fY29kZWNfZW5hYmxlOwogCQlkZXZfcHJp di0+ZGlzcGxheS5hdWRpb19jb2RlY19kaXNhYmxlID0gaHN3X2F1ZGlvX2NvZGVjX2Rpc2FibGU7 CiAJfSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkgewpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYmlvcy5jCmluZGV4IDRlNzRhYTJmMTZiYy4uYWE0ZGY2NTQ4NzcxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9iaW9zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYmlvcy5jCkBAIC0zOTEsNyArMzkxLDcgQEAgcGFyc2Vfc2R2b19wYW5lbF9kYXRh KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyBpbnQgaW50ZWxfYmlv c19zc2NfZnJlcXVlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkg ICAgYm9vbCBhbHRlcm5hdGUpCiB7Ci0Jc3dpdGNoIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2Vu KSB7CisJc3dpdGNoIChJTlRFTF9HRU4oZGV2X3ByaXYpKSB7CiAJY2FzZSAyOgogCQlyZXR1cm4g YWx0ZXJuYXRlID8gNjY2NjcgOiA0ODAwMDsKIAljYXNlIDM6CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y2RjbGsuYwppbmRleCBlZTc4OGQ1YmU1ZTMuLmFhYjZkMTUzOGZmZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jZGNsay5jCkBAIC0yMjMzLDcgKzIyMzMsNyBAQCBzdGF0aWMgaW50IGludGVsX2Nv bXB1dGVfbWF4X2RvdGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJl dHVybiBtYXhfY2RjbGtfZnJlcTsKIAllbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkK IAkJcmV0dXJuIG1heF9jZGNsa19mcmVxKjk1LzEwMDsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+Z2VuIDwgNCkKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkKIAkJ cmV0dXJuIDIqbWF4X2NkY2xrX2ZyZXEqOTAvMTAwOwogCWVsc2UKIAkJcmV0dXJuIG1heF9jZGNs a19mcmVxKjkwLzEwMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rk aS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggY2ZjZDljYjM3ZDVk Li44Y2EzNzZhY2E4YmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rk aS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0yMTUyLDcgKzIx NTIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfY2xrX3NlbGVjdChzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwKIAogCQlJOTE1X1dSSVRFKERQTExfQ1RSTDIsIHZhbCk7CiAKLQl9IGVs c2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA5KSB7CisJfSBlbHNlIGlmIChJTlRF TF9HRU4oZGV2X3ByaXYpIDwgOSkgewogCQlJOTE1X1dSSVRFKFBPUlRfQ0xLX1NFTChwb3J0KSwg aHN3X3BsbF90b19kZGlfcGxsX3NlbChwbGwpKTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCA2MGJhNWJiM2YzNGMuLjBkNTIwN2RiZmRhYyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjAyOSwxMiArMjAyOSwxMiBAQCBzdGF0aWMgdW5z aWduZWQgaW50IGludGVsX2N1cnNvcl9hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcgogCiBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2xpbmVhcl9hbGlnbm1l bnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlmIChJTlRF TF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDkpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OSkKIAkJcmV0dXJuIDI1NiAqIDEwMjQ7CiAJZWxzZSBpZiAoSVNfSTk2NUcoZGV2X3ByaXYpIHx8 IElTX0k5NjVHTShkZXZfcHJpdikgfHwKIAkJIElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlyZXR1cm4gMTI4ICogMTAyNDsKLQllbHNlIGlmIChJ TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDQpCisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA0KQogCQlyZXR1cm4gNCAqIDEwMjQ7CiAJZWxzZQogCQlyZXR1cm4gMDsKQEAgLTYz MDcsNyArNjMwNyw3IEBAIHN0YXRpYyBib29sIGludGVsX2NydGNfc3VwcG9ydHNfZG91YmxlX3dp ZGUoY29uc3Qgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAKIAkvKiBHREcg ZG91YmxlIHdpZGUgb24gZWl0aGVyIHBpcGUsIG90aGVyd2lzZSBwaXBlIEEgb25seSAqLwotCXJl dHVybiBJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgNCAmJgorCXJldHVybiBJTlRFTF9HRU4o ZGV2X3ByaXYpIDwgNCAmJgogCQkoY3J0Yy0+cGlwZSA9PSBQSVBFX0EgfHwgSVNfSTkxNUcoZGV2 X3ByaXYpKTsKIH0KIApAQCAtODE5NCw3ICs4MTk0LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9z ZXRfcGlwZW1pc2Moc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY29uZmlnID0gaW50ZWxfY3J0Yy0+Y29uZmlnOwogCi0JaWYgKElTX0JST0FEV0VMTChkZXZf cHJpdikgfHwgSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KSB7CisJaWYgKElTX0JST0FE V0VMTChkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCXUzMiB2YWwg PSAwOwogCiAJCXN3aXRjaCAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX2JwcCkgewpAQCAtMTM5 NDcsNyArMTM5NDcsNyBAQCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0 IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYiwKIAkgKiBnZW4yLzMgZGlzcGxheSBlbmdpbmUg dXNlcyB0aGUgZmVuY2UgaWYgcHJlc2VudCwKIAkgKiBzbyB0aGUgdGlsaW5nIG1vZGUgbXVzdCBt YXRjaCB0aGUgZmIgbW9kaWZpZXIgZXhhY3RseS4KIAkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXZf cHJpdiktPmdlbiA8IDQgJiYKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDQgJiYKIAkgICAg dGlsaW5nICE9IGludGVsX2ZiX21vZGlmaWVyX3RvX3RpbGluZyhtb2RlX2NtZC0+bW9kaWZpZXJb MF0pKSB7CiAJCURSTV9ERUJVR19LTVMoInRpbGluZ19tb2RlIG11c3QgbWF0Y2ggZmIgbW9kaWZp ZXIgZXhhY3RseSBvbiBnZW4yLzNcbiIpOwogCQlnb3RvIGVycjsKQEAgLTE0MTYyLDcgKzE0MTYy LDcgQEAgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXlfaG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewogCWludGVsX2luaXRfY2RjbGtfaG9va3MoZGV2X3ByaXYpOwogCi0J aWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOSkgeworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X3BpcGVfY29uZmlnID0gaGFz d2VsbF9nZXRfcGlwZV9jb25maWc7CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9pbml0aWFsX3Bs YW5lX2NvbmZpZyA9CiAJCQlza3lsYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZzsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCmluZGV4IGYxMGExNDMzMGU3Yy4uYWJiZTFlNGUwYWY1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMKQEAgLTE0NjcsNyArMTQ2Nyw3IEBAIHN0YXRpYyBpOTE1X3JlZ190 IHNrbF9hdXhfZGF0YV9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3Rh dGljIGk5MTVfcmVnX3QgaW50ZWxfYXV4X2N0bF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJCSAgICBlbnVtIHBvcnQgcG9ydCkKIHsKLQlpZiAoSU5URUxfSU5GTyhk ZXZfcHJpdiktPmdlbiA+PSA5KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCXJl dHVybiBza2xfYXV4X2N0bF9yZWcoZGV2X3ByaXYsIHBvcnQpOwogCWVsc2UgaWYgKEhBU19QQ0hf U1BMSVQoZGV2X3ByaXYpKQogCQlyZXR1cm4gaWxrX2F1eF9jdGxfcmVnKGRldl9wcml2LCBwb3J0 KTsKQEAgLTE0NzgsNyArMTQ3OCw3IEBAIHN0YXRpYyBpOTE1X3JlZ190IGludGVsX2F1eF9jdGxf cmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyBpOTE1X3JlZ190 IGludGVsX2F1eF9kYXRhX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkJICAgICBlbnVtIHBvcnQgcG9ydCwgaW50IGluZGV4KQogewotCWlmIChJTlRFTF9JTkZPKGRl dl9wcml2KS0+Z2VuID49IDkpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKIAkJcmV0 dXJuIHNrbF9hdXhfZGF0YV9yZWcoZGV2X3ByaXYsIHBvcnQsIGluZGV4KTsKIAllbHNlIGlmIChI QVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJcmV0dXJuIGlsa19hdXhfZGF0YV9yZWcoZGV2X3By aXYsIHBvcnQsIGluZGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2x2ZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwppbmRleCBlZjgwNDk5 MTEzZWUuLjQ2NzdhYzBiMTBkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHZkcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwpAQCAtMTg5 LDcgKzE4OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2x2ZHNfcHBzX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJLyogQ29udmVydCBmcm9tIDEwMG1zIHRv IDEwMHVzIHVuaXRzICovCiAJcHBzLT50NCA9IHZhbCAqIDEwMDA7CiAKLQlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA8PSA0ICYmCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0gNCAm JgogCSAgICBwcHMtPnQxX3QyID09IDAgJiYgcHBzLT50NSA9PSAwICYmIHBwcy0+dDMgPT0gMCAm JiBwcHMtPnR4ID09IDApIHsKIAkJRFJNX0RFQlVHX0tNUygiUGFuZWwgcG93ZXIgdGltaW5ncyB1 bmluaXRpYWxpemVkLCAiCiAJCQkgICAgICAic2V0dGluZyBkZWZhdWx0c1xuIik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9tb2NzLmMKaW5kZXggZjRjNDZiMGI4ZjBhLi5hYmI3YThjMWUzNDAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX21vY3MuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKQEAgLTE4Nyw3ICsxODcsNyBAQCBzdGF0aWMgYm9vbCBn ZXRfbW9jc19zZXR0aW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXRh YmxlLT50YWJsZSA9IGJyb3h0b25fbW9jc190YWJsZTsKIAkJcmVzdWx0ID0gdHJ1ZTsKIAl9IGVs c2UgewotCQlXQVJOX09OQ0UoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5LAorCQlXQVJO X09OQ0UoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5LAogCQkJICAiUGxhdGZvcm0gdGhhdCBzaG91 bGQgaGF2ZSBhIE1PQ1MgdGFibGUgZG9lcyBub3QuXG4iKTsKIAl9CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BhbmVsLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wYW5lbC5jCmluZGV4IGU3MDJhNjQ4N2FhOS4uNzhhNTNjOGIxNzg5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BhbmVsLmMKQEAgLTQ5Nyw3ICs0OTcsNyBAQCBzdGF0aWMgdTMyIGk5eHhf Z2V0X2JhY2tsaWdodChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJdTMyIHZh bDsKIAogCXZhbCA9IEk5MTVfUkVBRChCTENfUFdNX0NUTCkgJiBCQUNLTElHSFRfRFVUWV9DWUNM RV9NQVNLOwotCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgNCkKKwlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8IDQpCiAJCXZhbCA+Pj0gMTsKIAogCWlmIChwYW5lbC0+YmFja2xpZ2h0 LmNvbWJpbmF0aW9uX21vZGUpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDA2M2M4ODUx NzVlNy4uN2ExMTJkMDc1YzI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTY5NDAsNyAr Njk0MCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfdXBkYXRlX3JpbmdfZnJlcShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkgKiBObyBmbG9vciByZXF1aXJlZCBmb3IgcmluZyBm cmVxdWVuY3kgb24gU0tMLgogCQkJICovCiAJCQlyaW5nX2ZyZXEgPSBncHVfZnJlcTsKLQkJfSBl bHNlIGlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDgpIHsKKwkJfSBlbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJCS8qIG1heCgyICogR1QsIEREUikuIE5COiBH VCBpcyA1ME1IeiB1bml0cyAqLwogCQkJcmluZ19mcmVxID0gbWF4KG1pbl9yaW5nX2ZyZXEsIGdw dV9mcmVxKTsKIAkJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewpAQCAtNzU1MSw3 ICs3NTUxLDcgQEAgdW5zaWduZWQgbG9uZyBpOTE1X2NoaXBzZXRfdmFsKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAl1bnNpZ25lZCBsb25nIHZhbDsKIAotCWlmIChJTlRF TF9JTkZPKGRldl9wcml2KS0+Z2VuICE9IDUpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgIT0g NSkKIAkJcmV0dXJuIDA7CiAKIAlzcGluX2xvY2tfaXJxKCZtY2hkZXZfbG9jayk7CkBAIC03NjM1 LDcgKzc2MzUsNyBAQCBzdGF0aWMgdm9pZCBfX2k5MTVfdXBkYXRlX2dmeF92YWwoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lkIGk5MTVfdXBkYXRlX2dmeF92YWwoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlmIChJTlRFTF9JTkZPKGRldl9w cml2KS0+Z2VuICE9IDUpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgIT0gNSkKIAkJcmV0dXJu OwogCiAJc3Bpbl9sb2NrX2lycSgmbWNoZGV2X2xvY2spOwpAQCAtNzY4Niw3ICs3Njg2LDcgQEAg dW5zaWduZWQgbG9uZyBpOTE1X2dmeF92YWwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogewogCXVuc2lnbmVkIGxvbmcgdmFsOwogCi0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYp LT5nZW4gIT0gNSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSAhPSA1KQogCQlyZXR1cm4gMDsK IAogCXNwaW5fbG9ja19pcnEoJm1jaGRldl9sb2NrKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMK aW5kZXggZTlmZWZmZGVhODk5Li4yZWYzNzRmOTM2YjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jCkBAIC0xMjYsNyArMTI2LDcgQEAgc3RhdGljIHZvaWQgdmx2X3Bzcl9lbmFibGVfc2luayhz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogc3RhdGljIGk5MTVfcmVnX3QgcHNyX2F1eF9jdGxf cmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgICAgZW51bSBw b3J0IHBvcnQpCiB7Ci0JaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOSkKKwlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQogCQlyZXR1cm4gRFBfQVVYX0NIX0NUTChwb3J0KTsK IAllbHNlCiAJCXJldHVybiBFRFBfUFNSX0FVWF9DVEw7CkBAIC0xMzUsNyArMTM1LDcgQEAgc3Rh dGljIGk5MTVfcmVnX3QgcHNyX2F1eF9jdGxfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIHN0YXRpYyBpOTE1X3JlZ190IHBzcl9hdXhfZGF0YV9yZWcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQllbnVtIHBvcnQgcG9ydCwgaW50IGluZGV4KQog ewotCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDkpCisJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOSkKIAkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKHBvcnQsIGluZGV4KTsKIAll bHNlCiAJCXJldHVybiBFRFBfUFNSX0FVWF9EQVRBKGluZGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBmOTNlNDUzMjM3MWEuLmM5MWQ3MTA2ZmJjZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNjU1LDcgKzY1NSw3IEBA IHN0YXRpYyBpbnQgaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJaWYgKElTX0dFTihkZXZfcHJpdiwgNiwgNykpCiAJCUk5MTVfV1JJVEUoSU5TVFBNLCBf TUFTS0VEX0JJVF9FTkFCTEUoSU5TVFBNX0ZPUkNFX09SREVSSU5HKSk7CiAKLQlpZiAoSU5URUxf SU5GTyhkZXZfcHJpdiktPmdlbiA+PSA2KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYp CiAJCUk5MTVfV1JJVEVfSU1SKGVuZ2luZSwgfmVuZ2luZS0+aXJxX2tlZXBfbWFzayk7CiAKIAly ZXR1cm4gaW5pdF93b3JrYXJvdW5kc19yaW5nKGVuZ2luZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jCmluZGV4IDE2NGRiYjhjZmEzNi4uNzM5NTlhZTU2MjQxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTg3NCw5ICsxODc0LDkgQEAgc3RhdGljIHJlc2V0X2Z1 bmMgaW50ZWxfZ2V0X2dwdV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJaWYgKCFpOTE1X21vZHBhcmFtcy5yZXNldCkKIAkJcmV0dXJuIE5VTEw7CiAKLQlpZiAoSU5U RUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDgpCiAJCXJldHVybiBnZW44X3Jlc2V0X2VuZ2luZXM7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhk ZXZfcHJpdiktPmdlbiA+PSA2KQorCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikK IAkJcmV0dXJuIGdlbjZfcmVzZXRfZW5naW5lczsKIAllbHNlIGlmIChJU19HRU41KGRldl9wcml2 KSkKIAkJcmV0dXJuIGlyb25sYWtlX2RvX3Jlc2V0OwpAQCAtMTg4NCw3ICsxODg0LDcgQEAgc3Rh dGljIHJlc2V0X2Z1bmMgaW50ZWxfZ2V0X2dwdV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJCXJldHVybiBnNHhfZG9fcmVzZXQ7CiAJZWxzZSBpZiAoSVNfRzMzKGRl dl9wcml2KSB8fCBJU19QSU5FVklFVyhkZXZfcHJpdikpCiAJCXJldHVybiBnMzNfZG9fcmVzZXQ7 Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSAzKQorCWVsc2UgaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gMykKIAkJcmV0dXJuIGk5MTVfZG9fcmVzZXQ7CiAJZWxzZQog CQlyZXR1cm4gTlVMTDsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==