From: Michel Thierry Subject: [PATCH v3 02/17] drm/i915/gen8: Make pdp allocation more dynamic Date: Wed, 1 Jul 2015 16:27:18 +0100 Message-ID: <1435764453-11954-3-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-1-git-send-email-michel.thierry@intel.com> <1435764453-11954-1-git-send-email-michel.thierry@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 ESMTP id 58ED86EB7D for ; Wed, 1 Jul 2015 08:27:37 -0700 (PDT) In-Reply-To: <1435764453-11954-1-git-send-email-michel.thierry@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: akash.goel@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyB0cmFuc2l0aW9uYWwgcGF0Y2ggZG9lc24ndCBkbyBtdWNoIGZvciB0aGUgZXhpc3Rpbmcg Y29kZS4gSG93ZXZlciwKaXQgc2hvdWxkIG1ha2UgdXBjb21pbmcgcGF0Y2hlcyB0byB1c2UgdGhl IGZ1bGwgNDhiIGFkZHJlc3Mgc3BhY2UgYSBiaXQKZWFzaWVyLiBUaGUgcGF0Y2ggYWxzbyBpbnRy b2R1Y2VzIHRoZSBQTUw0LCBpZS4gdGhlIG5ldyB0b3AgbGV2ZWwgc3RydWN0dXJlCm9mIHRoZSBw YWdlIHRhYmxlcy4KCnYyOiBSZW5hbWVkICBwZHBfZnJlZSB0byBiZSBzaW1pbGFyIHRvICBwZC9w dCAodW5tYXBfYW5kX2ZyZWVfcGRwKS4KdjM6IFRvIGZhY2lsaXRhdGUgdGVzdGluZywgNDhiIG1v ZGUgd2lsbCBiZSBhdmFpbGFibGUgb24gQnJvYWR3ZWxsIGFuZApHRU45Kywgd2hlbiBpOTE1LmVu YWJsZV9wcGd0dCA9IDMuCnY0OiBSZWJhc2UgYWZ0ZXIgcy9wYWdlX3RhYmxlcy9wYWdlX3RhYmxl LywgYWRkZWQgZXh0cmEgaW5mb3JtYXRpb24KYWJvdXQgNC1sZXZlbCBwYWdlIHRhYmxlIGZvcm1h dHMgYW5kIHVzZSBJU19FTkFCTEVEIG1hY3JvLgp2NTogQ2hlY2sgQ09ORklHX1g4Nl82NCBpbnN0 ZWFkIG9mIENPTkZJR182NEJJVC4KdjY6IFJlYmFzZSBhZnRlciBNaWthJ3MgcHBndHQgY2xlYW51 cCAvIHNjcmF0Y2ggbWVyZ2UgcGF0Y2ggc2VyaWVzLCBhbmQgZm9sbG93CmhpcyBub21lbmNsYXR1 cmUgaW4gcGRwIGZ1bmN0aW9ucyAodGhlcmUgaXMgbm8gYWxsb2NfcGRwIHlldCkuCnY3OiBSZWJh c2UgYWZ0ZXIgbWVyZ2VkIHZlcnNpb24gb2YgTWlrYSdzIHBwZ3R0IGNsZWFudXAgcGF0Y2ggc2Vy aWVzLgp2ODogUmViYXNlIGFmdGVyIGZpbmFsIG1lcmdlZCB2ZXJzaW9uIG9mIE1pa2EncyBwcGd0 dC9zY3JhdGNoIHBhdGNoZXMuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lk YXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBp bnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg fCAgIDcgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDExNiArKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5oIHwgIDQxICsrKysrKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTI4IGlu c2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDFkYmQ5NTcuLjdiY2NmZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjQ5MCw3ICsy NDkwLDEyIEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBIQVNfSFdfQ09O VEVYVFMoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNikKICNkZWZpbmUgSEFTX0xPR0lD QUxfUklOR19DT05URVhUUyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4KQogI2RlZmlu ZSBVU0VTX1BQR1RUKGRldikJCShpOTE1LmVuYWJsZV9wcGd0dCkKLSNkZWZpbmUgVVNFU19GVUxM X1BQR1RUKGRldikJKGk5MTUuZW5hYmxlX3BwZ3R0ID09IDIpCisjZGVmaW5lIFVTRVNfRlVMTF9Q UEdUVChkZXYpCShpOTE1LmVuYWJsZV9wcGd0dCA+PSAyKQorI2lmZGVmIENPTkZJR19YODZfNjQK KyMgZGVmaW5lIFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpCShpOTE1LmVuYWJsZV9wcGd0dCA9 PSAzKQorI2Vsc2UKKyMgZGVmaW5lIFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpCWZhbHNlCisj ZW5kaWYKIAogI2RlZmluZSBIQVNfT1ZFUkxBWShkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5oYXNf b3ZlcmxheSkKICNkZWZpbmUgT1ZFUkxBWV9ORUVEU19QSFlTSUNBTChkZXYpCShJTlRFTF9JTkZP KGRldiktPm92ZXJsYXlfbmVlZHNfcGh5c2ljYWwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IDcxMmNhMzQuLmNkY2M3NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCkBAIC0xMDQsOSArMTA0LDEzIEBAIHN0YXRpYyBpbnQgc2FuaXRpemVfZW5hYmxlX3BwZ3R0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBlbmFibGVfcHBndHQpCiB7CiAJYm9vbCBoYXNf YWxpYXNpbmdfcHBndHQ7CiAJYm9vbCBoYXNfZnVsbF9wcGd0dDsKKwlib29sIGhhc19mdWxsXzY0 Yml0X3BwZ3R0OwogCiAJaGFzX2FsaWFzaW5nX3BwZ3R0ID0gSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNjsKIAloYXNfZnVsbF9wcGd0dCA9IElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDc7CisJaGFz X2Z1bGxfNjRiaXRfcHBndHQgPSBJU19FTkFCTEVEKENPTkZJR19YODZfNjQpICYmCisJCQkgICAg ICAgKElTX0JST0FEV0VMTChkZXYpIHx8CisJCQkJSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkg JiYgZmFsc2U7IC8qIEZJWE1FOiA2NGIgKi8KIAogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXYp KQogCQloYXNfZnVsbF9wcGd0dCA9IGZhbHNlOyAvKiBlbXVsYXRpb24gaXMgdG9vIGhhcmQgKi8K QEAgLTEyNSw2ICsxMjksOSBAQCBzdGF0aWMgaW50IHNhbml0aXplX2VuYWJsZV9wcGd0dChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX3BwZ3R0KQogCWlmIChlbmFibGVfcHBndHQg PT0gMiAmJiBoYXNfZnVsbF9wcGd0dCkKIAkJcmV0dXJuIDI7CiAKKwlpZiAoZW5hYmxlX3BwZ3R0 ID09IDMgJiYgaGFzX2Z1bGxfNjRiaXRfcHBndHQpCisJCXJldHVybiAzOworCiAjaWZkZWYgQ09O RklHX0lOVEVMX0lPTU1VCiAJLyogRGlzYWJsZSBwcGd0dCBvbiBTTkIgaWYgVlQtZCBpcyBvbi4g Ki8KIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gNiAmJiBpbnRlbF9pb21tdV9nZnhfbWFw cGVkKSB7CkBAIC01MjIsNiArNTI5LDQ1IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6ZV9w ZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlmaWxsX3B4KHZtLT5kZXYsIHBkLCBz Y3JhdGNoX3BkZSk7CiB9CiAKK3N0YXRpYyBpbnQgX19wZHBfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAorCQkgICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAp Cit7CisJc2l6ZV90IHBkcGVzID0gSTkxNV9QRFBFU19QRVJfUERQKGRldik7CisKKwlwZHAtPnVz ZWRfcGRwZXMgPSBrY2FsbG9jKEJJVFNfVE9fTE9OR1MocGRwZXMpLAorCQkJCSAgc2l6ZW9mKHVu c2lnbmVkIGxvbmcpLAorCQkJCSAgR0ZQX0tFUk5FTCk7CisJaWYgKCFwZHAtPnVzZWRfcGRwZXMp CisJCXJldHVybiAtRU5PTUVNOworCisJcGRwLT5wYWdlX2RpcmVjdG9yeSA9IGtjYWxsb2MocGRw ZXMsIHNpemVvZigqcGRwLT5wYWdlX2RpcmVjdG9yeSksCisJCQkJICAgICAgR0ZQX0tFUk5FTCk7 CisJaWYgKCFwZHAtPnBhZ2VfZGlyZWN0b3J5KSB7CisJCWtmcmVlKHBkcC0+dXNlZF9wZHBlcyk7 CisJCS8qIHRoZSBQRFAgbWlnaHQgYmUgdGhlIHN0YXRpY2FsbHkgYWxsb2NhdGVkIHRvcCBsZXZl bC4gS2VlcCBpdAorCQkgKiBhcyBjbGVhbiBhcyBwb3NzaWJsZSAqLworCQlwZHAtPnVzZWRfcGRw ZXMgPSBOVUxMOworCQlyZXR1cm4gLUVOT01FTTsKKwl9CisKKwlyZXR1cm4gMDsKK30KKworc3Rh dGljIHZvaWQgX19wZHBfZmluaShzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpw ZHApCit7CisJa2ZyZWUocGRwLT51c2VkX3BkcGVzKTsKKwlrZnJlZShwZHAtPnBhZ2VfZGlyZWN0 b3J5KTsKKwlwZHAtPnBhZ2VfZGlyZWN0b3J5ID0gTlVMTDsKK30KKworc3RhdGljIHZvaWQgZnJl ZV9wZHAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeV9wb2ludGVyICpwZHApCit7CisJX19wZHBfZmluaShwZHApOworCWlmIChVU0VTX0ZV TExfNDhCSVRfUFBHVFQoZGV2KSkKKwkJa2ZyZWUocGRwKTsKK30KKwogLyogQnJvYWR3ZWxsIFBh Z2UgRGlyZWN0b3J5IFBvaW50ZXIgRGVzY3JpcHRvcnMgKi8KIHN0YXRpYyBpbnQgZ2VuOF93cml0 ZV9wZHAoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkgIHVuc2lnbmVkIGVu dHJ5LApAQCAtNjM0LDkgKzY4MCw2IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2Vu dHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJcHRfdmFkZHIgPSBOVUxMOwog CiAJZm9yX2VhY2hfc2dfcGFnZShwYWdlcy0+c2dsLCAmc2dfaXRlciwgcGFnZXMtPm5lbnRzLCAw KSB7Ci0JCWlmIChXQVJOX09OKHBkcGUgPj0gR0VOOF9MRUdBQ1lfUERQRVMpKQotCQkJYnJlYWs7 Ci0KIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpIHsKIAkJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0 b3J5ICpwZCA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV07CiAJCQlzdHJ1Y3QgaTkx NV9wYWdlX3RhYmxlICpwdCA9IHBkLT5wYWdlX3RhYmxlW3BkZV07CkBAIC03MjAsNyArNzYzLDgg QEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtKQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsK IAlpbnQgaTsKIAotCWZvcl9lYWNoX3NldF9iaXQoaSwgcHBndHQtPnBkcC51c2VkX3BkcGVzLCBH RU44X0xFR0FDWV9QRFBFUykgeworCWZvcl9lYWNoX3NldF9iaXQoaSwgcHBndHQtPnBkcC51c2Vk X3BkcGVzLAorCQkJCUk5MTVfUERQRVNfUEVSX1BEUChwcGd0dC0+YmFzZS5kZXYpKSB7CiAJCWlm IChXQVJOX09OKCFwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKSkKIAkJCWNvbnRpbnVlOwog CkBAIC03MjksNiArNzczLDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCQlmcmVlX3BkKHBwZ3R0LT5iYXNlLmRldiwgcHBn dHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7CiAJfQogCisJZnJlZV9wZHAocHBndHQtPmJhc2Uu ZGV2LCAmcHBndHQtPnBkcCk7CiAJZ2VuOF9mcmVlX3NjcmF0Y2godm0pOwogfQogCkBAIC04MjAs OCArODY1LDkgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMo c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5 ICpwZDsKIAl1aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkcGU7CisJdWludDMyX3QgcGRwZXMg PSAgSTkxNV9QRFBFU19QRVJfUERQKHBwZ3R0LT5iYXNlLmRldik7CiAKLQlXQVJOX09OKCFiaXRt YXBfZW1wdHkobmV3X3BkcywgR0VOOF9MRUdBQ1lfUERQRVMpKTsKKwlXQVJOX09OKCFiaXRtYXBf ZW1wdHkobmV3X3BkcywgcGRwZXMpKTsKIAogCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgcGRwLCBz dGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CiAJCWlmIChwZCkKQEAgLTgzOSwxOCArODg1LDE5 IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoKLQlmb3JfZWFj aF9zZXRfYml0KHBkcGUsIG5ld19wZHMsIEdFTjhfTEVHQUNZX1BEUEVTKQorCWZvcl9lYWNoX3Nl dF9iaXQocGRwZSwgbmV3X3BkcywgcGRwZXMpCiAJCWZyZWVfcGQoZGV2LCBwZHAtPnBhZ2VfZGly ZWN0b3J5W3BkcGVdKTsKIAogCXJldHVybiAtRU5PTUVNOwogfQogCiBzdGF0aWMgdm9pZAotZnJl ZV9nZW44X3RlbXBfYml0bWFwcyh1bnNpZ25lZCBsb25nICpuZXdfcGRzLCB1bnNpZ25lZCBsb25n ICoqbmV3X3B0cykKK2ZyZWVfZ2VuOF90ZW1wX2JpdG1hcHModW5zaWduZWQgbG9uZyAqbmV3X3Bk cywgdW5zaWduZWQgbG9uZyAqKm5ld19wdHMsCisJCSAgICAgICB1aW50MzJfdCBwZHBlcykKIHsK IAlpbnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBHRU44X0xFR0FDWV9QRFBFUzsgaSsrKQorCWZv ciAoaSA9IDA7IGkgPCBwZHBlczsgaSsrKQogCQlrZnJlZShuZXdfcHRzW2ldKTsKIAlrZnJlZShu ZXdfcHRzKTsKIAlrZnJlZShuZXdfcGRzKTsKQEAgLTg2MSwyMyArOTA4LDI0IEBAIGZyZWVfZ2Vu OF90ZW1wX2JpdG1hcHModW5zaWduZWQgbG9uZyAqbmV3X3BkcywgdW5zaWduZWQgbG9uZyAqKm5l d19wdHMpCiAgKi8KIHN0YXRpYwogaW50IF9fbXVzdF9jaGVjayBhbGxvY19nZW44X3RlbXBfYml0 bWFwcyh1bnNpZ25lZCBsb25nICoqbmV3X3BkcywKLQkJCQkJIHVuc2lnbmVkIGxvbmcgKioqbmV3 X3B0cykKKwkJCQkJIHVuc2lnbmVkIGxvbmcgKioqbmV3X3B0cywKKwkJCQkJIHVpbnQzMl90IHBk cGVzKQogewogCWludCBpOwogCXVuc2lnbmVkIGxvbmcgKnBkczsKIAl1bnNpZ25lZCBsb25nICoq cHRzOwogCi0JcGRzID0ga2NhbGxvYyhCSVRTX1RPX0xPTkdTKEdFTjhfTEVHQUNZX1BEUEVTKSwg c2l6ZW9mKHVuc2lnbmVkIGxvbmcpLCBHRlBfS0VSTkVMKTsKKwlwZHMgPSBrY2FsbG9jKEJJVFNf VE9fTE9OR1MocGRwZXMpLCBzaXplb2YodW5zaWduZWQgbG9uZyksIEdGUF9LRVJORUwpOwogCWlm ICghcGRzKQogCQlyZXR1cm4gLUVOT01FTTsKIAotCXB0cyA9IGtjYWxsb2MoR0VOOF9MRUdBQ1lf UERQRVMsIHNpemVvZih1bnNpZ25lZCBsb25nICopLCBHRlBfS0VSTkVMKTsKKwlwdHMgPSBrY2Fs bG9jKHBkcGVzLCBzaXplb2YodW5zaWduZWQgbG9uZyAqKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFw dHMpIHsKIAkJa2ZyZWUocGRzKTsKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JZm9yIChpID0g MDsgaSA8IEdFTjhfTEVHQUNZX1BEUEVTOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgcGRwZXM7 IGkrKykgewogCQlwdHNbaV0gPSBrY2FsbG9jKEJJVFNfVE9fTE9OR1MoSTkxNV9QREVTKSwKIAkJ CQkgc2l6ZW9mKHVuc2lnbmVkIGxvbmcpLCBHRlBfS0VSTkVMKTsKIAkJaWYgKCFwdHNbaV0pCkBA IC04OTAsNyArOTM4LDcgQEAgaW50IF9fbXVzdF9jaGVjayBhbGxvY19nZW44X3RlbXBfYml0bWFw cyh1bnNpZ25lZCBsb25nICoqbmV3X3BkcywKIAlyZXR1cm4gMDsKIAogZXJyX291dDoKLQlmcmVl X2dlbjhfdGVtcF9iaXRtYXBzKHBkcywgcHRzKTsKKwlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKHBk cywgcHRzLCBwZHBlcyk7CiAJcmV0dXJuIC1FTk9NRU07CiB9CiAKQEAgLTkxNiw2ICs5NjQsNyBA QCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJY29uc3QgdWludDY0X3Qgb3JpZ19sZW5ndGggPSBsZW5ndGg7CiAJdWludDY0X3Qg dGVtcDsKIAl1aW50MzJfdCBwZHBlOworCXVpbnQzMl90IHBkcGVzID0gSTkxNV9QRFBFU19QRVJf UERQKGRldik7CiAJaW50IHJldDsKIAogCS8qIFdyYXAgaXMgbmV2ZXIgb2theSBzaW5jZSB3ZSBj YW4gb25seSByZXByZXNlbnQgNDhiLCBhbmQgd2UgZG9uJ3QKQEAgLTkyNyw3ICs5NzYsNyBAQCBz dGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGggPiBwcGd0dC0+YmFzZS50b3RhbCkpCiAJ CXJldHVybiAtRU5PREVWOwogCi0JcmV0ID0gYWxsb2NfZ2VuOF90ZW1wX2JpdG1hcHMoJm5ld19w YWdlX2RpcnMsICZuZXdfcGFnZV90YWJsZXMpOworCXJldCA9IGFsbG9jX2dlbjhfdGVtcF9iaXRt YXBzKCZuZXdfcGFnZV9kaXJzLCAmbmV3X3BhZ2VfdGFibGVzLCBwZHBlcyk7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIApAQCAtOTM1LDcgKzk4NCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxv Y192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlyZXQgPSBnZW44X3Bw Z3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMocHBndHQsICZwcGd0dC0+cGRwLCBzdGFydCwgbGVu Z3RoLAogCQkJCQluZXdfcGFnZV9kaXJzKTsKIAlpZiAocmV0KSB7Ci0JCWZyZWVfZ2VuOF90ZW1w X2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzKTsKKwkJZnJlZV9nZW44X3Rl bXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMsIHBkcGVzKTsKIAkJcmV0 dXJuIHJldDsKIAl9CiAKQEAgLTk4OSw3ICsxMDM4LDcgQEAgc3RhdGljIGludCBnZW44X2FsbG9j X3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlfX3NldF9iaXQocGRw ZSwgcHBndHQtPnBkcC51c2VkX3BkcGVzKTsKIAl9CiAKLQlmcmVlX2dlbjhfdGVtcF9iaXRtYXBz KG5ld19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcyk7CisJZnJlZV9nZW44X3RlbXBfYml0bWFw cyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMsIHBkcGVzKTsKIAltYXJrX3RsYnNfZGly dHkocHBndHQpOwogCXJldHVybiAwOwogCkBAIC05OTksMTAgKzEwNDgsMTAgQEAgZXJyX291dDoK IAkJCWZyZWVfcHQodm0tPmRldiwgcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXS0+cGFn ZV90YWJsZVt0ZW1wXSk7CiAJfQogCi0JZm9yX2VhY2hfc2V0X2JpdChwZHBlLCBuZXdfcGFnZV9k aXJzLCBHRU44X0xFR0FDWV9QRFBFUykKKwlmb3JfZWFjaF9zZXRfYml0KHBkcGUsIG5ld19wYWdl X2RpcnMsIHBkcGVzKQogCQlmcmVlX3BkKHZtLT5kZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rv cnlbcGRwZV0pOwogCi0JZnJlZV9nZW44X3RlbXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdf cGFnZV90YWJsZXMpOworCWZyZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3 X3BhZ2VfdGFibGVzLCBwZHBlcyk7CiAJbWFya190bGJzX2RpcnR5KHBwZ3R0KTsKIAlyZXR1cm4g cmV0OwogfQpAQCAtMTAyMywxNCArMTA3Miw2IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0 KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJcmV0dXJuIHJldDsKIAogCXBwZ3R0LT5i YXNlLnN0YXJ0ID0gMDsKLQlwcGd0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgMzI7Ci0JaWYgKElT X0VOQUJMRUQoQ09ORklHX1g4Nl8zMikpCi0JCS8qIFdoaWxlIHdlIGhhdmUgYSBwcm9saWZlcmF0 aW9uIG9mIHNpemVfdCB2YXJpYWJsZXMKLQkJICogd2UgY2Fubm90IHJlcHJlc2VudCB0aGUgZnVs bCBwcGd0dCBzaXplIG9uIDMyYml0LAotCQkgKiBzbyBsaW1pdCBpdCB0byB0aGUgc2FtZSBzaXpl IGFzIHRoZSBHR1RUIChjdXJyZW50bHkKLQkJICogMkdpQikuCi0JCSAqLwotCQlwcGd0dC0+YmFz ZS50b3RhbCA9IHRvX2k5MTUocHBndHQtPmJhc2UuZGV2KS0+Z3R0LmJhc2UudG90YWw7CiAJcHBn dHQtPmJhc2UuY2xlYW51cCA9IGdlbjhfcHBndHRfY2xlYW51cDsKIAlwcGd0dC0+YmFzZS5hbGxv Y2F0ZV92YV9yYW5nZSA9IGdlbjhfYWxsb2NfdmFfcmFuZ2U7CiAJcHBndHQtPmJhc2UuaW5zZXJ0 X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzOwpAQCAtMTA0MCw3ICsxMDgxLDMw IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCkKIAogCXBwZ3R0LT5zd2l0Y2hfbW0gPSBnZW44X21tX3N3aXRjaDsKIAorCWlmICghVVNFU19G VUxMXzQ4QklUX1BQR1RUKHBwZ3R0LT5iYXNlLmRldikpIHsKKwkJcmV0ID0gX19wZHBfaW5pdChm YWxzZSwgJnBwZ3R0LT5wZHApOworCisJCWlmIChyZXQpCisJCQlnb3RvIGZyZWVfc2NyYXRjaDsK KworCQlwcGd0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgMzI7CisJCWlmIChJU19FTkFCTEVEKENP TkZJR19YODZfMzIpKQorCQkJLyogV2hpbGUgd2UgaGF2ZSBhIHByb2xpZmVyYXRpb24gb2Ygc2l6 ZV90IHZhcmlhYmxlcworCQkJICogd2UgY2Fubm90IHJlcHJlc2VudCB0aGUgZnVsbCBwcGd0dCBz aXplIG9uIDMyYml0LAorCQkJICogc28gbGltaXQgaXQgdG8gdGhlIHNhbWUgc2l6ZSBhcyB0aGUg R0dUVCAoY3VycmVudGx5CisJCQkgKiAyR2lCKS4KKwkJCSAqLworCQkJcHBndHQtPmJhc2UudG90 YWwgPSB0b19pOTE1KHBwZ3R0LT5iYXNlLmRldiktPmd0dC5iYXNlLnRvdGFsOworCX0gZWxzZSB7 CisJCXBwZ3R0LT5iYXNlLnRvdGFsID0gMVVMTCA8PCA0ODsKKwkJcmV0dXJuIC1FUEVSTTsgLyog Tm90IHlldCBpbXBsZW1lbnRlZCAqLworCX0KKwogCXJldHVybiAwOworCitmcmVlX3NjcmF0Y2g6 CisJZ2VuOF9mcmVlX3NjcmF0Y2goJnBwZ3R0LT5iYXNlKTsKKwlyZXR1cm4gcmV0OwogfQogCiBz dGF0aWMgdm9pZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBz dHJ1Y3Qgc2VxX2ZpbGUgKm0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGQ1 YmY5NTMuLmUyYjY4NGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC04OCw5 ICs4OCwxNyBAQCB0eXBlZGVmIHVpbnQ2NF90IGdlbjhfcGRlX3Q7CiAgKiBQRFBFICB8ICBQREUg IHwgIFBURSAgfCBvZmZzZXQKICAqIFRoZSBkaWZmZXJlbmNlIGFzIGNvbXBhcmVkIHRvIG5vcm1h bCB4ODYgMyBsZXZlbCBwYWdlIHRhYmxlIGlzIHRoZSBQRFBFcyBhcmUKICAqIHByb2dyYW1tZWQg dmlhIHJlZ2lzdGVyLgorICoKKyAqIEdFTjggNDhiIGxlZ2FjeSBzdHlsZSBhZGRyZXNzIGlzIGRl ZmluZWQgYXMgYSA0IGxldmVsIHBhZ2UgdGFibGU6CisgKiA0NzozOSB8IDM4OjMwIHwgMjk6MjEg fCAyMDoxMiB8ICAxMTowCisgKiBQTUw0RSB8IFBEUEUgIHwgIFBERSAgfCAgUFRFICB8IG9mZnNl dAogICovCisjZGVmaW5lIEdFTjhfUE1MNEVTX1BFUl9QTUw0CQk1MTIKKyNkZWZpbmUgR0VOOF9Q TUw0RV9TSElGVAkJMzkKICNkZWZpbmUgR0VOOF9QRFBFX1NISUZUCQkJMzAKLSNkZWZpbmUgR0VO OF9QRFBFX01BU0sJCQkweDMKKy8qIE5COiBHRU44X1BEUEVfTUFTSyBpcyB1bnRydWUgZm9yIDMy YiBwbGF0Zm9ybXMsIGJ1dCBpdCBoYXMgbm8gaW1wYWN0IG9uIDMyYiBwYWdlCisgKiB0YWJsZXMg Ki8KKyNkZWZpbmUgR0VOOF9QRFBFX01BU0sJCQkweDFmZgogI2RlZmluZSBHRU44X1BERV9TSElG VAkJCTIxCiAjZGVmaW5lIEdFTjhfUERFX01BU0sJCQkweDFmZgogI2RlZmluZSBHRU44X1BURV9T SElGVAkJCTEyCkBAIC05OCw2ICsxMDYsOSBAQCB0eXBlZGVmIHVpbnQ2NF90IGdlbjhfcGRlX3Q7 CiAjZGVmaW5lIEdFTjhfTEVHQUNZX1BEUEVTCQk0CiAjZGVmaW5lIEdFTjhfUFRFUwkJCUk5MTVf UFRFUyhzaXplb2YoZ2VuOF9wdGVfdCkpCiAKKyNkZWZpbmUgSTkxNV9QRFBFU19QRVJfUERQKGRl dikgKFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpID9cCisJCQkJR0VOOF9QTUw0RVNfUEVSX1BN TDQgOiBHRU44X0xFR0FDWV9QRFBFUykKKwogI2RlZmluZSBQUEFUX1VOQ0FDSEVEX0lOREVYCQko X1BBR0VfUFdUIHwgX1BBR0VfUENEKQogI2RlZmluZSBQUEFUX0NBQ0hFRF9QREVfSU5ERVgJCTAg LyogV0IgTExDICovCiAjZGVmaW5lIFBQQVRfQ0FDSEVEX0lOREVYCQlfUEFHRV9QQVQgLyogV0Ig TExDZUxMQyAqLwpAQCAtMjQxLDkgKzI1MiwxNyBAQCBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eSB7CiB9OwogCiBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyIHsKLQkvKiBzdHJ1 Y3QgcGFnZSAqcGFnZTsgKi8KLQlERUNMQVJFX0JJVE1BUCh1c2VkX3BkcGVzLCBHRU44X0xFR0FD WV9QRFBFUyk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBhZ2VfZGlyZWN0b3J5W0dF TjhfTEVHQUNZX1BEUEVTXTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RtYSBiYXNlOworCisJdW5zaWdu ZWQgbG9uZyAqdXNlZF9wZHBlczsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqKnBhZ2Vf ZGlyZWN0b3J5OworfTsKKworc3RydWN0IGk5MTVfcG1sNCB7CisJc3RydWN0IGk5MTVfcGFnZV9k bWEgYmFzZTsKKworCURFQ0xBUkVfQklUTUFQKHVzZWRfcG1sNGVzLCBHRU44X1BNTDRFU19QRVJf UE1MNCk7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwc1tHRU44X1BN TDRFU19QRVJfUE1MNF07CiB9OwogCiBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlIHsKQEAgLTM0 MSw4ICszNjAsOSBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJc3RydWN0IGRybV9tbV9ub2Rl IG5vZGU7CiAJdW5zaWduZWQgbG9uZyBwZF9kaXJ0eV9yaW5nczsKIAl1bmlvbiB7Ci0JCXN0cnVj dCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgcGRwOwotCQlzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeSBwZDsKKwkJc3RydWN0IGk5MTVfcG1sNCBwbWw0OwkJLyogR0VOOCsgJiA0OGIgUFBH VFQgKi8KKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciBwZHA7CS8qIEdFTjgr ICovCisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5IHBkOwkJLyogR0VONi03ICovCiAJfTsK IAogCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdjsKQEAgLTQzNiwxNCAr NDU2LDE3IEBAIHN0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuNl9wZGVfaW5kZXgodWludDMyX3Qg YWRkcikKIAkgICAgIHRlbXAgPSBtaW4odGVtcCwgbGVuZ3RoKSwJCQkJCVwKIAkgICAgIHN0YXJ0 ICs9IHRlbXAsIGxlbmd0aCAtPSB0ZW1wKQogCi0jZGVmaW5lIGdlbjhfZm9yX2VhY2hfcGRwZShw ZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBpdGVyKQkJXAotCWZvciAoaXRlciA9IGdlbjhf cGRwZV9pbmRleChzdGFydCk7CVwKLQkgICAgIHBkID0gKHBkcCktPnBhZ2VfZGlyZWN0b3J5W2l0 ZXJdLCBsZW5ndGggPiAwICYmIGl0ZXIgPCBHRU44X0xFR0FDWV9QRFBFUzsJXAorI2RlZmluZSBn ZW44X2Zvcl9lYWNoX3BkcGVfZShwZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBpdGVyLCBi KQlcCisJZm9yIChpdGVyID0gZ2VuOF9wZHBlX2luZGV4KHN0YXJ0KTsgXAorCSAgICAgcGQgPSAo cGRwKS0+cGFnZV9kaXJlY3RvcnlbaXRlcl0sIGxlbmd0aCA+IDAgJiYgKGl0ZXIgPCBiKTsJXAog CSAgICAgaXRlcisrLAkJCQlcCiAJICAgICB0ZW1wID0gQUxJR04oc3RhcnQrMSwgMSA8PCBHRU44 X1BEUEVfU0hJRlQpIC0gc3RhcnQsCVwKIAkgICAgIHRlbXAgPSBtaW4odGVtcCwgbGVuZ3RoKSwJ CQkJCVwKIAkgICAgIHN0YXJ0ICs9IHRlbXAsIGxlbmd0aCAtPSB0ZW1wKQogCisjZGVmaW5lIGdl bjhfZm9yX2VhY2hfcGRwZShwZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBpdGVyKQkJXAor CWdlbjhfZm9yX2VhY2hfcGRwZV9lKHBkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIGl0ZXIs IEk5MTVfUERQRVNfUEVSX1BEUChkZXYpKQorCiBzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdlbjhf cHRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCiB7CiAJcmV0dXJuIGk5MTVfcHRlX2luZGV4KGFk ZHJlc3MsIEdFTjhfUERFX1NISUZUKTsKLS0gCjIuNC41CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=