From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 2/2] drm/i915/dp: make is_edp non-static and rename to intel_dp_is_edp Date: Fri, 18 Aug 2017 12:30:20 +0300 Message-ID: <20170818093020.19160-2-jani.nikula@intel.com> References: <20170818093020.19160-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBF946E6E9 for ; Fri, 18 Aug 2017 09:25:34 +0000 (UTC) In-Reply-To: <20170818093020.19160-1-jani.nikula@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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RXhwb3NlIGFjcm9zcyBkcml2ZXIgZm9yIGZ1dHVyZSB3b3JrLiBObyBmdW5jdGlvbmFsIGNoYW5n ZXMuCgpDYzogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KQ2M6IEpp bSBCcmlkZSA8amltLmJyaWRlQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBO aWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jICB8IDc3ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgKwogMiBmaWxlcyBjaGFuZ2Vk LCA0MSBpbnNlcnRpb25zKCspLCAzNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCAyOWVkMWRlYjljODQuLmUzODU2NTgyOWQxOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC0xMDMsMTMgKzEwMywxMyBAQCBzdGF0aWMgY29uc3QgaW50IGNubF9yYXRlc1tdID0g eyAxNjIwMDAsIDIxNjAwMCwgMjcwMDAwLAogc3RhdGljIGNvbnN0IGludCBkZWZhdWx0X3JhdGVz W10gPSB7IDE2MjAwMCwgMjcwMDAwLCA1NDAwMDAgfTsKIAogLyoqCi0gKiBpc19lZHAgLSBpcyB0 aGUgZ2l2ZW4gcG9ydCBhdHRhY2hlZCB0byBhbiBlRFAgcGFuZWwgKGVpdGhlciBDUFUgb3IgUENI KQorICogaW50ZWxfZHBfaXNfZWRwIC0gaXMgdGhlIGdpdmVuIHBvcnQgYXR0YWNoZWQgdG8gYW4g ZURQIHBhbmVsIChlaXRoZXIgQ1BVIG9yIFBDSCkKICAqIEBpbnRlbF9kcDogRFAgc3RydWN0CiAg KgogICogSWYgYSBDUFUgb3IgUENIIERQIG91dHB1dCBpcyBhdHRhY2hlZCB0byBhbiBlRFAgcGFu ZWwsIHRoaXMgZnVuY3Rpb24KICAqIHdpbGwgcmV0dXJuIHRydWUsIGFuZCBmYWxzZSBvdGhlcndp c2UuCiAgKi8KLXN0YXRpYyBib29sIGlzX2VkcChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQor Ym9vbCBpbnRlbF9kcF9pc19lZHAoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlzdHJ1 Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGlu dGVsX2RwKTsKIApAQCAtMzg4LDcgKzM4OCw3IEBAIGludGVsX2RwX21vZGVfdmFsaWQoc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAogCW1heF9kb3RjbGsgPSBpbnRlbF9kcF9kb3du c3RyZWFtX21heF9kb3RjbG9jayhpbnRlbF9kcCk7CiAKLQlpZiAoaXNfZWRwKGludGVsX2RwKSAm JiBmaXhlZF9tb2RlKSB7CisJaWYgKGludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkgJiYgZml4ZWRf bW9kZSkgewogCQlpZiAobW9kZS0+aGRpc3BsYXkgPiBmaXhlZF9tb2RlLT5oZGlzcGxheSkKIAkJ CXJldHVybiBNT0RFX1BBTkVMOwogCkBAIC01OTcsNyArNTk3LDcgQEAgdmx2X3Bvd2VyX3NlcXVl bmNlcl9waXBlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJbG9ja2RlcF9hc3NlcnRfaGVs ZCgmZGV2X3ByaXYtPnBwc19tdXRleCk7CiAKIAkvKiBXZSBzaG91bGQgbmV2ZXIgbGFuZCBoZXJl IHdpdGggcmVndWxhciBEUCBwb3J0cyAqLwotCVdBUk5fT04oIWlzX2VkcChpbnRlbF9kcCkpOwor CVdBUk5fT04oIWludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpOwogCiAJV0FSTl9PTihpbnRlbF9k cC0+YWN0aXZlX3BpcGUgIT0gSU5WQUxJRF9QSVBFICYmCiAJCWludGVsX2RwLT5hY3RpdmVfcGlw ZSAhPSBpbnRlbF9kcC0+cHBzX3BpcGUpOwpAQCAtNjQ0LDcgKzY0NCw3IEBAIGJ4dF9wb3dlcl9z ZXF1ZW5jZXJfaWR4KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJbG9ja2RlcF9hc3NlcnRf aGVsZCgmZGV2X3ByaXYtPnBwc19tdXRleCk7CiAKIAkvKiBXZSBzaG91bGQgbmV2ZXIgbGFuZCBo ZXJlIHdpdGggcmVndWxhciBEUCBwb3J0cyAqLwotCVdBUk5fT04oIWlzX2VkcChpbnRlbF9kcCkp OworCVdBUk5fT04oIWludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpOwogCiAJLyoKIAkgKiBUT0RP OiBCWFQgaGFzIDIgUFBTIGluc3RhbmNlcy4gVGhlIGNvcnJlY3QgcG9ydC0+UFBTIGluc3RhbmNl CkBAIC04NDcsNyArODQ3LDcgQEAgc3RhdGljIGludCBlZHBfbm90aWZ5X2hhbmRsZXIoc3RydWN0 IG5vdGlmaWVyX2Jsb2NrICp0aGlzLCB1bnNpZ25lZCBsb25nIGNvZGUsCiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCi0JaWYgKCFpc19lZHAoaW50ZWxf ZHApIHx8IGNvZGUgIT0gU1lTX1JFU1RBUlQpCisJaWYgKCFpbnRlbF9kcF9pc19lZHAoaW50ZWxf ZHApIHx8IGNvZGUgIT0gU1lTX1JFU1RBUlQpCiAJCXJldHVybiAwOwogCiAJcHBzX2xvY2soaW50 ZWxfZHApOwpAQCAtOTA3LDcgKzkwNyw3IEBAIGludGVsX2RwX2NoZWNrX2VkcChzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kcF90b19k ZXYoaW50ZWxfZHApOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAotCWlmICghaXNfZWRwKGludGVsX2RwKSkKKwlpZiAoIWludGVsX2RwX2lzX2Vk cChpbnRlbF9kcCkpCiAJCXJldHVybjsKIAogCWlmICghZWRwX2hhdmVfcGFuZWxfcG93ZXIoaW50 ZWxfZHApICYmICFlZHBfaGF2ZV9wYW5lbF92ZGQoaW50ZWxfZHApKSB7CkBAIC0xNjgxLDcgKzE2 ODEsNyBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAllbHNlCiAJCXBpcGVfY29uZmlnLT5oYXNfYXVkaW8gPSBpbnRlbF9jb25uX3N0YXRl LT5mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX09OOwogCi0JaWYgKGlzX2VkcChpbnRlbF9kcCkg JiYgaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKSB7CisJaWYgKGludGVsX2RwX2lz X2VkcChpbnRlbF9kcCkgJiYgaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKSB7CiAJ CXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpwYW5lbF9tb2RlID0KIAkJCWludGVsX2Nvbm5lY3Rv ci0+cGFuZWwuYWx0X2ZpeGVkX21vZGU7CiAJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpyZXFf bW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFzZS5tb2RlOwpAQCAtMTczNiw3ICsxNzM2LDcgQEAgaW50 ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJLyog V2FsayB0aHJvdWdoIGFsbCBicHAgdmFsdWVzLiBMdWNraWx5IHRoZXkncmUgYWxsIG5pY2VseSBz cGFjZWQgd2l0aCAyCiAJICogYnBjIGluIGJldHdlZW4uICovCiAJYnBwID0gaW50ZWxfZHBfY29t cHV0ZV9icHAoaW50ZWxfZHAsIHBpcGVfY29uZmlnKTsKLQlpZiAoaXNfZWRwKGludGVsX2RwKSkg eworCWlmIChpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKSB7CiAKIAkJLyogR2V0IGJwcCBmcm9t IHZidCBvbmx5IGZvciBwYW5lbHMgdGhhdCBkb250IGhhdmUgYnBwIGluIGVkaWQgKi8KIAkJaWYg KGludGVsX2Nvbm5lY3Rvci0+YmFzZS5kaXNwbGF5X2luZm8uYnBjID09IDAgJiYKQEAgLTE4Mjks NyArMTgyOSw3IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCSAqIERQTEwwIFZDTyBtYXkgbmVlZCB0byBiZSBhZGp1c3RlZCB0byBnZXQg dGhlIGNvcnJlY3QKIAkgKiBjbG9jayBmb3IgZURQLiBUaGlzIHdpbGwgYWZmZWN0IGNkY2xrIGFz IHdlbGwuCiAJICovCi0JaWYgKGlzX2VkcChpbnRlbF9kcCkgJiYgSVNfR0VOOV9CQyhkZXZfcHJp dikpIHsKKwlpZiAoaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSAmJiBJU19HRU45X0JDKGRldl9w cml2KSkgewogCQlpbnQgdmNvOwogCiAJCXN3aXRjaCAocGlwZV9jb25maWctPnBvcnRfY2xvY2sg LyAyKSB7CkBAIC0yMDY5LDcgKzIwNjksNyBAQCBzdGF0aWMgYm9vbCBlZHBfcGFuZWxfdmRkX29u KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZf cHJpdi0+cHBzX211dGV4KTsKIAotCWlmICghaXNfZWRwKGludGVsX2RwKSkKKwlpZiAoIWludGVs X2RwX2lzX2VkcChpbnRlbF9kcCkpCiAJCXJldHVybiBmYWxzZTsKIAogCWNhbmNlbF9kZWxheWVk X3dvcmsoJmludGVsX2RwLT5wYW5lbF92ZGRfd29yayk7CkBAIC0yMTE5LDcgKzIxMTksNyBAQCB2 b2lkIGludGVsX2VkcF9wYW5lbF92ZGRfb24oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsK IAlib29sIHZkZDsKIAotCWlmICghaXNfZWRwKGludGVsX2RwKSkKKwlpZiAoIWludGVsX2RwX2lz X2VkcChpbnRlbF9kcCkpCiAJCXJldHVybjsKIAogCXBwc19sb2NrKGludGVsX2RwKTsKQEAgLTIy MDMsNyArMjIwMyw3IEBAIHN0YXRpYyB2b2lkIGVkcF9wYW5lbF92ZGRfb2ZmKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsIGJvb2wgc3luYykKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9w cml2LT5wcHNfbXV0ZXgpOwogCi0JaWYgKCFpc19lZHAoaW50ZWxfZHApKQorCWlmICghaW50ZWxf ZHBfaXNfZWRwKGludGVsX2RwKSkKIAkJcmV0dXJuOwogCiAJSTkxNV9TVEFURV9XQVJOKCFpbnRl bF9kcC0+d2FudF9wYW5lbF92ZGQsICJlRFAgcG9ydCAlYyBWREQgbm90IGZvcmNlZCBvbiIsCkBA IC0yMjI2LDcgKzIyMjYsNyBAQCBzdGF0aWMgdm9pZCBlZHBfcGFuZWxfb24oc3RydWN0IGludGVs X2RwICppbnRlbF9kcCkKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0 ZXgpOwogCi0JaWYgKCFpc19lZHAoaW50ZWxfZHApKQorCWlmICghaW50ZWxfZHBfaXNfZWRwKGlu dGVsX2RwKSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVHX0tNUygiVHVybiBlRFAgcG9ydCAlYyBw YW5lbCBwb3dlciBvblxuIiwKQEAgLTIyNjcsNyArMjI2Nyw3IEBAIHN0YXRpYyB2b2lkIGVkcF9w YW5lbF9vbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCiB2b2lkIGludGVsX2VkcF9wYW5l bF9vbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewotCWlmICghaXNfZWRwKGludGVsX2Rw KSkKKwlpZiAoIWludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpCiAJCXJldHVybjsKIAogCXBwc19s b2NrKGludGVsX2RwKTsKQEAgLTIyODUsNyArMjI4NSw3IEBAIHN0YXRpYyB2b2lkIGVkcF9wYW5l bF9vZmYoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQo JmRldl9wcml2LT5wcHNfbXV0ZXgpOwogCi0JaWYgKCFpc19lZHAoaW50ZWxfZHApKQorCWlmICgh aW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVHX0tNUygi VHVybiBlRFAgcG9ydCAlYyBwYW5lbCBwb3dlciBvZmZcbiIsCkBAIC0yMzE2LDcgKzIzMTYsNyBA QCBzdGF0aWMgdm9pZCBlZHBfcGFuZWxfb2ZmKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAK IHZvaWQgaW50ZWxfZWRwX3BhbmVsX29mZihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewot CWlmICghaXNfZWRwKGludGVsX2RwKSkKKwlpZiAoIWludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkp CiAJCXJldHVybjsKIAogCXBwc19sb2NrKGludGVsX2RwKTsKQEAgLTIzNjAsNyArMjM2MCw3IEBA IHZvaWQgaW50ZWxfZWRwX2JhY2tsaWdodF9vbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKIHsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2lu dGVsX2RwKGNvbm5fc3RhdGUtPmJlc3RfZW5jb2Rlcik7CiAKLQlpZiAoIWlzX2VkcChpbnRlbF9k cCkpCisJaWYgKCFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQogCQlyZXR1cm47CiAKIAlEUk1f REVCVUdfS01TKCJcbiIpOwpAQCAtMjM3Nyw3ICsyMzc3LDcgQEAgc3RhdGljIHZvaWQgX2ludGVs X2VkcF9iYWNrbGlnaHRfb2ZmKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJdTMyIHBwOwog CWk5MTVfcmVnX3QgcHBfY3RybF9yZWc7CiAKLQlpZiAoIWlzX2VkcChpbnRlbF9kcCkpCisJaWYg KCFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQogCQlyZXR1cm47CiAKIAlwcHNfbG9jayhpbnRl bF9kcCk7CkBAIC0yNDAxLDcgKzI0MDEsNyBAQCB2b2lkIGludGVsX2VkcF9iYWNrbGlnaHRfb2Zm KGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKIHsKIAlz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKG9sZF9jb25uX3N0YXRl LT5iZXN0X2VuY29kZXIpOwogCi0JaWYgKCFpc19lZHAoaW50ZWxfZHApKQorCWlmICghaW50ZWxf ZHBfaXNfZWRwKGludGVsX2RwKSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVHX0tNUygiXG4iKTsK QEAgLTI2NjYsNyArMjY2Niw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX2dldF9jb25maWcoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCWludGVsX2RvdGNsb2NrX2NhbGN1bGF0ZShw aXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKIAkJCQkJICZwaXBlX2NvbmZpZy0+ZHBfbV9uKTsKIAot CWlmIChpc19lZHAoaW50ZWxfZHApICYmIGRldl9wcml2LT52YnQuZWRwLmJwcCAmJgorCWlmIChp bnRlbF9kcF9pc19lZHAoaW50ZWxfZHApICYmIGRldl9wcml2LT52YnQuZWRwLmJwcCAmJgogCSAg ICBwaXBlX2NvbmZpZy0+cGlwZV9icHAgPiBkZXZfcHJpdi0+dmJ0LmVkcC5icHApIHsKIAkJLyoK IAkJICogVGhpcyBpcyBhIGJpZyBmYXQgdWdseSBoYWNrLgpAQCAtMzA0MCw3ICszMDQwLDcgQEAg c3RhdGljIHZvaWQgdmx2X2luaXRfcGFuZWxfcG93ZXJfc2VxdWVuY2VyKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAKIAlpbnRlbF9kcC0+YWN0aXZlX3BpcGUgPSBjcnRjLT5waXBlOwogCi0J aWYgKCFpc19lZHAoaW50ZWxfZHApKQorCWlmICghaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSkK IAkJcmV0dXJuOwogCiAJLyogbm93IGl0J3MgYWxsIG91cnMgKi8KQEAgLTM3ODQsNyArMzc4NCw3 IEBAIGludGVsX2RwX2dldF9kcGNkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVy biBmYWxzZTsKIAogCS8qIERvbid0IGNsb2JiZXIgY2FjaGVkIGVEUCByYXRlcy4gKi8KLQlpZiAo IWlzX2VkcChpbnRlbF9kcCkpIHsKKwlpZiAoIWludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpIHsK IAkJaW50ZWxfZHBfc2V0X3NpbmtfcmF0ZXMoaW50ZWxfZHApOwogCQlpbnRlbF9kcF9zZXRfY29t bW9uX3JhdGVzKGludGVsX2RwKTsKIAl9CkBAIC0zODA2LDcgKzM4MDYsNyBAQCBpbnRlbF9kcF9n ZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCSAqIGRvd25zdHJlYW0gcG9ydCBp bmZvcm1hdGlvbi4gU28sIGFuIGVhcmx5IHJldHVybiBoZXJlIHNhdmVzCiAJICogdGltZSBmcm9t IHBlcmZvcm1pbmcgb3RoZXIgb3BlcmF0aW9ucyB3aGljaCBhcmUgbm90IHJlcXVpcmVkLgogCSAq LwotCWlmICghaXNfZWRwKGludGVsX2RwKSAmJiAhaW50ZWxfZHAtPnNpbmtfY291bnQpCisJaWYg KCFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApICYmICFpbnRlbF9kcC0+c2lua19jb3VudCkKIAkJ cmV0dXJuIGZhbHNlOwogCiAJaWYgKCFkcm1fZHBfaXNfYnJhbmNoKGludGVsX2RwLT5kcGNkKSkK QEAgLTQzOTYsNyArNDM5Niw3IEBAIGludGVsX2RwX2RldGVjdF9kcGNkKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJaWYgKCFpbnRlbF9kcF9nZXRfZHBjZChpbnRlbF9kcCkpCiAJCXJldHVy biBjb25uZWN0b3Jfc3RhdHVzX2Rpc2Nvbm5lY3RlZDsKIAotCWlmIChpc19lZHAoaW50ZWxfZHAp KQorCWlmIChpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQogCQlyZXR1cm4gY29ubmVjdG9yX3N0 YXR1c19jb25uZWN0ZWQ7CiAKIAkvKiBpZiB0aGVyZSdzIG5vIGRvd25zdHJlYW0gcG9ydCwgd2Un cmUgZG9uZSAqLwpAQCAtNDcxMiw3ICs0NzEyLDcgQEAgaW50ZWxfZHBfbG9uZ19wdWxzZShzdHJ1 Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCiAJaW50ZWxfZGlzcGxheV9wb3dl cl9nZXQodG9faTkxNShkZXYpLCBpbnRlbF9kcC0+YXV4X3Bvd2VyX2RvbWFpbik7CiAKIAkvKiBD YW4ndCBkaXNjb25uZWN0IGVEUCwgYnV0IHlvdSBjYW4gY2xvc2UgdGhlIGxpZC4uLiAqLwotCWlm IChpc19lZHAoaW50ZWxfZHApKQorCWlmIChpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQogCQlz dGF0dXMgPSBlZHBfZGV0ZWN0KGludGVsX2RwKTsKIAllbHNlIGlmIChpbnRlbF9kaWdpdGFsX3Bv cnRfY29ubmVjdGVkKHRvX2k5MTUoZGV2KSwKIAkJCQkJICAgICAgZHBfdG9fZGlnX3BvcnQoaW50 ZWxfZHApKSkKQEAgLTQ3OTIsNyArNDc5Miw3IEBAIGludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0 IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yKQogCWludGVsX2RwLT5hdXguaTJjX2Rl ZmVyX2NvdW50ID0gMDsKIAogCWludGVsX2RwX3NldF9lZGlkKGludGVsX2RwKTsKLQlpZiAoaXNf ZWRwKGludGVsX2RwKSB8fCBpbnRlbF9jb25uZWN0b3ItPmRldGVjdF9lZGlkKQorCWlmIChpbnRl bF9kcF9pc19lZHAoaW50ZWxfZHApIHx8IGludGVsX2Nvbm5lY3Rvci0+ZGV0ZWN0X2VkaWQpCiAJ CXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkOwogCWludGVsX2RwLT5kZXRlY3Rf ZG9uZSA9IHRydWU7CiAKQEAgLTQ4NzYsNyArNDg3Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfZHBf Z2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJfQogCiAJLyogaWYg ZURQIGhhcyBubyBFRElELCBmYWxsIGJhY2sgdG8gZml4ZWQgbW9kZSAqLwotCWlmIChpc19lZHAo aW50ZWxfYXR0YWNoZWRfZHAoY29ubmVjdG9yKSkgJiYKKwlpZiAoaW50ZWxfZHBfaXNfZWRwKGlu dGVsX2F0dGFjaGVkX2RwKGNvbm5lY3RvcikpICYmCiAJICAgIGludGVsX2Nvbm5lY3Rvci0+cGFu ZWwuZml4ZWRfbW9kZSkgewogCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTsKIApAQCAt NDkyNyw4ICs0OTI3LDEwIEBAIGludGVsX2RwX2Nvbm5lY3Rvcl9kZXN0cm95KHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCiAJaWYgKCFJU19FUlJfT1JfTlVMTChpbnRlbF9jb25uZWN0 b3ItPmVkaWQpKQogCQlrZnJlZShpbnRlbF9jb25uZWN0b3ItPmVkaWQpOwogCi0JLyogQ2FuJ3Qg Y2FsbCBpc19lZHAoKSBzaW5jZSB0aGUgZW5jb2RlciBtYXkgaGF2ZSBiZWVuIGRlc3Ryb3llZAot CSAqIGFscmVhZHkuICovCisJLyoKKwkgKiBDYW4ndCBjYWxsIGludGVsX2RwX2lzX2VkcCgpIHNp bmNlIHRoZSBlbmNvZGVyIG1heSBoYXZlIGJlZW4KKwkgKiBkZXN0cm95ZWQgYWxyZWFkeS4KKwkg Ki8KIAlpZiAoY29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZSA9PSBEUk1fTU9ERV9DT05ORUNUT1Jf ZURQKQogCQlpbnRlbF9wYW5lbF9maW5pKCZpbnRlbF9jb25uZWN0b3ItPnBhbmVsKTsKIApAQCAt NDk0Miw3ICs0OTQ0LDcgQEAgdm9pZCBpbnRlbF9kcF9lbmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRy bV9lbmNvZGVyICplbmNvZGVyKQogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSAmaW50ZWxf ZGlnX3BvcnQtPmRwOwogCiAJaW50ZWxfZHBfbXN0X2VuY29kZXJfY2xlYW51cChpbnRlbF9kaWdf cG9ydCk7Ci0JaWYgKGlzX2VkcChpbnRlbF9kcCkpIHsKKwlpZiAoaW50ZWxfZHBfaXNfZWRwKGlu dGVsX2RwKSkgewogCQljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmludGVsX2RwLT5wYW5lbF92 ZGRfd29yayk7CiAJCS8qCiAJCSAqIHZkZCBtaWdodCBzdGlsbCBiZSBlbmFibGVkIGRvIHRvIHRo ZSBkZWxheWVkIHZkZCBvZmYuCkBAIC00OTY4LDcgKzQ5NzAsNyBAQCB2b2lkIGludGVsX2RwX2Vu Y29kZXJfc3VzcGVuZChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIHsKIAlz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZpbnRlbF9lbmNvZGVy LT5iYXNlKTsKIAotCWlmICghaXNfZWRwKGludGVsX2RwKSkKKwlpZiAoIWludGVsX2RwX2lzX2Vk cChpbnRlbF9kcCkpCiAJCXJldHVybjsKIAogCS8qCkBAIC01MDM2LDcgKzUwMzgsNyBAQCB2b2lk IGludGVsX2RwX2VuY29kZXJfcmVzZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCWlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJ aW50ZWxfZHAtPmFjdGl2ZV9waXBlID0gdmx2X2FjdGl2ZV9waXBlKGludGVsX2RwKTsKIAotCWlm IChpc19lZHAoaW50ZWxfZHApKSB7CisJaWYgKGludGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpIHsK IAkJLyogUmVpbml0IHRoZSBwb3dlciBzZXF1ZW5jZXIsIGluIGNhc2UgQklPUyBkaWQgc29tZXRo aW5nIHdpdGggaXQuICovCiAJCWludGVsX2RwX3Bwc19pbml0KGVuY29kZXItPmRldiwgaW50ZWxf ZHApOwogCQlpbnRlbF9lZHBfcGFuZWxfdmRkX3Nhbml0aXplKGludGVsX2RwKTsKQEAgLTUxNjAs NyArNTE2Miw3IEBAIGludGVsX2RwX2FkZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0CiAJaW50ZWxfYXR0YWNoX2ZvcmNl X2F1ZGlvX3Byb3BlcnR5KGNvbm5lY3Rvcik7CiAJaW50ZWxfYXR0YWNoX2Jyb2FkY2FzdF9yZ2Jf cHJvcGVydHkoY29ubmVjdG9yKTsKIAotCWlmIChpc19lZHAoaW50ZWxfZHApKSB7CisJaWYgKGlu dGVsX2RwX2lzX2VkcChpbnRlbF9kcCkpIHsKIAkJdTMyIGFsbG93ZWRfc2NhbGVyczsKIAogCQlh bGxvd2VkX3NjYWxlcnMgPSBCSVQoRFJNX01PREVfU0NBTEVfQVNQRUNUKSB8IEJJVChEUk1fTU9E RV9TQ0FMRV9GVUxMU0NSRUVOKTsKQEAgLTU4MjYsNyArNTgyOCw3IEBAIHN0YXRpYyBib29sIGlu dGVsX2VkcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCXN0cnVj dCBlZGlkICplZGlkOwogCWVudW0gcGlwZSBwaXBlID0gSU5WQUxJRF9QSVBFOwogCi0JaWYgKCFp c19lZHAoaW50ZWxfZHApKQorCWlmICghaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSkKIAkJcmV0 dXJuIHRydWU7CiAKIAkvKgpAQCAtNjA2MCw3ICs2MDYyLDggQEAgaW50ZWxfZHBfaW5pdF9jb25u ZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAKIAkvKiBl RFAgb25seSBvbiBwb3J0IEIgYW5kL29yIEMgb24gdmx2L2NodiAqLwogCWlmIChXQVJOX09OKChJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgJiYKLQkJ ICAgIGlzX2VkcChpbnRlbF9kcCkgJiYgcG9ydCAhPSBQT1JUX0IgJiYgcG9ydCAhPSBQT1JUX0Mp KQorCQkgICAgaW50ZWxfZHBfaXNfZWRwKGludGVsX2RwKSAmJgorCQkgICAgcG9ydCAhPSBQT1JU X0IgJiYgcG9ydCAhPSBQT1JUX0MpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlEUk1fREVCVUdfS01T KCJBZGRpbmcgJXMgY29ubmVjdG9yIG9uIHBvcnQgJWNcbiIsCkBAIC02MDg4LDcgKzYwOTEsNyBA QCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRl bF9kaWdfcG9ydCwKIAkJaW50ZWxfY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUgPSBpbnRlbF9jb25u ZWN0b3JfZ2V0X2h3X3N0YXRlOwogCiAJLyogaW5pdCBNU1Qgb24gcG9ydHMgdGhhdCBjYW4gc3Vw cG9ydCBpdCAqLwotCWlmIChIQVNfRFBfTVNUKGRldl9wcml2KSAmJiAhaXNfZWRwKGludGVsX2Rw KSAmJgorCWlmIChIQVNfRFBfTVNUKGRldl9wcml2KSAmJiAhaW50ZWxfZHBfaXNfZWRwKGludGVs X2RwKSAmJgogCSAgICAocG9ydCA9PSBQT1JUX0IgfHwgcG9ydCA9PSBQT1JUX0MgfHwgcG9ydCA9 PSBQT1JUX0QpKQogCQlpbnRlbF9kcF9tc3RfZW5jb2Rlcl9pbml0KGludGVsX2RpZ19wb3J0LAog CQkJCQkgIGludGVsX2Nvbm5lY3Rvci0+YmFzZS5iYXNlLmlkKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKaW5kZXggNjkwZTNiNjdkYzFjLi4yOTQwZDM5M2VjZmQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCkBAIC0xNDk5LDYgKzE0OTksNyBAQCBpbnQgaW50ZWxfZHBfc2lua19jcmMoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCwgdTggKmNyYyk7CiBib29sIGludGVsX2RwX2NvbXB1dGVf Y29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgICBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9y X3N0YXRlICpjb25uX3N0YXRlKTsKK2Jvb2wgaW50ZWxfZHBfaXNfZWRwKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApOwogYm9vbCBpbnRlbF9kcF9pc19wb3J0X2VkcChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KTsKIGVudW0gaXJxcmV0dXJuIGludGVs X2RwX2hwZF9wdWxzZShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwK IAkJCQkgIGJvb2wgbG9uZ19ocGQpOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK