From: Michel Thierry Subject: [PATCH v5 03/19] drm/i915/gen8: Abstract PDP usage Date: Thu, 16 Jul 2015 10:33:15 +0100 Message-ID: <1437039211-2507-4-git-send-email-michel.thierry@intel.com> References: <1437039211-2507-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 973FA6E753 for ; Thu, 16 Jul 2015 02:33:53 -0700 (PDT) In-Reply-To: <1437039211-2507-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 cwpiZWluZyBwb2ludGVkIHRvIGJ5IGEgcG1sNGUuIFBsYWNlcyB3aGVyZSB0aGlzIGlzIG5vdCB5 ZXQgcG9zc2libGUgdXNlIGEKdGVtcG9yYWwgcGRwIGxvY2FsIHZhcmlhYmxlLgoKdjI6IFVwZGF0 ZWQgYWZ0ZXIgZHluYW1pYyBwYWdlIGFsbG9jYXRpb24gY2hhbmdlcy4KdjM6IFJlYmFzZSBhZnRl ciBzL3BhZ2VfdGFibGVzL3BhZ2VfdGFibGUvLgp2NDogUmViYXNlIGFmdGVyIGNoYW5nZXMgaW4g IkR5bmFtaWMgcGFnZSB0YWJsZSBhbGxvY2F0aW9ucyIgcGF0Y2guCnY1OiBSZWJhc2UgYWZ0ZXIg TWlrYSdzIHBwZ3R0IGNsZWFudXAgLyBzY3JhdGNoIG1lcmdlIHBhdGNoIHNlcmllcy4KdjY6IFJl YmFzZSBhZnRlciBmaW5hbCBtZXJnZWQgdmVyc2lvbiBvZiBNaWthJ3MgcHBndHQvc2NyYXRjaCBw YXRjaGVzLgp2NzogS2VlcCBwYWdldGFibGUgbWFwIGluLWxpbmUgKGFuZCBhdm9pZCB1bm5lY2Vz c2FyeSBmb3JfZWFjaF9wZGUKbG9vcHMpLCByZW1vdmUgcmVkdW5kYW50IHBwZ3R0IHBvaW50ZXIg aW4gX2FsbG9jX3BhZ2V0YWJzIChBa2FzaCkKdjg6IEZpeCB0ZXh0IGluZGVudGF0aW9uIGluIF9h bGxvY19wYWdldGFicy9wYWdlX2RpcmVjdG9yaWVzIChDaHJpcykKdjk6IERlZmVyIGdlbjhfYWxs b2NfdmFfcmFuZ2VfNGx2bCBkZWZpbml0aW9uIHVudGlsIDRsdmwgaXMgaW1wbGVtZW50ZWQsCmNs ZWFuLXVwIGdlbjhfcHBndHRfY2xlYW51cCBbcHVuIGludGVuZGVkXSAoQWthc2gpLgoKQ2M6IEFr YXNoIEdvZWwgPGFrYXNoLmdvZWxAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdz a3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNo ZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgfCA4NCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgNDAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA1OTEzNjUzLi5jYzU3NWMyMSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTYwNyw2ICs2MDcsNyBAQCBzdGF0aWMgdm9pZCBn ZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogewog CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0 IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50 ZXIgKnBkcCA9ICZwcGd0dC0+cGRwOyAvKiBGSVhNRTogNDhiICovCiAJZ2VuOF9wdGVfdCAqcHRf dmFkZHIsIHNjcmF0Y2hfcHRlOwogCXVuc2lnbmVkIHBkcGUgPSBzdGFydCA+PiBHRU44X1BEUEVf U0hJRlQgJiBHRU44X1BEUEVfTUFTSzsKIAl1bnNpZ25lZCBwZGUgPSBzdGFydCA+PiBHRU44X1BE RV9TSElGVCAmIEdFTjhfUERFX01BU0s7CkBAIC02MjEsMTAgKzYyMiwxMCBAQCBzdGF0aWMgdm9p ZCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CiAJCXN0cnVjdCBpOTE1X3BhZ2VfdGFi bGUgKnB0OwogCi0JCWlmIChXQVJOX09OKCFwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVd KSkKKwkJaWYgKFdBUk5fT04oIXBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV0pKQogCQkJYnJlYWs7 CiAKLQkJcGQgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdOworCQlwZCA9IHBkcC0+ cGFnZV9kaXJlY3RvcnlbcGRwZV07CiAKIAkJaWYgKFdBUk5fT04oIXBkLT5wYWdlX3RhYmxlW3Bk ZV0pKQogCQkJYnJlYWs7CkBAIC02NjIsNiArNjYzLDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0 dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHsKIAlzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1 X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpw ZHAgPSAmcHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAqLwogCWdlbjhfcHRlX3QgKnB0X3ZhZGRy OwogCXVuc2lnbmVkIHBkcGUgPSBzdGFydCA+PiBHRU44X1BEUEVfU0hJRlQgJiBHRU44X1BEUEVf TUFTSzsKIAl1bnNpZ25lZCBwZGUgPSBzdGFydCA+PiBHRU44X1BERV9TSElGVCAmIEdFTjhfUERF X01BU0s7CkBAIC02NzUsNyArNjc3LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCWJyZWFrOwogCiAJCWlm IChwdF92YWRkciA9PSBOVUxMKSB7Ci0JCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQg PSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdOworCQkJc3RydWN0IGk5MTVfcGFnZV9k aXJlY3RvcnkgKnBkID0gcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXTsKIAkJCXN0cnVjdCBpOTE1 X3BhZ2VfdGFibGUgKnB0ID0gcGQtPnBhZ2VfdGFibGVbcGRlXTsKIAkJCXB0X3ZhZGRyID0ga21h cF9weChwdCk7CiAJCX0KQEAgLTc1NSwyOCArNzU3LDI5IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBn dHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIHsKIAlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3Bw Z3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSAm cHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAqLworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBw cGd0dC0+YmFzZS5kZXY7CiAJaW50IGk7CiAKLQlmb3JfZWFjaF9zZXRfYml0KGksIHBwZ3R0LT5w ZHAudXNlZF9wZHBlcywKLQkJCSBJOTE1X1BEUEVTX1BFUl9QRFAocHBndHQtPmJhc2UuZGV2KSkg ewotCQlpZiAoV0FSTl9PTighcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSkpCisJZm9yX2Vh Y2hfc2V0X2JpdChpLCBwZHAtPnVzZWRfcGRwZXMsIEk5MTVfUERQRVNfUEVSX1BEUChkZXYpKSB7 CisJCWlmIChXQVJOX09OKCFwZHAtPnBhZ2VfZGlyZWN0b3J5W2ldKSkKIAkJCWNvbnRpbnVlOwog Ci0JCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+YmFzZS5kZXYsCi0JCQkJICAgICAgcHBn dHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7Ci0JCWZyZWVfcGQocHBndHQtPmJhc2UuZGV2LCBw cGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKKwkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKGRl diwgcGRwLT5wYWdlX2RpcmVjdG9yeVtpXSk7CisJCWZyZWVfcGQoZGV2LCBwZHAtPnBhZ2VfZGly ZWN0b3J5W2ldKTsKIAl9CiAKLQlmcmVlX3BkcChwcGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cGRw KTsKKwlmcmVlX3BkcChkZXYsIHBkcCk7CisKIAlnZW44X2ZyZWVfc2NyYXRjaCh2bSk7CiB9CiAK IC8qKgogICogZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicygpIC0gQWxsb2NhdGUgcGFnZSB0YWJs ZXMgZm9yIFZBIHJhbmdlLgotICogQHBwZ3R0OglNYXN0ZXIgcHBndHQgc3RydWN0dXJlLgotICog QHBkOgkJUGFnZSBkaXJlY3RvcnkgZm9yIHRoaXMgYWRkcmVzcyByYW5nZS4KKyAqIEB2bToJTWFz dGVyIHZtIHN0cnVjdHVyZS4KKyAqIEBwZDoJUGFnZSBkaXJlY3RvcnkgZm9yIHRoaXMgYWRkcmVz cyByYW5nZS4KICAqIEBzdGFydDoJU3RhcnRpbmcgdmlydHVhbCBhZGRyZXNzIHRvIGJlZ2luIGFs bG9jYXRpb25zLgotICogQGxlbmd0aAlTaXplIG9mIHRoZSBhbGxvY2F0aW9ucy4KKyAqIEBsZW5n dGg6CVNpemUgb2YgdGhlIGFsbG9jYXRpb25zLgogICogQG5ld19wdHM6CUJpdG1hcCBzZXQgYnkg ZnVuY3Rpb24gd2l0aCBuZXcgYWxsb2NhdGlvbnMuIExpa2VseSB1c2VkIGJ5IHRoZQogICoJCWNh bGxlciB0byBmcmVlIG9uIGVycm9yLgogICoKQEAgLTc4OSwxMyArNzkyLDEzIEBAIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKICAq CiAgKiBSZXR1cm46IDAgaWYgc3VjY2VzczsgbmVnYXRpdmUgZXJyb3IgY29kZSBvdGhlcndpc2Uu CiAgKi8KLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZXRhYnMoc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeSAqcGQsCiAJCQkJICAgICB1aW50NjRfdCBzdGFydCwKIAkJCQkgICAgIHVpbnQ2NF90 IGxlbmd0aCwKIAkJCQkgICAgIHVuc2lnbmVkIGxvbmcgKm5ld19wdHMpCiB7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHBwZ3R0LT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gdm0tPmRldjsKIAlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKIAl1aW50NjRfdCB0ZW1w OwogCXVpbnQzMl90IHBkZTsKQEAgLTgwNCw3ICs4MDcsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBn dHRfYWxsb2NfcGFnZXRhYnMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCQkvKiBEb24n dCByZWFsbG9jYXRlIHBhZ2UgdGFibGVzICovCiAJCWlmICh0ZXN0X2JpdChwZGUsIHBkLT51c2Vk X3BkZXMpKSB7CiAJCQkvKiBTY3JhdGNoIGlzIG5ldmVyIGFsbG9jYXRlZCB0aGlzIHdheSAqLwot CQkJV0FSTl9PTihwdCA9PSBwcGd0dC0+YmFzZS5zY3JhdGNoX3B0KTsKKwkJCVdBUk5fT04ocHQg PT0gdm0tPnNjcmF0Y2hfcHQpOwogCQkJY29udGludWU7CiAJCX0KIApAQCAtODEyLDcgKzgxNSw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsCiAJCWlmIChJU19FUlIocHQpKQogCQkJZ290byB1bndpbmRfb3V0OwogCi0J CWdlbjhfaW5pdGlhbGl6ZV9wdCgmcHBndHQtPmJhc2UsIHB0KTsKKwkJZ2VuOF9pbml0aWFsaXpl X3B0KHZtLCBwdCk7CiAJCXBkLT5wYWdlX3RhYmxlW3BkZV0gPSBwdDsKIAkJX19zZXRfYml0KHBk ZSwgbmV3X3B0cyk7CiAJfQpAQCAtODI4LDExICs4MzEsMTEgQEAgdW53aW5kX291dDoKIAogLyoq CiAgKiBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoKSAtIEFsbG9jYXRlIHBhZ2Ug ZGlyZWN0b3JpZXMgZm9yIFZBIHJhbmdlLgotICogQHBwZ3R0OglNYXN0ZXIgcHBndHQgc3RydWN0 dXJlLgorICogQHZtOglNYXN0ZXIgdm0gc3RydWN0dXJlLgogICogQHBkcDoJUGFnZSBkaXJlY3Rv cnkgcG9pbnRlciBmb3IgdGhpcyBhZGRyZXNzIHJhbmdlLgogICogQHN0YXJ0OglTdGFydGluZyB2 aXJ0dWFsIGFkZHJlc3MgdG8gYmVnaW4gYWxsb2NhdGlvbnMuCi0gKiBAbGVuZ3RoCVNpemUgb2Yg dGhlIGFsbG9jYXRpb25zLgotICogQG5ld19wZHMJQml0bWFwIHNldCBieSBmdW5jdGlvbiB3aXRo IG5ldyBhbGxvY2F0aW9ucy4gTGlrZWx5IHVzZWQgYnkgdGhlCisgKiBAbGVuZ3RoOglTaXplIG9m IHRoZSBhbGxvY2F0aW9ucy4KKyAqIEBuZXdfcGRzOglCaXRtYXAgc2V0IGJ5IGZ1bmN0aW9uIHdp dGggbmV3IGFsbG9jYXRpb25zLiBMaWtlbHkgdXNlZCBieSB0aGUKICAqCQljYWxsZXIgdG8gZnJl ZSBvbiBlcnJvci4KICAqCiAgKiBBbGxvY2F0ZSB0aGUgcmVxdWlyZWQgbnVtYmVyIG9mIHBhZ2Ug ZGlyZWN0b3JpZXMgc3RhcnRpbmcgYXQgdGhlIHBkZSBpbmRleCBvZgpAQCAtODQ5LDEzICs4NTIs MTQgQEAgdW53aW5kX291dDoKICAqCiAgKiBSZXR1cm46IDAgaWYgc3VjY2VzczsgbmVnYXRpdmUg ZXJyb3IgY29kZSBvdGhlcndpc2UuCiAgKi8KLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19w YWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkgICAgIHN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKLQkJCQkgICAgIHVpbnQ2NF90 IHN0YXJ0LAotCQkJCSAgICAgdWludDY0X3QgbGVuZ3RoLAotCQkJCSAgICAgdW5zaWduZWQgbG9u ZyAqbmV3X3BkcykKK3N0YXRpYyBpbnQKK2dlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmll cyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKKwkJCQkgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgdWlu dDY0X3QgbGVuZ3RoLAorCQkJCSAgdW5zaWduZWQgbG9uZyAqbmV3X3BkcykKIHsKLQlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSB2bS0+ZGV2OwogCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKIAl1aW50NjRf dCB0ZW1wOwogCXVpbnQzMl90IHBkcGU7CkBAIC04NzEsNyArODc1LDcgQEAgc3RhdGljIGludCBn ZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LAogCQlpZiAoSVNfRVJSKHBkKSkKIAkJCWdvdG8gdW53aW5kX291dDsKIAotCQlnZW44X2lu aXRpYWxpemVfcGQoJnBwZ3R0LT5iYXNlLCBwZCk7CisJCWdlbjhfaW5pdGlhbGl6ZV9wZCh2bSwg cGQpOwogCQlwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdID0gcGQ7CiAJCV9fc2V0X2JpdChwZHBl LCBuZXdfcGRzKTsKIAl9CkBAIC05NDcsMTggKzk1MSwxOSBAQCBzdGF0aWMgdm9pZCBtYXJrX3Rs YnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogfQogCiBzdGF0aWMgaW50IGdl bjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0JCQkgICAg ICAgdWludDY0X3Qgc3RhcnQsCi0JCQkgICAgICAgdWludDY0X3QgbGVuZ3RoKQorCQkJICAgICAg IHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgpCiB7CiAJc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFz ZSk7CiAJdW5zaWduZWQgbG9uZyAqbmV3X3BhZ2VfZGlycywgKipuZXdfcGFnZV90YWJsZXM7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZtLT5kZXY7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJl Y3RvcnlfcG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KIAlzdHJ1 Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CiAJY29uc3QgdWludDY0X3Qgb3JpZ19zdGFydCA9 IHN0YXJ0OwogCWNvbnN0IHVpbnQ2NF90IG9yaWdfbGVuZ3RoID0gbGVuZ3RoOwogCXVpbnQ2NF90 IHRlbXA7CiAJdWludDMyX3QgcGRwZTsKLQl1aW50MzJfdCBwZHBlcyA9IEk5MTVfUERQRVNfUEVS X1BEUChwcGd0dC0+YmFzZS5kZXYpOworCXVpbnQzMl90IHBkcGVzID0gSTkxNV9QRFBFU19QRVJf UERQKGRldik7CiAJaW50IHJldDsKIAogCS8qIFdyYXAgaXMgbmV2ZXIgb2theSBzaW5jZSB3ZSBj YW4gb25seSByZXByZXNlbnQgNDhiLCBhbmQgd2UgZG9uJ3QKQEAgLTk2Nyw3ICs5NzIsNyBAQCBz dGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGggPCBzdGFydCkpCiAJCXJldHVybiAtRU5P REVWOwogCi0JaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGggPiBwcGd0dC0+YmFzZS50b3RhbCkp CisJaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGggPiB2bS0+dG90YWwpKQogCQlyZXR1cm4gLUVO T0RFVjsKIAogCXJldCA9IGFsbG9jX2dlbjhfdGVtcF9iaXRtYXBzKCZuZXdfcGFnZV9kaXJzLCAm bmV3X3BhZ2VfdGFibGVzLCBwZHBlcyk7CkBAIC05NzUsMTYgKzk4MCwxNiBAQCBzdGF0aWMgaW50 IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCXJl dHVybiByZXQ7CiAKIAkvKiBEbyB0aGUgYWxsb2NhdGlvbnMgZmlyc3Qgc28gd2UgY2FuIGVhc2ls eSBiYWlsIG91dCAqLwotCXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmllcyhw cGd0dCwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsCi0JCQkJCW5ld19wYWdlX2RpcnMpOwor CXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmllcyh2bSwgcGRwLCBzdGFydCwg bGVuZ3RoLAorCQkJCQkJbmV3X3BhZ2VfZGlycyk7CiAJaWYgKHJldCkgewogCQlmcmVlX2dlbjhf dGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcywgcGRwZXMpOwogCQly ZXR1cm4gcmV0OwogCX0KIAogCS8qIEZvciBldmVyeSBwYWdlIGRpcmVjdG9yeSByZWZlcmVuY2Vk LCBhbGxvY2F0ZSBwYWdlIHRhYmxlcyAqLwotCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBwZ3R0 LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKLQkJcmV0ID0gZ2VuOF9wcGd0dF9h bGxvY19wYWdldGFicyhwcGd0dCwgcGQsIHN0YXJ0LCBsZW5ndGgsCisJZ2VuOF9mb3JfZWFjaF9w ZHBlKHBkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJcmV0ID0gZ2VuOF9w cGd0dF9hbGxvY19wYWdldGFicyh2bSwgcGQsIHN0YXJ0LCBsZW5ndGgsCiAJCQkJCQluZXdfcGFn ZV90YWJsZXNbcGRwZV0pOwogCQlpZiAocmV0KQogCQkJZ290byBlcnJfb3V0OwpAQCAtOTk1LDcg KzEwMDAsNyBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCiAKIAkvKiBBbGxvY2F0aW9ucyBoYXZlIGNvbXBsZXRlZCBzdWNjZXNz ZnVsbHksIHNvIHNldCB0aGUgYml0bWFwcywgYW5kIGRvCiAJICogdGhlIG1hcHBpbmdzLiAqLwot CWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAs IHBkcGUpIHsKKwlnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVt cCwgcGRwZSkgewogCQlnZW44X3BkZV90ICpjb25zdCBwYWdlX2RpcmVjdG9yeSA9IGttYXBfcHgo cGQpOwogCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKIAkJdWludDY0X3QgcGRfbGVuID0g bGVuZ3RoOwpAQCAtMTAyOCw4ICsxMDMzLDcgQEAgc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3Jh bmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQl9CiAKIAkJa3VubWFwX3B4KHBw Z3R0LCBwYWdlX2RpcmVjdG9yeSk7Ci0KLQkJX19zZXRfYml0KHBkcGUsIHBwZ3R0LT5wZHAudXNl ZF9wZHBlcyk7CisJCV9fc2V0X2JpdChwZHBlLCBwZHAtPnVzZWRfcGRwZXMpOwogCX0KIAogCWZy ZWVfZ2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzLCBwZHBl cyk7CkBAIC0xMDM5LDExICsxMDQzLDExIEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5n ZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIGVycl9vdXQ6CiAJd2hpbGUgKHBkcGUt LSkgewogCQlmb3JfZWFjaF9zZXRfYml0KHRlbXAsIG5ld19wYWdlX3RhYmxlc1twZHBlXSwgSTkx NV9QREVTKQotCQkJZnJlZV9wdCh2bS0+ZGV2LCBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3Bk cGVdLT5wYWdlX3RhYmxlW3RlbXBdKTsKKwkJCWZyZWVfcHQoZGV2LCBwZHAtPnBhZ2VfZGlyZWN0 b3J5W3BkcGVdLT5wYWdlX3RhYmxlW3RlbXBdKTsKIAl9CiAKIAlmb3JfZWFjaF9zZXRfYml0KHBk cGUsIG5ld19wYWdlX2RpcnMsIHBkcGVzKQotCQlmcmVlX3BkKHZtLT5kZXYsIHBwZ3R0LT5wZHAu cGFnZV9kaXJlY3RvcnlbcGRwZV0pOworCQlmcmVlX3BkKGRldiwgcGRwLT5wYWdlX2RpcmVjdG9y eVtwZHBlXSk7CiAKIAlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5ld19w YWdlX3RhYmxlcywgcGRwZXMpOwogCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7Ci0tIAoyLjQuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK