From: Michel Thierry Subject: [PATCH v3 03/17] drm/i915/gen8: Abstract PDP usage Date: Wed, 1 Jul 2015 16:27:19 +0100 Message-ID: <1435764453-11954-4-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 6A2AF72135 for ; Wed, 1 Jul 2015 08:27:38 -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 VXAgdW50aWwgbm93LCBwcGd0dC0+cGRwIGhhcyBhbHdheXMgYmVlbiB0aGUgcm9vdCBvZiBvdXIg cGFnZSB0YWJsZXMuCkxlZ2FjeSAzMmIgYWRkcmVzc2VzIGFjdGVkIGxpa2UgaXQgaGFkIDEgUERQ IHdpdGggNCBQRFBFcy4KCkluIHByZXBhcmF0aW9uIGZvciA0IGxldmVsIHBhZ2UgdGFibGVzLCB3 ZSBuZWVkIHRvIHN0b3AgdXNlIHBwZ3R0LT5wZHAKZGlyZWN0bHkgdW5sZXNzIHdlIGtub3cgaXQn cyB3aGF0IHdlIHdhbnQuIFRoZSBmdXR1cmUgc3RydWN0dXJlIHdpbGwgdXNlCnBwZ3R0LT5wbWw0 IGZvciB0aGUgdG9wIGxldmVsLCBhbmQgdGhlIHBkcCBpcyBqdXN0IG9uZSBvZiB0aGUgZW50cmll cwpiZWluZyBwb2ludGVkIHRvIGJ5IGEgcG1sNGUuCgp2MjogVXBkYXRlZCBhZnRlciBkeW5hbWlj IHBhZ2UgYWxsb2NhdGlvbiBjaGFuZ2VzLgp2MzogUmViYXNlIGFmdGVyIHMvcGFnZV90YWJsZXMv cGFnZV90YWJsZS8uCnY0OiBSZWJhc2UgYWZ0ZXIgY2hhbmdlcyBpbiAiRHluYW1pYyBwYWdlIHRh YmxlIGFsbG9jYXRpb25zIiBwYXRjaC4KdjU6IFJlYmFzZSBhZnRlciBNaWthJ3MgcHBndHQgY2xl YW51cCAvIHNjcmF0Y2ggbWVyZ2UgcGF0Y2ggc2VyaWVzLgp2NjogUmViYXNlIGFmdGVyIGZpbmFs IG1lcmdlZCB2ZXJzaW9uIG9mIE1pa2EncyBwcGd0dC9zY3JhdGNoIHBhdGNoZXMuCgpTaWduZWQt b2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1p Y2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAxMzYgKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgODggaW5zZXJ0aW9ucygrKSwgNDggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBjZGNjNzc4Li40 MWExOGZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNTI5LDYgKzUyOSwy NSBAQCBzdGF0aWMgdm9pZCBnZW44X2luaXRpYWxpemVfcGQoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJZmlsbF9weCh2bS0+ZGV2LCBwZCwgc2NyYXRjaF9wZGUpOwogfQogCisvKiBJ dCdzIGxpa2VseSB3ZSdsbCBtYXAgbW9yZSB0aGFuIG9uZSBwYWdlIHRhYmxlIGF0IGEgdGltZS4g VGhpcyBmdW5jdGlvbiB3aWxsCisgKiBzYXZlIHVzIHVubmVjZXNzYXJ5IGttYXAgY2FsbHMsIGJ1 dCBkbyBubyBtb3JlIGZ1bmN0aW9uYWxseSB0aGFuIG11bHRpcGxlCisgKiBjYWxscyB0byBwZGVf ZW5jb2RlLiBUaGUgcHBndHQgaXMgb25seSBuZWVkZWQgdG8gcmV1c2UgdGhlIGt1bm1hcCBtYWNy by4gKi8KK3N0YXRpYyB2b2lkIGdlbjhfbWFwX3BhZ2V0YWJsZV9yYW5nZShzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCisJCQkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQs CisJCQkJICAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkgICAgIHVpbnQ2NF90IGxlbmd0aCkKK3sK KwlnZW44X3BkZV90ICogY29uc3QgcGFnZV9kaXJlY3RvcnkgPSBrbWFwX3B4KHBkKTsKKwlzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKKwl1aW50NjRfdCB0ZW1wLCBwZGU7CisKKwlnZW44X2Zv cl9lYWNoX3BkZShwdCwgcGQsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkZSkKKwkJcGFnZV9kaXJl Y3RvcnlbcGRlXSA9IGdlbjhfcGRlX2VuY29kZShweF9kbWEocHQpLAorCQkJCQkJICAgICAgSTkx NV9DQUNIRV9MTEMpOworCisJa3VubWFwX3B4KHBwZ3R0LCBwYWdlX2RpcmVjdG9yeSk7Cit9CisK IHN0YXRpYyBpbnQgX19wZHBfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkgICAgICBz dHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHApCiB7CkBAIC02MTYsNiArNjM1 LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKIHsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250 YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSAmcHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAq LwogCWdlbjhfcHRlX3QgKnB0X3ZhZGRyLCBzY3JhdGNoX3B0ZTsKIAl1bnNpZ25lZCBwZHBlID0g c3RhcnQgPj4gR0VOOF9QRFBFX1NISUZUICYgR0VOOF9QRFBFX01BU0s7CiAJdW5zaWduZWQgcGRl ID0gc3RhcnQgPj4gR0VOOF9QREVfU0hJRlQgJiBHRU44X1BERV9NQVNLOwpAQCAtNjMwLDEwICs2 NTAsMTAgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlICp2bSwKIAkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkOwogCQlz dHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKIAotCQlpZiAoV0FSTl9PTighcHBndHQtPnBkcC5w YWdlX2RpcmVjdG9yeVtwZHBlXSkpCisJCWlmIChXQVJOX09OKCFwZHAtPnBhZ2VfZGlyZWN0b3J5 W3BkcGVdKSkKIAkJCWJyZWFrOwogCi0JCXBkID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtw ZHBlXTsKKwkJcGQgPSBwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdOwogCiAJCWlmIChXQVJOX09O KCFwZC0+cGFnZV90YWJsZVtwZGVdKSkKIAkJCWJyZWFrOwpAQCAtNjcxLDYgKzY5MSw3IEBAIHN0 YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVy X29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcGFnZV9k aXJlY3RvcnlfcG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KIAln ZW44X3B0ZV90ICpwdF92YWRkcjsKIAl1bnNpZ25lZCBwZHBlID0gc3RhcnQgPj4gR0VOOF9QRFBF X1NISUZUICYgR0VOOF9QRFBFX01BU0s7CiAJdW5zaWduZWQgcGRlID0gc3RhcnQgPj4gR0VOOF9Q REVfU0hJRlQgJiBHRU44X1BERV9NQVNLOwpAQCAtNjgxLDcgKzcwMiw3IEBAIHN0YXRpYyB2b2lk IGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiAKIAlmb3JfZWFjaF9zZ19wYWdlKHBhZ2VzLT5zZ2wsICZzZ19pdGVyLCBwYWdlcy0+bmVudHMs IDApIHsKIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpIHsKLQkJCXN0cnVjdCBpOTE1X3BhZ2VfZGly ZWN0b3J5ICpwZCA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV07CisJCQlzdHJ1Y3Qg aTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQgPSBwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdOwogCQkJ c3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQgPSBwZC0+cGFnZV90YWJsZVtwZGVdOwogCQkJcHRf dmFkZHIgPSBrbWFwX3B4KHB0KTsKIAkJfQpAQCAtNzYzLDIzICs3ODQsMjggQEAgc3RhdGljIHZv aWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCQlj b250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAlpbnQgaTsKIAot CWZvcl9lYWNoX3NldF9iaXQoaSwgcHBndHQtPnBkcC51c2VkX3BkcGVzLAotCQkJCUk5MTVfUERQ RVNfUEVSX1BEUChwcGd0dC0+YmFzZS5kZXYpKSB7Ci0JCWlmIChXQVJOX09OKCFwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5W2ldKSkKLQkJCWNvbnRpbnVlOworCWlmICghVVNFU19GVUxMXzQ4QklU X1BQR1RUKHBwZ3R0LT5iYXNlLmRldikpIHsKKwkJZm9yX2VhY2hfc2V0X2JpdChpLCBwcGd0dC0+ cGRwLnVzZWRfcGRwZXMsCisJCQkJIEk5MTVfUERQRVNfUEVSX1BEUChwcGd0dC0+YmFzZS5kZXYp KSB7CisJCQlpZiAoV0FSTl9PTighcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSkpCisJCQkJ Y29udGludWU7CiAKLQkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHBwZ3R0LT5iYXNlLmRldiwKLQkJ CQkgICAgICBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKLQkJZnJlZV9wZChwcGd0dC0+ YmFzZS5kZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOworCQkJZ2VuOF9mcmVlX3Bh Z2VfdGFibGVzKHBwZ3R0LT5iYXNlLmRldiwKKwkJCQkJICAgICAgcHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSk7CisJCQlmcmVlX3BkKHBwZ3R0LT5iYXNlLmRldiwKKwkJCQlwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5W2ldKTsKKwkJfQorCQlmcmVlX3BkcChwcGd0dC0+YmFzZS5kZXYsICZw cGd0dC0+cGRwKTsKKwl9IGVsc2UgeworCQlXQVJOX09OKDEpOyAvKiB0byBiZSBpbXBsZW1lbnRl ZCBsYXRlciAqLwogCX0KIAotCWZyZWVfcGRwKHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wZHAp OwogCWdlbjhfZnJlZV9zY3JhdGNoKHZtKTsKIH0KIAogLyoqCiAgKiBnZW44X3BwZ3R0X2FsbG9j X3BhZ2V0YWJzKCkgLSBBbGxvY2F0ZSBwYWdlIHRhYmxlcyBmb3IgVkEgcmFuZ2UuCi0gKiBAcHBn dHQ6CU1hc3RlciBwcGd0dCBzdHJ1Y3R1cmUuCisgKiBAdm06CQlNYXN0ZXIgdm0gc3RydWN0dXJl LgogICogQHBkOgkJUGFnZSBkaXJlY3RvcnkgZm9yIHRoaXMgYWRkcmVzcyByYW5nZS4KICAqIEBz dGFydDoJU3RhcnRpbmcgdmlydHVhbCBhZGRyZXNzIHRvIGJlZ2luIGFsbG9jYXRpb25zLgogICog QGxlbmd0aAlTaXplIG9mIHRoZSBhbGxvY2F0aW9ucy4KQEAgLTc5NSwxMyArODIxLDE1IEBAIHN0 YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSkKICAqCiAgKiBSZXR1cm46IDAgaWYgc3VjY2VzczsgbmVnYXRpdmUgZXJyb3IgY29kZSBvdGhl cndpc2UuCiAgKi8KLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZXRh YnMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICBzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeSAqcGQsCiAJCQkJICAgICB1aW50NjRfdCBzdGFydCwKIAkJCQkgICAgIHVp bnQ2NF90IGxlbmd0aCwKIAkJCQkgICAgIHVuc2lnbmVkIGxvbmcgKm5ld19wdHMpCiB7Ci0Jc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IHBwZ3R0LT5iYXNlLmRldjsKKwlzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQgPQorCSAgICBjb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0 LCBiYXNlKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdm0tPmRldjsKIAlzdHJ1Y3QgaTkx NV9wYWdlX3RhYmxlICpwdDsKIAl1aW50NjRfdCB0ZW1wOwogCXVpbnQzMl90IHBkZTsKQEAgLTgx OCw3ICs4NDYsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZXRhYnMoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCQlpZiAoSVNfRVJSKHB0KSkKIAkJCWdvdG8gdW53aW5k X291dDsKIAotCQlnZW44X2luaXRpYWxpemVfcHQoJnBwZ3R0LT5iYXNlLCBwdCk7CisJCWdlbjhf aW5pdGlhbGl6ZV9wdCh2bSwgcHQpOwogCQlwZC0+cGFnZV90YWJsZVtwZGVdID0gcHQ7CiAJCV9f c2V0X2JpdChwZGUsIG5ld19wdHMpOwogCX0KQEAgLTgzNCw3ICs4NjIsNyBAQCB1bndpbmRfb3V0 OgogCiAvKioKICAqIGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcygpIC0gQWxsb2Nh dGUgcGFnZSBkaXJlY3RvcmllcyBmb3IgVkEgcmFuZ2UuCi0gKiBAcHBndHQ6CU1hc3RlciBwcGd0 dCBzdHJ1Y3R1cmUuCisgKiBAdm06CQlNYXN0ZXIgdm0gc3RydWN0dXJlLgogICogQHBkcDoJUGFn ZSBkaXJlY3RvcnkgcG9pbnRlciBmb3IgdGhpcyBhZGRyZXNzIHJhbmdlLgogICogQHN0YXJ0OglT dGFydGluZyB2aXJ0dWFsIGFkZHJlc3MgdG8gYmVnaW4gYWxsb2NhdGlvbnMuCiAgKiBAbGVuZ3Ro CVNpemUgb2YgdGhlIGFsbG9jYXRpb25zLgpAQCAtODU1LDE3ICs4ODMsMTggQEAgdW53aW5kX291 dDoKICAqCiAgKiBSZXR1cm46IDAgaWYgc3VjY2VzczsgbmVnYXRpdmUgZXJyb3IgY29kZSBvdGhl cndpc2UuCiAgKi8KLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKLQkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAotCQkJCSAg ICAgdWludDY0X3QgbGVuZ3RoLAotCQkJCSAgICAgdW5zaWduZWQgbG9uZyAqbmV3X3BkcykKK3N0 YXRpYyBpbnQKK2dlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50 ZXIgKnBkcCwKKwkJCQkgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgdWludDY0X3QgbGVuZ3RoLAor CQkJCSAgdW5zaWduZWQgbG9uZyAqbmV3X3BkcykKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gcHBndHQtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2Owog CXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKIAl1aW50NjRfdCB0ZW1wOwogCXVpbnQz Ml90IHBkcGU7Ci0JdWludDMyX3QgcGRwZXMgPSAgSTkxNV9QRFBFU19QRVJfUERQKHBwZ3R0LT5i YXNlLmRldik7CisJdWludDMyX3QgcGRwZXMgPSAgSTkxNV9QRFBFU19QRVJfUERQKHZtLT5kZXYp OwogCiAJV0FSTl9PTighYml0bWFwX2VtcHR5KG5ld19wZHMsIHBkcGVzKSk7CiAKQEAgLTg3Nyw3 ICs5MDYsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmllcyhz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJCWlmIChJU19FUlIocGQpKQogCQkJZ290byB1 bndpbmRfb3V0OwogCi0JCWdlbjhfaW5pdGlhbGl6ZV9wZCgmcHBndHQtPmJhc2UsIHBkKTsKKwkJ Z2VuOF9pbml0aWFsaXplX3BkKHZtLCBwZCk7CiAJCXBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV0g PSBwZDsKIAkJX19zZXRfYml0KHBkcGUsIG5ld19wZHMpOwogCX0KQEAgLTk1MiwxMyArOTgxLDE1 IEBAIHN0YXRpYyB2b2lkIG1hcmtfdGxic19kaXJ0eShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCiAJcHBndHQtPnBkX2RpcnR5X3JpbmdzID0gSU5URUxfSU5GTyhwcGd0dC0+YmFzZS5kZXYp LT5yaW5nX21hc2s7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCSAgICAgICB1aW50NjRfdCBzdGFydCwKLQkJCSAg ICAgICB1aW50NjRfdCBsZW5ndGgpCitzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2 bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgICAgc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAorCQkJCSAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkg ICAgdWludDY0X3QgbGVuZ3RoKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJ CWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogCXVuc2lnbmVk IGxvbmcgKm5ld19wYWdlX2RpcnMsICoqbmV3X3BhZ2VfdGFibGVzOworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSB2bS0+ZGV2OwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKIAlj b25zdCB1aW50NjRfdCBvcmlnX3N0YXJ0ID0gc3RhcnQ7CiAJY29uc3QgdWludDY0X3Qgb3JpZ19s ZW5ndGggPSBsZW5ndGg7CkBAIC05ODEsMTYgKzEwMTIsMTUgQEAgc3RhdGljIGludCBnZW44X2Fs bG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQlyZXR1cm4gcmV0 OwogCiAJLyogRG8gdGhlIGFsbG9jYXRpb25zIGZpcnN0IHNvIHdlIGNhbiBlYXNpbHkgYmFpbCBv dXQgKi8KLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMocHBndHQsICZw cGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoLAotCQkJCQluZXdfcGFnZV9kaXJzKTsKKwlyZXQgPSBn ZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXModm0sIHBkcCwgc3RhcnQsIGxlbmd0aCwK KwkJCQkJCW5ld19wYWdlX2RpcnMpOwogCWlmIChyZXQpIHsKIAkJZnJlZV9nZW44X3RlbXBfYml0 bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMsIHBkcGVzKTsKIAkJcmV0dXJuIHJl dDsKIAl9CiAKLQkvKiBGb3IgZXZlcnkgcGFnZSBkaXJlY3RvcnkgcmVmZXJlbmNlZCwgYWxsb2Nh dGUgcGFnZSB0YWJsZXMgKi8KLQlnZW44X2Zvcl9lYWNoX3BkcGUocGQsICZwcGd0dC0+cGRwLCBz dGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7Ci0JCXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFn ZXRhYnMocHBndHQsIHBkLCBzdGFydCwgbGVuZ3RoLAorCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwg cGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CisJCXJldCA9IGdlbjhfcHBndHRfYWxs b2NfcGFnZXRhYnModm0sIHBkLCBzdGFydCwgbGVuZ3RoLAogCQkJCQkJbmV3X3BhZ2VfdGFibGVz W3BkcGVdKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZXJyX291dDsKQEAgLTk5OSwxMCArMTAyOSw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAlzdGFydCA9IG9yaWdfc3RhcnQ7CiAJbGVuZ3RoID0gb3JpZ19sZW5ndGg7CiAK LQkvKiBBbGxvY2F0aW9ucyBoYXZlIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHksIHNvIHNldCB0aGUg Yml0bWFwcywgYW5kIGRvCi0JICogdGhlIG1hcHBpbmdzLiAqLwotCWdlbjhfZm9yX2VhY2hfcGRw ZShwZCwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKLQkJZ2VuOF9w ZGVfdCAqY29uc3QgcGFnZV9kaXJlY3RvcnkgPSBrbWFwX3B4KHBkKTsKKwlnZW44X2Zvcl9lYWNo X3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRwZSkgewogCQlzdHJ1Y3QgaTkx NV9wYWdlX3RhYmxlICpwdDsKIAkJdWludDY0X3QgcGRfbGVuID0gbGVuZ3RoOwogCQl1aW50NjRf dCBwZF9zdGFydCA9IHN0YXJ0OwpAQCAtMTAyNCwxOCArMTA1MSwxMCBAQCBzdGF0aWMgaW50IGdl bjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAkJCS8q IE91ciBwZGUgaXMgbm93IHBvaW50aW5nIHRvIHRoZSBwYWdldGFibGUsIHB0ICovCiAJCQlfX3Nl dF9iaXQocGRlLCBwZC0+dXNlZF9wZGVzKTsKLQotCQkJLyogTWFwIHRoZSBQREUgdG8gdGhlIHBh Z2UgdGFibGUgKi8KLQkJCXBhZ2VfZGlyZWN0b3J5W3BkZV0gPSBnZW44X3BkZV9lbmNvZGUocHhf ZG1hKHB0KSwKLQkJCQkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQyk7Ci0KLQkJCS8qIE5COiBXZSBo YXZlbid0IHlldCBtYXBwZWQgcHRlcyB0byBwYWdlcy4gQXQgdGhpcwotCQkJICogcG9pbnQgd2Un cmUgc3RpbGwgcmVseWluZyBvbiBpbnNlcnRfZW50cmllcygpICovCiAJCX0KIAotCQlrdW5tYXBf cHgocHBndHQsIHBhZ2VfZGlyZWN0b3J5KTsKLQotCQlfX3NldF9iaXQocGRwZSwgcHBndHQtPnBk cC51c2VkX3BkcGVzKTsKKwkJX19zZXRfYml0KHBkcGUsIHBkcC0+dXNlZF9wZHBlcyk7CisJCWdl bjhfbWFwX3BhZ2V0YWJsZV9yYW5nZShwcGd0dCwgcGQsIHN0YXJ0LCBsZW5ndGgpOwogCX0KIAog CWZyZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzLCBw ZHBlcyk7CkBAIC0xMDQ1LDE3ICsxMDY0LDM4IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9y YW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIGVycl9vdXQ6CiAJd2hpbGUgKHBk cGUtLSkgewogCQlmb3JfZWFjaF9zZXRfYml0KHRlbXAsIG5ld19wYWdlX3RhYmxlc1twZHBlXSwg STkxNV9QREVTKQotCQkJZnJlZV9wdCh2bS0+ZGV2LCBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5 W3BkcGVdLT5wYWdlX3RhYmxlW3RlbXBdKTsKKwkJCWZyZWVfcHQoZGV2LCBwZHAtPnBhZ2VfZGly ZWN0b3J5W3BkcGVdLT5wYWdlX3RhYmxlW3RlbXBdKTsKIAl9CiAKIAlmb3JfZWFjaF9zZXRfYml0 KHBkcGUsIG5ld19wYWdlX2RpcnMsIHBkcGVzKQotCQlmcmVlX3BkKHZtLT5kZXYsIHBwZ3R0LT5w ZHAucGFnZV9kaXJlY3RvcnlbcGRwZV0pOworCQlmcmVlX3BkKGRldiwgcGRwLT5wYWdlX2RpcmVj dG9yeVtwZHBlXSk7CiAKIAlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5l d19wYWdlX3RhYmxlcywgcGRwZXMpOwogCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7CiAJcmV0dXJu IHJldDsKIH0KIAorc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlXzRsdmwoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgIHN0cnVjdCBpOTE1X3BtbDQgKnBtbDQsCisJ CQkJICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCit7CisJV0FS Tl9PTigxKTsgLyogdG8gYmUgaW1wbGVtZW50ZWQgbGF0ZXIgKi8KKwlyZXR1cm4gMDsKK30KKwor c3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAorCQkJICAgICAgIHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgpCit7CisJc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KKwkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkx NV9od19wcGd0dCwgYmFzZSk7CisKKwlpZiAoIVVTRVNfRlVMTF80OEJJVF9QUEdUVCh2bS0+ZGV2 KSkKKwkJcmV0dXJuIGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2bCh2bSwgJnBwZ3R0LT5wZHAsIHN0 YXJ0LCBsZW5ndGgpOworCWVsc2UKKwkJcmV0dXJuIGdlbjhfYWxsb2NfdmFfcmFuZ2VfNGx2bCh2 bSwgJnBwZ3R0LT5wbWw0LCBzdGFydCwgbGVuZ3RoKTsKK30KKwogLyoKICAqIEdFTjggbGVnYWN5 IHBwZ3R0IHByb2dyYW1taW5nIGlzIGFjY29tcGxpc2hlZCB0aHJvdWdoIGEgbWF4IDQgUERQIHJl Z2lzdGVycwogICogd2l0aCBhIG5ldCBlZmZlY3QgcmVzZW1ibGluZyBhIDItbGV2ZWwgcGFnZSB0 YWJsZSBpbiBub3JtYWwgeDg2IHRlcm1zLiBFYWNoCi0tIAoyLjQuNQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK