From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 1/5] drm/i915: Assorted dev_priv cleanups Date: Fri, 4 Nov 2016 14:42:44 +0000 Message-ID: <1478270568-7902-2-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C8696E07C for ; Fri, 4 Nov 2016 14:42:58 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id 68so4239339wmz.2 for ; Fri, 04 Nov 2016 07:42:58 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgc21hbGwg c2VsZWN0aW9uIG9mIG1hY3JvcyB3aGljaCBjYW4gb25seSBhY2NlcHQgZGV2X3ByaXYgZnJvbQpu b3cgb24gYW5kIGEgcmVzdWx0aW5nIHRyaWNrbGUgb2YgZml4dXBzLgoKU2lnbmVkLW9mZi1ieTog VHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAzMSArKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8 IDEzICsrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZm ZXIuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jICAg ICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNlcnB0ci5jICAgIHwg IDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jICAgICAgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgICAgIHwgIDYgKysrLS0t CiA3IGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ3MzViNDE3NzEwMC4uNDVhMzBmNzMwMjE2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4NTEsMjggKzI4NTEsMzEgQEAgc3RydWN0IGRybV9p OTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIEFMTF9FTkdJTkVTCSh+MCkKIAogI2RlZmluZSBIQVNf RU5HSU5FKGRldl9wcml2LCBpZCkgXAotCSghIShJTlRFTF9JTkZPKGRldl9wcml2KS0+cmluZ19t YXNrICYgRU5HSU5FX01BU0soaWQpKSkKKwkoISEoKGRldl9wcml2KS0+aW5mby5yaW5nX21hc2sg JiBFTkdJTkVfTUFTSyhpZCkpKQogCiAjZGVmaW5lIEhBU19CU0QoZGV2X3ByaXYpCUhBU19FTkdJ TkUoZGV2X3ByaXYsIFZDUykKICNkZWZpbmUgSEFTX0JTRDIoZGV2X3ByaXYpCUhBU19FTkdJTkUo ZGV2X3ByaXYsIFZDUzIpCiAjZGVmaW5lIEhBU19CTFQoZGV2X3ByaXYpCUhBU19FTkdJTkUoZGV2 X3ByaXYsIEJDUykKICNkZWZpbmUgSEFTX1ZFQk9YKGRldl9wcml2KQlIQVNfRU5HSU5FKGRldl9w cml2LCBWRUNTKQogCi0jZGVmaW5lIEhBU19MTEMoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aGFz X2xsYykKLSNkZWZpbmUgSEFTX1NOT09QKGRldikJCShJTlRFTF9JTkZPKGRldiktPmhhc19zbm9v cCkKLSNkZWZpbmUgSEFTX0VEUkFNKGRldikJCSghIShfX0k5MTVfXyhkZXYpLT5lZHJhbV9jYXAg JiBFRFJBTV9FTkFCTEVEKSkKKyNkZWZpbmUgSEFTX0xMQyhkZXZfcHJpdikJKChkZXZfcHJpdikt PmluZm8uaGFzX2xsYykKKyNkZWZpbmUgSEFTX1NOT09QKGRldl9wcml2KQkoKGRldl9wcml2KS0+ aW5mby5oYXNfc25vb3ApCisjZGVmaW5lIEhBU19FRFJBTShkZXZfcHJpdikJKCEhKChkZXZfcHJp diktPmVkcmFtX2NhcCAmIEVEUkFNX0VOQUJMRUQpKQogI2RlZmluZSBIQVNfV1QoZGV2X3ByaXYp CSgoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgXAogCQkJCSBJU19CUk9BRFdFTEwoZGV2X3ByaXYp KSAmJiBIQVNfRURSQU0oZGV2X3ByaXYpKQotI2RlZmluZSBIV1NfTkVFRFNfUEhZU0lDQUwoZGV2 KQkoSU5URUxfSU5GTyhkZXYpLT5od3NfbmVlZHNfcGh5c2ljYWwpCiAKLSNkZWZpbmUgSEFTX0hX X0NPTlRFWFRTKGRldikJKElOVEVMX0lORk8oZGV2KS0+aGFzX2h3X2NvbnRleHRzKQotI2RlZmlu ZSBIQVNfTE9HSUNBTF9SSU5HX0NPTlRFWFRTKGRldikJKElOVEVMX0lORk8oZGV2KS0+aGFzX2xv Z2ljYWxfcmluZ19jb250ZXh0cykKLSNkZWZpbmUgVVNFU19QUEdUVChkZXYpCQkoaTkxNS5lbmFi bGVfcHBndHQpCi0jZGVmaW5lIFVTRVNfRlVMTF9QUEdUVChkZXYpCShpOTE1LmVuYWJsZV9wcGd0 dCA+PSAyKQotI2RlZmluZSBVU0VTX0ZVTExfNDhCSVRfUFBHVFQoZGV2KQkoaTkxNS5lbmFibGVf cHBndHQgPT0gMykKKyNkZWZpbmUgSFdTX05FRURTX1BIWVNJQ0FMKGRldl9wcml2KQkoKGRldl9w cml2KS0+aW5mby5od3NfbmVlZHNfcGh5c2ljYWwpCiAKLSNkZWZpbmUgSEFTX09WRVJMQVkoZGV2 KQkJKElOVEVMX0lORk8oZGV2KS0+aGFzX292ZXJsYXkpCi0jZGVmaW5lIE9WRVJMQVlfTkVFRFNf UEhZU0lDQUwoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5vdmVybGF5X25lZWRzX3BoeXNpY2FsKQor I2RlZmluZSBIQVNfSFdfQ09OVEVYVFMoZGV2X3ByaXYpCSAgICAoKGRldl9wcml2KS0+aW5mby5o YXNfaHdfY29udGV4dHMpCisjZGVmaW5lIEhBU19MT0dJQ0FMX1JJTkdfQ09OVEVYVFMoZGV2X3By aXYpIFwKKwkJKChkZXZfcHJpdiktPmluZm8uaGFzX2xvZ2ljYWxfcmluZ19jb250ZXh0cykKKyNk ZWZpbmUgVVNFU19QUEdUVChkZXZfcHJpdikJCShpOTE1LmVuYWJsZV9wcGd0dCkKKyNkZWZpbmUg VVNFU19GVUxMX1BQR1RUKGRldl9wcml2KQkoaTkxNS5lbmFibGVfcHBndHQgPj0gMikKKyNkZWZp bmUgVVNFU19GVUxMXzQ4QklUX1BQR1RUKGRldl9wcml2KQkoaTkxNS5lbmFibGVfcHBndHQgPT0g MykKKworI2RlZmluZSBIQVNfT1ZFUkxBWShkZXZfcHJpdikJCSAoKGRldl9wcml2KS0+aW5mby5o YXNfb3ZlcmxheSkKKyNkZWZpbmUgT1ZFUkxBWV9ORUVEU19QSFlTSUNBTChkZXZfcHJpdikgXAor CQkoKGRldl9wcml2KS0+aW5mby5vdmVybGF5X25lZWRzX3BoeXNpY2FsKQogCiAvKiBFYXJseSBn ZW4yIGhhdmUgYSB0b3RhbGx5IGJ1c3RlZCBDUyB0bGIgYW5kIHJlcXVpcmUgcGlubmVkIGJhdGNo ZXMuICovCiAjZGVmaW5lIEhBU19CUk9LRU5fQ1NfVExCKGRldl9wcml2KQkoSVNfSTgzMChkZXZf cHJpdikgfHwgSVNfODQ1RyhkZXZfcHJpdikpCkBAIC0yODg5LDggKzI4OTIsOCBAQCBzdHJ1Y3Qg ZHJtX2k5MTVfY21kX3RhYmxlIHsKICAqIGxlZ2FjeSBpcnEgbm8uIGlzIHNoYXJlZCB3aXRoIGFu b3RoZXIgZGV2aWNlLiBUaGUga2VybmVsIHRoZW4gZGlzYWJsZXMgdGhhdAogICogaW50ZXJydXB0 IHNvdXJjZSBhbmQgc28gcHJldmVudHMgdGhlIG90aGVyIGRldmljZSBmcm9tIHdvcmtpbmcgcHJv cGVybHkuCiAgKi8KLSNkZWZpbmUgSEFTX0FVWF9JUlEoZGV2KSAoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNSkKLSNkZWZpbmUgSEFTX0dNQlVTX0lSUShkZXYpIChJTlRFTF9JTkZPKGRldiktPmhh c19nbWJ1c19pcnEpCisjZGVmaW5lIEhBU19BVVhfSVJRKGRldl9wcml2KSAgICgoZGV2X3ByaXYp LT5pbmZvLmdlbiA+PSA1KQorI2RlZmluZSBIQVNfR01CVVNfSVJRKGRldl9wcml2KSAoKGRldl9w cml2KS0+aW5mby5oYXNfZ21idXNfaXJxKQogCiAvKiBXaXRoIHRoZSA5NDUgYW5kIGxhdGVyLCBZ IHRpbGluZyBnb3QgYWRqdXN0ZWQgc28gdGhhdCBpdCB3YXMgMzIgMTI4LWJ5dGUKICAqIHJvd3Ms IHdoaWNoIGNoYW5nZWQgdGhlIGFsaWdubWVudCByZXF1aXJlbWVudHMgYW5kIGZlbmNlIHByb2dy YW1taW5nLgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMWY5OTVjZWQ1MjRlLi5lOTgwOGM4 ZWY1NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDgsNyArNDgsNyBAQCBzdGF0aWMg dm9pZCBpOTE1X2dlbV9vYmplY3RfZmx1c2hfY3B1X3dyaXRlX2RvbWFpbihzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqbwogc3RhdGljIGJvb2wgY3B1X2NhY2hlX2lzX2NvaGVyZW50KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwpCiB7 Ci0JcmV0dXJuIEhBU19MTEMoZGV2KSB8fCBsZXZlbCAhPSBJOTE1X0NBQ0hFX05PTkU7CisJcmV0 dXJuIEhBU19MTEModG9faTkxNShkZXYpKSB8fCBsZXZlbCAhPSBJOTE1X0NBQ0hFX05PTkU7CiB9 CiAKIHN0YXRpYyBib29sIGNwdV93cml0ZV9uZWVkc19jbGZsdXNoKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopCkBAIC0xNzU3LDcgKzE3NTcsNyBAQCBpbnQgaTkxNV9nZW1fZmF1bHQo c3RydWN0IHZtX2FyZWFfc3RydWN0ICphcmVhLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKIAkJZ290 byBlcnJfcnBtOwogCiAJLyogQWNjZXNzIHRvIHNub29wYWJsZSBwYWdlcyB0aHJvdWdoIHRoZSBH VFQgaXMgaW5jb2hlcmVudC4gKi8KLQlpZiAob2JqLT5jYWNoZV9sZXZlbCAhPSBJOTE1X0NBQ0hF X05PTkUgJiYgIUhBU19MTEMoZGV2KSkgeworCWlmIChvYmotPmNhY2hlX2xldmVsICE9IEk5MTVf Q0FDSEVfTk9ORSAmJiAhSEFTX0xMQyhkZXZfcHJpdikpIHsKIAkJcmV0ID0gLUVGQVVMVDsKIAkJ Z290byBlcnJfdW5sb2NrOwogCX0KQEAgLTM0MTQsNyArMzQxNCw4IEBAIGludCBpOTE1X2dlbV9v YmplY3Rfc2V0X2NhY2hlX2xldmVsKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJ CWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCi0JCWlmICghSEFTX0xMQyhvYmotPmJhc2UuZGV2 KSAmJiBjYWNoZV9sZXZlbCAhPSBJOTE1X0NBQ0hFX05PTkUpIHsKKwkJaWYgKCFIQVNfTExDKHRv X2k5MTUob2JqLT5iYXNlLmRldikpICYmCisJCSAgICBjYWNoZV9sZXZlbCAhPSBJOTE1X0NBQ0hF X05PTkUpIHsKIAkJCS8qIEFjY2VzcyB0byBzbm9vcGFibGUgcGFnZXMgdGhyb3VnaCB0aGUgR1RU IGlzCiAJCQkgKiBpbmNvaGVyZW50IGFuZCBvbiBzb21lIG1hY2hpbmVzIGNhdXNlcyBhIGhhcmQK IAkJCSAqIGxvY2t1cC4gUmVsaW5xdWlzaCB0aGUgQ1BVIG1tYXBpbmcgdG8gZm9yY2UKQEAgLTQx OTksNyArNDIwMCw3IEBAIGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdTY0IHNpemUpCiAJb2JqLT5iYXNlLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJ Tl9DUFU7CiAJb2JqLT5iYXNlLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DUFU7CiAK LQlpZiAoSEFTX0xMQyhkZXYpKSB7CisJaWYgKEhBU19MTEMoZGV2X3ByaXYpKSB7CiAJCS8qIE9u IHNvbWUgZGV2aWNlcywgd2UgY2FuIGhhdmUgdGhlIEdQVSB1c2UgdGhlIExMQyAodGhlIENQVQog CQkgKiBjYWNoZSkgZm9yIGFib3V0IGEgMTAlIHBlcmZvcm1hbmNlIGltcHJvdmVtZW50CiAJCSAq IGNvbXBhcmVkIHRvIHVuY2FjaGVkLiAgR3JhcGhpY3MgcmVxdWVzdHMgb3RoZXIgdGhhbgpAQCAt NDQ0NCw3ICs0NDQ1LDcgQEAgaW50IGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkgKiBtYWNoaW5lcyBpcyBhIGdvb2QgaWRlYSwgd2UgZG9uJ3QgLSBqdXN0IGluIGNh c2UgaXQgbGVhdmVzIHRoZQogCSAqIG1hY2hpbmUgaW4gYW4gdW51c2FibGUgY29uZGl0aW9uLgog CSAqLwotCWlmIChIQVNfSFdfQ09OVEVYVFMoZGV2KSkgeworCWlmIChIQVNfSFdfQ09OVEVYVFMo ZGV2X3ByaXYpKSB7CiAJCWludCByZXNldCA9IGludGVsX2dwdV9yZXNldChkZXZfcHJpdiwgQUxM X0VOR0lORVMpOwogCQlXQVJOX09OKHJlc2V0ICYmIHJlc2V0ICE9IC1FTk9ERVYpOwogCX0KQEAg LTQ1MzUsNyArNDUzNiw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkvKiBEb3VibGUgbGF5ZXIgc2VjdXJpdHkgYmxhbmtldCwgc2VlIGk5MTVfZ2VtX2luaXQo KSAqLwogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxM KTsKIAotCWlmIChIQVNfRURSQU0oZGV2KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSkKKwlp ZiAoSEFTX0VEUkFNKGRldl9wcml2KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSkKIAkJSTkx NV9XUklURShIU1dfSURJQ1IsIEk5MTVfUkVBRChIU1dfSURJQ1IpIHwgSURJSEFTSE1TSygweGYp KTsKIAogCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCAzMjJjNTgwYTczOWYuLjljN2Q5Yzg4ZDg3OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMjg3LDcgKzI4 Nyw3IEBAIHN0YXRpYyBpbmxpbmUgaW50IHVzZV9jcHVfcmVsb2Moc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaikKIAlpZiAoREJHX1VTRV9DUFVfUkVMT0MpCiAJCXJldHVybiBEQkdfVVNF X0NQVV9SRUxPQyA+IDA7CiAKLQlyZXR1cm4gKEhBU19MTEMob2JqLT5iYXNlLmRldikgfHwKKwly ZXR1cm4gKEhBU19MTEModG9faTkxNShvYmotPmJhc2UuZGV2KSkgfHwKIAkJb2JqLT5iYXNlLndy aXRlX2RvbWFpbiA9PSBJOTE1X0dFTV9ET01BSU5fQ1BVIHx8CiAJCW9iai0+Y2FjaGVfbGV2ZWwg IT0gSTkxNV9DQUNIRV9OT05FKTsKIH0KQEAgLTgzMyw3ICs4MzMsNyBAQCBuZWVkX3JlbG9jX21h cHBhYmxlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKiBTZWUg YWxzbyB1c2VfY3B1X3JlbG9jKCkgKi8KLQlpZiAoSEFTX0xMQyh2bWEtPm9iai0+YmFzZS5kZXYp KQorCWlmIChIQVNfTExDKHRvX2k5MTUodm1hLT5vYmotPmJhc2UuZGV2KSkpCiAJCXJldHVybiBm YWxzZTsKIAogCWlmICh2bWEtPm9iai0+YmFzZS53cml0ZV9kb21haW4gPT0gSTkxNV9HRU1fRE9N QUlOX0NQVSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xl bi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKaW5kZXggYjFkMzY3 ZGJhMzQ3Li41NDA4NWRmMWYyMjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xl bi5jCkBAIC01OTYsNyArNTk2LDggQEAgX2k5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlvYmotPnN0b2xlbiA9IHN0b2xlbjsKIAlvYmotPmJh c2UucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX0NQVSB8IEk5MTVfR0VNX0RPTUFJTl9H VFQ7Ci0Jb2JqLT5jYWNoZV9sZXZlbCA9IEhBU19MTEMoZGV2KSA/IEk5MTVfQ0FDSEVfTExDIDog STkxNV9DQUNIRV9OT05FOworCW9iai0+Y2FjaGVfbGV2ZWwgPSBIQVNfTExDKHRvX2k5MTUoZGV2 KSkgPworCQkJICAgSTkxNV9DQUNIRV9MTEMgOiBJOTE1X0NBQ0hFX05PTkU7CiAKIAlpZiAoaTkx NV9nZW1fb2JqZWN0X3Bpbl9wYWdlcyhvYmopKQogCQlnb3RvIGNsZWFudXA7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKaW5kZXggNjQyNjE2MzlmNTQ3Li4xMDdkZGY1MTA2 NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMKQEAgLTc1MywxMiAr NzUzLDEzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdF9vcHMgaTkx NV9nZW1fdXNlcnB0cl9vcHMgPSB7CiBpbnQKIGk5MTVfZ2VtX3VzZXJwdHJfaW9jdGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogewor CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3VzZXJwdHIgKmFyZ3MgPSBkYXRhOwogCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmo7CiAJaW50IHJldDsKIAl1MzIgaGFuZGxlOwogCi0JaWYgKCFIQVNfTExD KGRldikgJiYgIUhBU19TTk9PUChkZXYpKSB7CisJaWYgKCFIQVNfTExDKGRldl9wcml2KSAmJiAh SEFTX1NOT09QKGRldl9wcml2KSkgewogCQkvKiBXZSBjYW5ub3Qgc3VwcG9ydCBjb2hlcmVudCB1 c2VycHRyIG9iamVjdHMgb24gaHcgd2l0aG91dAogCQkgKiBMTEMgYW5kIGJyb2tlbiBzbm9vcGlu Zy4KIAkJICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCAyMDQwOTNm M2VhYTUuLmQ0MzBiOTQ0MWU2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j CkBAIC0xNDg5LDcgKzE0ODksNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiAKIAkvKiA0OiBFdmVyeXRo aW5nIGVsc2UgKi8KLQlpZiAoSEFTX0hXX0NPTlRFWFRTKGRldikpCisJaWYgKEhBU19IV19DT05U RVhUUyhkZXZfcHJpdikpCiAJCWVycm9yLT5jY2lkID0gSTkxNV9SRUFEKENDSUQpOwogCiAJaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4 IDlkZjMzMWIzMzA1Yi4uZDRlOWNmM2FkMjZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAg LTk0MiwxNCArOTQyLDE0IEBAIGludGVsX2RwX2F1eF9jaChzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwLAogCQl1aW50OF90ICpyZWN2LCBpbnQgcmVjdl9zaXplKQogewogCXN0cnVjdCBpbnRlbF9k aWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwot CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KKwkJCXRvX2k5MTUoaW50ZWxfZGlnX3Bv cnQtPmJhc2UuYmFzZS5kZXYpOwogCWk5MTVfcmVnX3QgY2hfY3RsID0gaW50ZWxfZHAtPmF1eF9j aF9jdGxfcmVnOwogCXVpbnQzMl90IGF1eF9jbG9ja19kaXZpZGVyOwogCWludCBpLCByZXQsIHJl Y3ZfYnl0ZXM7CiAJdWludDMyX3Qgc3RhdHVzOwogCWludCB0cnksIGNsb2NrID0gMDsKLQlib29s IGhhc19hdXhfaXJxID0gSEFTX0FVWF9JUlEoZGV2KTsKKwlib29sIGhhc19hdXhfaXJxID0gSEFT X0FVWF9JUlEoZGV2X3ByaXYpOwogCWJvb2wgdmRkOwogCiAJcHBzX2xvY2soaW50ZWxfZHApOwot LSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=