From: Michel Thierry Subject: [PATCH v2 04/18] drm/i915/gen8: Make pdp allocation more dynamic Date: Wed, 10 Jun 2015 17:46:41 +0100 Message-ID: <1433954816-13787-5-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5ED4F6E50E for ; Wed, 10 Jun 2015 09:46:50 -0700 (PDT) In-Reply-To: <1433954816-13787-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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyB0cmFuc2l0aW9uYWwgcGF0Y2ggZG9lc24ndCBkbyBtdWNoIGZvciB0aGUgZXhpc3Rpbmcg Y29kZS4gSG93ZXZlciwKaXQgc2hvdWxkIG1ha2UgdXBjb21pbmcgcGF0Y2hlcyB0byB1c2UgdGhl IGZ1bGwgNDhiIGFkZHJlc3Mgc3BhY2UgYSBiaXQKZWFzaWVyLiBUaGUgcGF0Y2ggYWxzbyBpbnRy b2R1Y2VzIHRoZSBQTUw0LCBpZS4gdGhlIG5ldyB0b3AgbGV2ZWwgc3RydWN0dXJlCm9mIHRoZSBw YWdlIHRhYmxlcy4KCnYyOiBSZW5hbWVkICBwZHBfZnJlZSB0byBiZSBzaW1pbGFyIHRvICBwZC9w dCAodW5tYXBfYW5kX2ZyZWVfcGRwKS4KCnYzOiBUbyBmYWNpbGl0YXRlIHRlc3RpbmcsIDQ4YiBt b2RlIHdpbGwgYmUgYXZhaWxhYmxlIG9uIEJyb2Fkd2VsbCBhbmQKR0VOOSssIHdoZW4gaTkxNS5l bmFibGVfcHBndHQgPSAzLgoKdjQ6IFJlYmFzZSBhZnRlciBzL3BhZ2VfdGFibGVzL3BhZ2VfdGFi bGUvLCBhZGRlZCBleHRyYSBpbmZvcm1hdGlvbgphYm91dCA0LWxldmVsIHBhZ2UgdGFibGUgZm9y bWF0cyBhbmQgdXNlIElTX0VOQUJMRUQgbWFjcm8uCgp2NTogQ2hlY2sgQ09ORklHX1g4Nl82NCBp bnN0ZWFkIG9mIENPTkZJR182NEJJVC4KCnY2OiBSZWJhc2UgYWZ0ZXIgTWlrYSdzIHBwZ3R0IGNs ZWFudXAgLyBzY3JhdGNoIG1lcmdlIHBhdGNoIHNlcmllcywgYW5kIGZvbGxvdwpoaXMgbm9tZW5j bGF0dXJlIGluIHBkcCBmdW5jdGlvbnMgKHRoZXJlIGlzIG5vIGFsbG9jX3BkcCB5ZXQpLgoKU2ln bmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5 OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIrKQotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgICA3ICstCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDEyNSArKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDQxICsrKysr KysrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMzUgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOWFkZmQxMi4uODNiNzUzMCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNDM2LDcgKzI0MzYsMTIgQEAgc3RydWN0IGRybV9pOTE1 X2NtZF90YWJsZSB7CiAjZGVmaW5lIEhBU19IV19DT05URVhUUyhkZXYpCShJTlRFTF9JTkZPKGRl diktPmdlbiA+PSA2KQogI2RlZmluZSBIQVNfTE9HSUNBTF9SSU5HX0NPTlRFWFRTKGRldikJKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDgpCiAjZGVmaW5lIFVTRVNfUFBHVFQoZGV2KQkJKGk5MTUu ZW5hYmxlX3BwZ3R0KQotI2RlZmluZSBVU0VTX0ZVTExfUFBHVFQoZGV2KQkoaTkxNS5lbmFibGVf cHBndHQgPT0gMikKKyNkZWZpbmUgVVNFU19GVUxMX1BQR1RUKGRldikJKGk5MTUuZW5hYmxlX3Bw Z3R0ID49IDIpCisjaWZkZWYgQ09ORklHX1g4Nl82NAorIyBkZWZpbmUgVVNFU19GVUxMXzQ4QklU X1BQR1RUKGRldikJKGk5MTUuZW5hYmxlX3BwZ3R0ID09IDMpCisjZWxzZQorIyBkZWZpbmUgVVNF U19GVUxMXzQ4QklUX1BQR1RUKGRldikJZmFsc2UKKyNlbmRpZgogCiAjZGVmaW5lIEhBU19PVkVS TEFZKGRldikJCShJTlRFTF9JTkZPKGRldiktPmhhc19vdmVybGF5KQogI2RlZmluZSBPVkVSTEFZ X05FRURTX1BIWVNJQ0FMKGRldikJKElOVEVMX0lORk8oZGV2KS0+b3ZlcmxheV9uZWVkc19waHlz aWNhbCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZDhhZmRhNS4uODVlNDlj NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTEwNCw5ICsxMDQsMTMgQEAg c3RhdGljIGludCBzYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IGVuYWJsZV9wcGd0dCkKIHsKIAlib29sIGhhc19hbGlhc2luZ19wcGd0dDsKIAlib29sIGhh c19mdWxsX3BwZ3R0OworCWJvb2wgaGFzX2Z1bGxfNjRiaXRfcHBndHQ7CiAKIAloYXNfYWxpYXNp bmdfcHBndHQgPSBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2OwogCWhhc19mdWxsX3BwZ3R0ID0g SU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNzsKKwloYXNfZnVsbF82NGJpdF9wcGd0dCA9IElTX0VO QUJMRUQoQ09ORklHX1g4Nl82NCkgJiYKKwkJCSAgICAgICAoSVNfQlJPQURXRUxMKGRldikgfHwK KwkJCQlJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSAmJiBmYWxzZTsgLyogRklYTUU6IDY0YiAq LwogCiAJaWYgKGludGVsX3ZncHVfYWN0aXZlKGRldikpCiAJCWhhc19mdWxsX3BwZ3R0ID0gZmFs c2U7IC8qIGVtdWxhdGlvbiBpcyB0b28gaGFyZCAqLwpAQCAtMTI1LDYgKzEyOSw5IEBAIHN0YXRp YyBpbnQgc2FuaXRpemVfZW5hYmxlX3BwZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBl bmFibGVfcHBndHQpCiAJaWYgKGVuYWJsZV9wcGd0dCA9PSAyICYmIGhhc19mdWxsX3BwZ3R0KQog CQlyZXR1cm4gMjsKIAorCWlmIChlbmFibGVfcHBndHQgPT0gMyAmJiBoYXNfZnVsbF82NGJpdF9w cGd0dCkKKwkJcmV0dXJuIDM7CisKICNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUKIAkvKiBEaXNh YmxlIHBwZ3R0IG9uIFNOQiBpZiBWVC1kIGlzIG9uLiAqLwogCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA9PSA2ICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpIHsKQEAgLTQ4OCw2ICs0OTUsNDUg QEAgc3RhdGljIHZvaWQgZ2VuOF9pbml0aWFsaXplX3BkKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCWZpbGxfcHgodm0tPmRldiwgcGQsIHNjcmF0Y2hfcGRlKTsKIH0KIAorc3RhdGlj IGludCBfX3BkcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCSAgICAgIHN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCkKK3sKKwlzaXplX3QgcGRwZXMgPSBJOTE1 X1BEUEVTX1BFUl9QRFAoZGV2KTsKKworCXBkcC0+dXNlZF9wZHBlcyA9IGtjYWxsb2MoQklUU19U T19MT05HUyhwZHBlcyksCisJCQkJICBzaXplb2YodW5zaWduZWQgbG9uZyksCisJCQkJICBHRlBf S0VSTkVMKTsKKwlpZiAoIXBkcC0+dXNlZF9wZHBlcykKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlw ZHAtPnBhZ2VfZGlyZWN0b3J5ID0ga2NhbGxvYyhwZHBlcywgc2l6ZW9mKCpwZHAtPnBhZ2VfZGly ZWN0b3J5KSwKKwkJCQkgICAgICBHRlBfS0VSTkVMKTsKKwlpZiAoIXBkcC0+cGFnZV9kaXJlY3Rv cnkpIHsKKwkJa2ZyZWUocGRwLT51c2VkX3BkcGVzKTsKKwkJLyogdGhlIFBEUCBtaWdodCBiZSB0 aGUgc3RhdGljYWxseSBhbGxvY2F0ZWQgdG9wIGxldmVsLiBLZWVwIGl0CisJCSAqIGFzIGNsZWFu IGFzIHBvc3NpYmxlICovCisJCXBkcC0+dXNlZF9wZHBlcyA9IE5VTEw7CisJCXJldHVybiAtRU5P TUVNOworCX0KKworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBfX3BkcF9maW5pKHN0cnVj dCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCkKK3sKKwlrZnJlZShwZHAtPnVzZWRf cGRwZXMpOworCWtmcmVlKHBkcC0+cGFnZV9kaXJlY3RvcnkpOworCXBkcC0+cGFnZV9kaXJlY3Rv cnkgPSBOVUxMOworfQorCitzdGF0aWMgdm9pZCBmcmVlX3BkcChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAorCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCkKK3sK KwlfX3BkcF9maW5pKHBkcCk7CisJaWYgKFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpKQorCQlr ZnJlZShwZHApOworfQorCiAjZGVmaW5lIFNDUkFUQ0hfUEFHRV9NQUdJQyAweGZmZmYwMGZmZmZm ZjAwZmZVTEwKIAogc3RhdGljIGludCBhbGxvY19zY3JhdGNoX3BhZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0pCkBAIC03MzksOSArNzg1LDYgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0 dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAlwdF92YWRk ciA9IE5VTEw7CiAKIAlmb3JfZWFjaF9zZ19wYWdlKHBhZ2VzLT5zZ2wsICZzZ19pdGVyLCBwYWdl cy0+bmVudHMsIDApIHsKLQkJaWYgKFdBUk5fT04ocGRwZSA+PSBHRU44X0xFR0FDWV9QRFBFUykp Ci0JCQlicmVhazsKLQogCQlpZiAocHRfdmFkZHIgPT0gTlVMTCkgewogCQkJc3RydWN0IGk5MTVf cGFnZV9kaXJlY3RvcnkgKnBkID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXTsKIAkJ CXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0ID0gcGQtPnBhZ2VfdGFibGVbcGRlXTsKQEAgLTc4 OSw3ICs4MzIsOCBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0pCiAJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBn dHQsIGJhc2UpOwogCWludCBpOwogCi0JZm9yX2VhY2hfc2V0X2JpdChpLCBwcGd0dC0+cGRwLnVz ZWRfcGRwZXMsIEdFTjhfTEVHQUNZX1BEUEVTKSB7CisJZm9yX2VhY2hfc2V0X2JpdChpLCBwcGd0 dC0+cGRwLnVzZWRfcGRwZXMsCisJCQkJSTkxNV9QRFBFU19QRVJfUERQKHBwZ3R0LT5iYXNlLmRl dikpIHsKIAkJaWYgKFdBUk5fT04oIXBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pKQogCQkJ Y29udGludWU7CiAKQEAgLTc5OCw2ICs4NDIsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2Ns ZWFudXAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiAJCWZyZWVfcGQocHBndHQtPmJh c2UuZGV2LCBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKIAl9CiAKKwlmcmVlX3BkcChw cGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cGRwKTsKIAljbGVhbnVwX3NjcmF0Y2godm0pOwogfQog CkBAIC04ODksOCArOTM0LDkgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGly ZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCXN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5ICpwZDsKIAl1aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkcGU7CisJdWludDMy X3QgcGRwZXMgPSAgSTkxNV9QRFBFU19QRVJfUERQKHBwZ3R0LT5iYXNlLmRldik7CiAKLQlXQVJO X09OKCFiaXRtYXBfZW1wdHkobmV3X3BkcywgR0VOOF9MRUdBQ1lfUERQRVMpKTsKKwlXQVJOX09O KCFiaXRtYXBfZW1wdHkobmV3X3BkcywgcGRwZXMpKTsKIAogCWdlbjhfZm9yX2VhY2hfcGRwZShw ZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CiAJCWlmIChwZCkKQEAgLTkwOCwx OCArOTU0LDE5IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoK LQlmb3JfZWFjaF9zZXRfYml0KHBkcGUsIG5ld19wZHMsIEdFTjhfTEVHQUNZX1BEUEVTKQorCWZv cl9lYWNoX3NldF9iaXQocGRwZSwgbmV3X3BkcywgcGRwZXMpCiAJCWZyZWVfcGQoZGV2LCBwZHAt PnBhZ2VfZGlyZWN0b3J5W3BkcGVdKTsKIAogCXJldHVybiAtRU5PTUVNOwogfQogCiBzdGF0aWMg dm9pZAotZnJlZV9nZW44X3RlbXBfYml0bWFwcyh1bnNpZ25lZCBsb25nICpuZXdfcGRzLCB1bnNp Z25lZCBsb25nICoqbmV3X3B0cykKK2ZyZWVfZ2VuOF90ZW1wX2JpdG1hcHModW5zaWduZWQgbG9u ZyAqbmV3X3BkcywgdW5zaWduZWQgbG9uZyAqKm5ld19wdHMsCisJCSAgICAgICB1aW50MzJfdCBw ZHBlcykKIHsKIAlpbnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBHRU44X0xFR0FDWV9QRFBFUzsg aSsrKQorCWZvciAoaSA9IDA7IGkgPCBwZHBlczsgaSsrKQogCQlrZnJlZShuZXdfcHRzW2ldKTsK IAlrZnJlZShuZXdfcHRzKTsKIAlrZnJlZShuZXdfcGRzKTsKQEAgLTkzMCwyMyArOTc3LDI0IEBA IGZyZWVfZ2VuOF90ZW1wX2JpdG1hcHModW5zaWduZWQgbG9uZyAqbmV3X3BkcywgdW5zaWduZWQg bG9uZyAqKm5ld19wdHMpCiAgKi8KIHN0YXRpYwogaW50IF9fbXVzdF9jaGVjayBhbGxvY19nZW44 X3RlbXBfYml0bWFwcyh1bnNpZ25lZCBsb25nICoqbmV3X3BkcywKLQkJCQkJIHVuc2lnbmVkIGxv bmcgKioqbmV3X3B0cykKKwkJCQkJIHVuc2lnbmVkIGxvbmcgKioqbmV3X3B0cywKKwkJCQkJIHVp bnQzMl90IHBkcGVzKQogewogCWludCBpOwogCXVuc2lnbmVkIGxvbmcgKnBkczsKIAl1bnNpZ25l ZCBsb25nICoqcHRzOwogCi0JcGRzID0ga2NhbGxvYyhCSVRTX1RPX0xPTkdTKEdFTjhfTEVHQUNZ X1BEUEVTKSwgc2l6ZW9mKHVuc2lnbmVkIGxvbmcpLCBHRlBfS0VSTkVMKTsKKwlwZHMgPSBrY2Fs bG9jKEJJVFNfVE9fTE9OR1MocGRwZXMpLCBzaXplb2YodW5zaWduZWQgbG9uZyksIEdGUF9LRVJO RUwpOwogCWlmICghcGRzKQogCQlyZXR1cm4gLUVOT01FTTsKIAotCXB0cyA9IGtjYWxsb2MoR0VO OF9MRUdBQ1lfUERQRVMsIHNpemVvZih1bnNpZ25lZCBsb25nICopLCBHRlBfS0VSTkVMKTsKKwlw dHMgPSBrY2FsbG9jKHBkcGVzLCBzaXplb2YodW5zaWduZWQgbG9uZyAqKSwgR0ZQX0tFUk5FTCk7 CiAJaWYgKCFwdHMpIHsKIAkJa2ZyZWUocGRzKTsKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0J Zm9yIChpID0gMDsgaSA8IEdFTjhfTEVHQUNZX1BEUEVTOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBp IDwgcGRwZXM7IGkrKykgewogCQlwdHNbaV0gPSBrY2FsbG9jKEJJVFNfVE9fTE9OR1MoSTkxNV9Q REVTKSwKIAkJCQkgc2l6ZW9mKHVuc2lnbmVkIGxvbmcpLCBHRlBfS0VSTkVMKTsKIAkJaWYgKCFw dHNbaV0pCkBAIC05NTksNyArMTAwNyw3IEBAIGludCBfX211c3RfY2hlY2sgYWxsb2NfZ2VuOF90 ZW1wX2JpdG1hcHModW5zaWduZWQgbG9uZyAqKm5ld19wZHMsCiAJcmV0dXJuIDA7CiAKIGVycl9v dXQ6Ci0JZnJlZV9nZW44X3RlbXBfYml0bWFwcyhwZHMsIHB0cyk7CisJZnJlZV9nZW44X3RlbXBf Yml0bWFwcyhwZHMsIHB0cywgcGRwZXMpOwogCXJldHVybiAtRU5PTUVNOwogfQogCkBAIC05ODQs NiArMTAzMiw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlICp2bSwKIAljb25zdCB1aW50NjRfdCBvcmlnX2xlbmd0aCA9IGxlbmd0aDsK IAl1aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkcGU7CisJdWludDMyX3QgcGRwZXMgPSBJOTE1 X1BEUEVTX1BFUl9QRFAoZGV2KTsKIAlpbnQgcmV0OwogCiAJLyogV3JhcCBpcyBuZXZlciBva2F5 IHNpbmNlIHdlIGNhbiBvbmx5IHJlcHJlc2VudCA0OGIsIGFuZCB3ZSBkb24ndApAQCAtOTk1LDcg KzEwNDQsNyBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCiAJaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGggPiBwcGd0dC0+YmFz ZS50b3RhbCkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JcmV0ID0gYWxsb2NfZ2VuOF90ZW1wX2Jp dG1hcHMoJm5ld19wYWdlX2RpcnMsICZuZXdfcGFnZV90YWJsZXMpOworCXJldCA9IGFsbG9jX2dl bjhfdGVtcF9iaXRtYXBzKCZuZXdfcGFnZV9kaXJzLCAmbmV3X3BhZ2VfdGFibGVzLCBwZHBlcyk7 CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTAwMyw3ICsxMDUyLDcgQEAgc3RhdGlj IGludCBnZW44X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcyhwcGd0dCwgJnBwZ3R0LT5w ZHAsIHN0YXJ0LCBsZW5ndGgsCiAJCQkJCW5ld19wYWdlX2RpcnMpOwogCWlmIChyZXQpIHsKLQkJ ZnJlZV9nZW44X3RlbXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMpOwor CQlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcywg cGRwZXMpOwogCQlyZXR1cm4gcmV0OwogCX0KIApAQCAtMTA1Nyw3ICsxMTA2LDcgQEAgc3RhdGlj IGludCBnZW44X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CQlfX3NldF9iaXQocGRwZSwgcHBndHQtPnBkcC51c2VkX3BkcGVzKTsKIAl9CiAKLQlmcmVlX2dl bjhfdGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcyk7CisJZnJlZV9n ZW44X3RlbXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMsIHBkcGVzKTsK IAltYXJrX3RsYnNfZGlydHkocHBndHQpOwogCXJldHVybiAwOwogCkBAIC0xMDY3LDEwICsxMTE2 LDEwIEBAIGVycl9vdXQ6CiAJCQlmcmVlX3B0KHZtLT5kZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJl Y3RvcnlbcGRwZV0tPnBhZ2VfdGFibGVbdGVtcF0pOwogCX0KIAotCWZvcl9lYWNoX3NldF9iaXQo cGRwZSwgbmV3X3BhZ2VfZGlycywgR0VOOF9MRUdBQ1lfUERQRVMpCisJZm9yX2VhY2hfc2V0X2Jp dChwZHBlLCBuZXdfcGFnZV9kaXJzLCBwZHBlcykKIAkJZnJlZV9wZCh2bS0+ZGV2LCBwcGd0dC0+ cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdKTsKIAotCWZyZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3 X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzKTsKKwlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5l d19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcywgcGRwZXMpOwogCW1hcmtfdGxic19kaXJ0eShw cGd0dCk7CiAJcmV0dXJuIHJldDsKIH0KQEAgLTExMDEsNyArMTE1MCw4IEBAIHN0YXRpYyBpbnQg Z2VuOF9wcmVhbGxvY2F0ZV90b3BfbGV2ZWxfcGRwcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCiAJLyogV2UgYWxsb2NhdGUgdGVtcCBiaXRtYXAgZm9yIHBhZ2UgdGFibGVzIGZvciBubyBn YWluCiAJICogYnV0IGFzIHRoaXMgaXMgZm9yIGluaXQgb25seSwgbGV0cyBrZWVwIHRoZSB0aGlu Z3Mgc2ltcGxlCiAJICovCi0JcmV0ID0gYWxsb2NfZ2VuOF90ZW1wX2JpdG1hcHMoJm5ld19wYWdl X2RpcnMsICZuZXdfcGFnZV90YWJsZXMpOworCXJldCA9IGFsbG9jX2dlbjhfdGVtcF9iaXRtYXBz KCZuZXdfcGFnZV9kaXJzLCAmbmV3X3BhZ2VfdGFibGVzLAorCQkJCSAgICAgIEdFTjhfTEVHQUNZ X1BEUEVTKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTEyLDcgKzExNjIsOCBA QCBzdGF0aWMgaW50IGdlbjhfcHJlYWxsb2NhdGVfdG9wX2xldmVsX3BkcHMoc3RydWN0IGk5MTVf aHdfcHBndHQgKnBwZ3R0KQogCQkJCQkJMCwgMVVMTCA8PCAzMiwKIAkJCQkJCW5ld19wYWdlX2Rp cnMpOwogCi0JZnJlZV9nZW44X3RlbXBfYml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90 YWJsZXMpOworCWZyZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2Vf dGFibGVzLAorCQkJICAgICAgIEdFTjhfTEVHQUNZX1BEUEVTKTsKIAogCS8qIG1hcmsgYWxsIHBk cHMgYXMgdXNlZCwgb3RoZXJ3aXNlIHdlIHdvbid0IGNsZWFuIHRoZW0gY29ycmVjdGx5ICovCiAJ Yml0bWFwX2ZpbGwocHBndHQtPnBkcC51c2VkX3BkcGVzLCBHRU44X0xFR0FDWV9QRFBFUyk7CkBA IC0xMTMyLDcgKzExODMsNiBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQpCiAJaW50IHJldDsKIAogCXBwZ3R0LT5iYXNlLnN0YXJ0ID0gMDsK LQlwcGd0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgMzI7CiAJcHBndHQtPmJhc2UuY2xlYW51cCA9 IGdlbjhfcHBndHRfY2xlYW51cDsKIAlwcGd0dC0+YmFzZS5hbGxvY2F0ZV92YV9yYW5nZSA9IGdl bjhfYWxsb2NfdmFfcmFuZ2U7CiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3Bw Z3R0X2luc2VydF9lbnRyaWVzOwpAQCAtMTE0NiwxNyArMTE5NiwzNiBAQCBzdGF0aWMgaW50IGdl bjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotCWlmIChod193b250X2ZsdXNoX3BkcF90bGJzKHBwZ3R0KSkgewotCQkv KiBBdm9pZCB0aGUgdGxiIGZsdXNoIGJ1ZyBieSBwcmVhbGxvY2F0aW5nCi0JCSAqIHdob2xlIHRv cCBsZXZlbCBwZHAgc3RydWN0dXJlIHNvIGl0IHN0YXlzCi0JCSAqIHN0YXRpYyBldmVuIGlmIG91 ciB2YSBzcGFjZSBncm93cy4KLQkJICovCi0JCXJldCA9IGdlbjhfcHJlYWxsb2NhdGVfdG9wX2xl dmVsX3BkcHMocHBndHQpOworCWlmICghVVNFU19GVUxMXzQ4QklUX1BQR1RUKHBwZ3R0LT5iYXNl LmRldikpIHsKKwkJcmV0ID0gX19wZHBfaW5pdChmYWxzZSwgJnBwZ3R0LT5wZHApOworCiAJCWlm IChyZXQpCi0JCQlyZXR1cm4gcmV0OworCQkJZ290byBjbGVhcl9zY3JhdGNoOworCisJCXBwZ3R0 LT5iYXNlLnRvdGFsID0gMVVMTCA8PCAzMjsKKwkJaWYgKGh3X3dvbnRfZmx1c2hfcGRwX3RsYnMo cHBndHQpKSB7CisJCQkvKiBBdm9pZCB0aGUgdGxiIGZsdXNoIGJ1ZyBieSBwcmVhbGxvY2F0aW5n CisJCQkgKiB3aG9sZSB0b3AgbGV2ZWwgcGRwIHN0cnVjdHVyZSBzbyBpdCBzdGF5cworCQkJICog c3RhdGljIGV2ZW4gaWYgb3VyIHZhIHNwYWNlIGdyb3dzLgorCQkJICogUERQIHByZWFsbG9jYXRp b24gaXMgb25seSBuZWVkZWQgaW4gMzItYml0IG1vZGUsCisJCQkgKiBpbiA0OC1iaXQsIHRoZXJl J3MgdGhlIG9uZSBhbmQgb25seSBQTUw0LgorCQkJICovCisJCQlyZXQgPSBnZW44X3ByZWFsbG9j YXRlX3RvcF9sZXZlbF9wZHBzKHBwZ3R0KTsKKwkJCWlmIChyZXQpCisJCQkJZ290byBjbGVhcl9w ZHA7CisJCX0KKwl9IGVsc2UgeworCQlwcGd0dC0+YmFzZS50b3RhbCA9IDFVTEwgPDwgNDg7CisJ CXJldHVybiAtRVBFUk07IC8qIE5vdCB5ZXQgaW1wbGVtZW50ZWQgKi8KIAl9CiAKIAlyZXR1cm4g MDsKKworY2xlYXJfcGRwOgorCWZyZWVfcGRwKHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wZHAp OworY2xlYXJfc2NyYXRjaDoKKwljbGVhbnVwX3NjcmF0Y2goJnBwZ3R0LT5iYXNlKTsKKwlyZXR1 cm4gcmV0OwogfQogCiBzdGF0aWMgdm9pZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCmluZGV4IDhjZTg4OTQuLmYzMTM1YTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCkBAIC04OCw5ICs4OCwxNyBAQCB0eXBlZGVmIHVpbnQ2NF90IGdlbjhfcGRlX3Q7CiAg KiBQRFBFICB8ICBQREUgIHwgIFBURSAgfCBvZmZzZXQKICAqIFRoZSBkaWZmZXJlbmNlIGFzIGNv bXBhcmVkIHRvIG5vcm1hbCB4ODYgMyBsZXZlbCBwYWdlIHRhYmxlIGlzIHRoZSBQRFBFcyBhcmUK ICAqIHByb2dyYW1tZWQgdmlhIHJlZ2lzdGVyLgorICoKKyAqIEdFTjggNDhiIGxlZ2FjeSBzdHls ZSBhZGRyZXNzIGlzIGRlZmluZWQgYXMgYSA0IGxldmVsIHBhZ2UgdGFibGU6CisgKiA0NzozOSB8 IDM4OjMwIHwgMjk6MjEgfCAyMDoxMiB8ICAxMTowCisgKiBQTUw0RSB8IFBEUEUgIHwgIFBERSAg fCAgUFRFICB8IG9mZnNldAogICovCisjZGVmaW5lIEdFTjhfUE1MNEVTX1BFUl9QTUw0CQk1MTIK KyNkZWZpbmUgR0VOOF9QTUw0RV9TSElGVAkJMzkKICNkZWZpbmUgR0VOOF9QRFBFX1NISUZUCQkJ MzAKLSNkZWZpbmUgR0VOOF9QRFBFX01BU0sJCQkweDMKKy8qIE5COiBHRU44X1BEUEVfTUFTSyBp cyB1bnRydWUgZm9yIDMyYiBwbGF0Zm9ybXMsIGJ1dCBpdCBoYXMgbm8gaW1wYWN0IG9uIDMyYiBw YWdlCisgKiB0YWJsZXMgKi8KKyNkZWZpbmUgR0VOOF9QRFBFX01BU0sJCQkweDFmZgogI2RlZmlu ZSBHRU44X1BERV9TSElGVAkJCTIxCiAjZGVmaW5lIEdFTjhfUERFX01BU0sJCQkweDFmZgogI2Rl ZmluZSBHRU44X1BURV9TSElGVAkJCTEyCkBAIC05OCw2ICsxMDYsOSBAQCB0eXBlZGVmIHVpbnQ2 NF90IGdlbjhfcGRlX3Q7CiAjZGVmaW5lIEdFTjhfTEVHQUNZX1BEUEVTCQk0CiAjZGVmaW5lIEdF TjhfUFRFUwkJCUk5MTVfUFRFUyhzaXplb2YoZ2VuOF9wdGVfdCkpCiAKKyNkZWZpbmUgSTkxNV9Q RFBFU19QRVJfUERQKGRldikgKFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXYpID9cCisJCQkJR0VO OF9QTUw0RVNfUEVSX1BNTDQgOiBHRU44X0xFR0FDWV9QRFBFUykKKwogI2RlZmluZSBQUEFUX1VO Q0FDSEVEX0lOREVYCQkoX1BBR0VfUFdUIHwgX1BBR0VfUENEKQogI2RlZmluZSBQUEFUX0NBQ0hF RF9QREVfSU5ERVgJCTAgLyogV0IgTExDICovCiAjZGVmaW5lIFBQQVRfQ0FDSEVEX0lOREVYCQlf UEFHRV9QQVQgLyogV0IgTExDZUxMQyAqLwpAQCAtMjM1LDkgKzI0NiwxNyBAQCBzdHJ1Y3QgaTkx NV9wYWdlX2RpcmVjdG9yeSB7CiB9OwogCiBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2lu dGVyIHsKLQkvKiBzdHJ1Y3QgcGFnZSAqcGFnZTsgKi8KLQlERUNMQVJFX0JJVE1BUCh1c2VkX3Bk cGVzLCBHRU44X0xFR0FDWV9QRFBFUyk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBh Z2VfZGlyZWN0b3J5W0dFTjhfTEVHQUNZX1BEUEVTXTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RtYSBi YXNlOworCisJdW5zaWduZWQgbG9uZyAqdXNlZF9wZHBlczsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeSAqKnBhZ2VfZGlyZWN0b3J5OworfTsKKworc3RydWN0IGk5MTVfcG1sNCB7CisJc3Ry dWN0IGk5MTVfcGFnZV9kbWEgYmFzZTsKKworCURFQ0xBUkVfQklUTUFQKHVzZWRfcG1sNGVzLCBH RU44X1BNTDRFU19QRVJfUE1MNCk7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl ciAqcGRwc1tHRU44X1BNTDRFU19QRVJfUE1MNF07CiB9OwogCiBzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlIHsKQEAgLTMzNSw4ICszNTQsOSBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJc3Ry dWN0IGRybV9tbV9ub2RlIG5vZGU7CiAJdW5zaWduZWQgbG9uZyBwZF9kaXJ0eV9yaW5nczsKIAl1 bmlvbiB7Ci0JCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgcGRwOwotCQlzdHJ1 Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSBwZDsKKwkJc3RydWN0IGk5MTVfcG1sNCBwbWw0OwkJLyog R0VOOCsgJiA0OGIgUFBHVFQgKi8KKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl ciBwZHA7CS8qIEdFTjgrICovCisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5IHBkOwkJLyog R0VONi03ICovCiAJfTsKIAogCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJp djsKQEAgLTQzMCwxNCArNDUwLDE3IEBAIHN0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuNl9wZGVf aW5kZXgodWludDMyX3QgYWRkcikKIAkgICAgIHRlbXAgPSBtaW4odGVtcCwgbGVuZ3RoKSwJCQkJ CVwKIAkgICAgIHN0YXJ0ICs9IHRlbXAsIGxlbmd0aCAtPSB0ZW1wKQogCi0jZGVmaW5lIGdlbjhf Zm9yX2VhY2hfcGRwZShwZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBpdGVyKQkJXAotCWZv ciAoaXRlciA9IGdlbjhfcGRwZV9pbmRleChzdGFydCk7CVwKLQkgICAgIHBkID0gKHBkcCktPnBh Z2VfZGlyZWN0b3J5W2l0ZXJdLCBsZW5ndGggPiAwICYmIGl0ZXIgPCBHRU44X0xFR0FDWV9QRFBF UzsJXAorI2RlZmluZSBnZW44X2Zvcl9lYWNoX3BkcGVfZShwZCwgcGRwLCBzdGFydCwgbGVuZ3Ro LCB0ZW1wLCBpdGVyLCBiKQlcCisJZm9yIChpdGVyID0gZ2VuOF9wZHBlX2luZGV4KHN0YXJ0KTsg XAorCSAgICAgcGQgPSAocGRwKS0+cGFnZV9kaXJlY3RvcnlbaXRlcl0sIGxlbmd0aCA+IDAgJiYg KGl0ZXIgPCBiKTsJXAogCSAgICAgaXRlcisrLAkJCQlcCiAJICAgICB0ZW1wID0gQUxJR04oc3Rh cnQrMSwgMSA8PCBHRU44X1BEUEVfU0hJRlQpIC0gc3RhcnQsCVwKIAkgICAgIHRlbXAgPSBtaW4o dGVtcCwgbGVuZ3RoKSwJCQkJCVwKIAkgICAgIHN0YXJ0ICs9IHRlbXAsIGxlbmd0aCAtPSB0ZW1w KQogCisjZGVmaW5lIGdlbjhfZm9yX2VhY2hfcGRwZShwZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0 ZW1wLCBpdGVyKQkJXAorCWdlbjhfZm9yX2VhY2hfcGRwZV9lKHBkLCBwZHAsIHN0YXJ0LCBsZW5n dGgsIHRlbXAsIGl0ZXIsIEk5MTVfUERQRVNfUEVSX1BEUChkZXYpKQorCiBzdGF0aWMgaW5saW5l IHVpbnQzMl90IGdlbjhfcHRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCiB7CiAJcmV0dXJuIGk5 MTVfcHRlX2luZGV4KGFkZHJlc3MsIEdFTjhfUERFX1NISUZUKTsKLS0gCjIuNC4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=