From: Michel Thierry Subject: [PATCH 01/13] drm/i915: Remove _entry from PPGTT page structures Date: Wed, 8 Apr 2015 12:13:23 +0100 Message-ID: <1428491615-27577-2-git-send-email-michel.thierry@intel.com> References: <1428491615-27577-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 1FFA289E38 for ; Wed, 8 Apr 2015 04:13:35 -0700 (PDT) In-Reply-To: <1428491615-27577-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 TGV0cyB0cnkgdG8ga2VlcCB0aGlzIGNvbnNpc3RlbnQ6CgpQYWdlIERpcmVjdG9yeSBQb2ludGVy IChQRFApLgpQYWdlIERpcmVjdG9yeSAoUEQpLCBhbHNvIGtub3duIGFzIHBhZ2UgZGlyZWN0b3J5 IHBvaW50ZXIgZW50cmllcy4KUGFnZSBUYWJsZSAoUFQpLCBhbHNvIGtub3duIGFzIHBhZ2UgZGly ZWN0b3J5IGVudHJpZXMuCgpzL3N0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkvc3RydWN0IGk5 MTVfcGFnZV90YWJsZS8Kcy9zdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeS9zdHJ1Y3Qg aTkxNV9wYWdlX2RpcmVjdG9yeS8Kcy9zdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVy X2VudHJ5L3N0cnVjdAppOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIvCgpTdWdnZXN0ZWQtYnk6 IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNTYgKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAx NiArKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oICAgfCAgNCAr LS0KIDMgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBmNDhkODQ1Li42MWIyZDcyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMzIwLDcgKzMyMCw3IEBAIHN0YXRpYyBp bmxpbmUgaW50IGk5MTVfZG1hX21hcF9wYWdlX3NpbmdsZShzdHJ1Y3QgcGFnZSAqcGFnZSwKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgdW5tYXBfYW5kX2ZyZWVfcHQoc3RydWN0IGk5MTVf cGFnZV90YWJsZV9lbnRyeSAqcHQsCitzdGF0aWMgdm9pZCB1bm1hcF9hbmRfZnJlZV9wdChzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlICpwdCwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogewogCWlmIChXQVJOX09OKCFwdC0+cGFnZSkpCkBAIC0zMzIsOSArMzMyLDkgQEAgc3RhdGlj IHZvaWQgdW5tYXBfYW5kX2ZyZWVfcHQoc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQs CiAJa2ZyZWUocHQpOwogfQogCi1zdGF0aWMgc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAq YWxsb2NfcHRfc2luZ2xlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgc3RydWN0IGk5 MTVfcGFnZV90YWJsZSAqYWxsb2NfcHRfc2luZ2xlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7 Ci0Jc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisJc3RydWN0IGk5MTVfcGFnZV90 YWJsZSAqcHQ7CiAJY29uc3Qgc2l6ZV90IGNvdW50ID0gSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g OCA/CiAJCUdFTjhfUFRFUyA6IEdFTjZfUFRFUzsKIAlpbnQgcmV0ID0gLUVOT01FTTsKQEAgLTM4 Myw3ICszODMsNyBAQCBmYWlsX2JpdG1hcDoKICAqCiAgKiBSZXR1cm46IDAgaWYgYWxsb2NhdGlv biBzdWNjZWVkZWQuCiAgKi8KLXN0YXRpYyBpbnQgYWxsb2NfcHRfcmFuZ2Uoc3RydWN0IGk5MTVf cGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLCB1aW50MTZfdCBwZGUsIHNpemVfdCBjb3VudCwKK3N0 YXRpYyBpbnQgYWxsb2NfcHRfcmFuZ2Uoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkLCB1 aW50MTZfdCBwZGUsIHNpemVfdCBjb3VudCwKIAkJCSAgc3RydWN0IGRybV9kZXZpY2UgKmRldikK IHsKIAlpbnQgaSwgcmV0OwpAQCAtMzkzLDcgKzM5Myw3IEBAIHN0YXRpYyBpbnQgYWxsb2NfcHRf cmFuZ2Uoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkLCB1aW50MTZfdCBwZGUs IHNpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJZm9yIChpID0gcGRlOyBpIDwgcGRlICsgY291bnQ7 IGkrKykgewotCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCA9IGFsbG9jX3B0X3Np bmdsZShkZXYpOworCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdCA9IGFsbG9jX3B0X3Npbmds ZShkZXYpOwogCiAJCWlmIChJU19FUlIocHQpKSB7CiAJCQlyZXQgPSBQVFJfRVJSKHB0KTsKQEAg LTQxMyw3ICs0MTMsNyBAQCBlcnJfb3V0OgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lk IHVubWFwX2FuZF9mcmVlX3BkKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCkK K3N0YXRpYyB2b2lkIHVubWFwX2FuZF9mcmVlX3BkKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5 ICpwZCkKIHsKIAlpZiAocGQtPnBhZ2UpIHsKIAkJX19mcmVlX3BhZ2UocGQtPnBhZ2UpOwpAQCAt NDIxLDkgKzQyMSw5IEBAIHN0YXRpYyB2b2lkIHVubWFwX2FuZF9mcmVlX3BkKHN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCkKIAl9CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9lbnRyeSAqYWxsb2NfcGRfc2luZ2xlKHZvaWQpCitzdGF0aWMgc3RydWN0 IGk5MTVfcGFnZV9kaXJlY3RvcnkgKmFsbG9jX3BkX3NpbmdsZSh2b2lkKQogewotCXN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eSAqcGQ7CiAKIAlwZCA9IGt6YWxsb2Moc2l6ZW9mKCpwZCksIEdGUF9LRVJORUwpOwogCWlmICgh cGQpCkBAIC00OTcsOCArNDk3LDggQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5n ZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICBJOTE1X0NBQ0hFX0xM QywgdXNlX3NjcmF0Y2gpOwogCiAJd2hpbGUgKG51bV9lbnRyaWVzKSB7Ci0JCXN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZDsKLQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRy eSAqcHQ7CisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKKwkJc3RydWN0IGk5MTVf cGFnZV90YWJsZSAqcHQ7CiAJCXN0cnVjdCBwYWdlICpwYWdlX3RhYmxlOwogCiAJCWlmIChXQVJO X09OKCFwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdKSkKQEAgLTU1OSw4ICs1NTksOCBA QCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogCQkJYnJlYWs7CiAKIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpIHsKLQkJ CXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCA9IHBwZ3R0LT5wZHAucGFnZV9k aXJlY3RvcnlbcGRwZV07Ci0JCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCA9IHBk LT5wYWdlX3RhYmxlW3BkZV07CisJCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQgPSBw cGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdOworCQkJc3RydWN0IGk5MTVfcGFnZV90YWJs ZSAqcHQgPSBwZC0+cGFnZV90YWJsZVtwZGVdOwogCQkJc3RydWN0IHBhZ2UgKnBhZ2VfdGFibGUg PSBwdC0+cGFnZTsKIAogCQkJcHRfdmFkZHIgPSBrbWFwX2F0b21pYyhwYWdlX3RhYmxlKTsKQEAg LTU4OCw3ICs1ODgsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9m cmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCwgc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhz dHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQsIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7 CiAJaW50IGk7CiAKQEAgLTYzMiw4ICs2MzIsOCBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X3Vu bWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCSAgICAgICBQQ0lfRE1B X0JJRElSRUNUSU9OQUwpOwogCiAJCWZvciAoaiA9IDA7IGogPCBJOTE1X1BERVM7IGorKykgewot CQkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkID0gcHBndHQtPnBkcC5wYWdl X2RpcmVjdG9yeVtpXTsKLQkJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCQkJ c3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9y eVtpXTsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0OwogCQkJZG1hX2FkZHJfdCBhZGRy OwogCiAJCQlpZiAoV0FSTl9PTighcGQtPnBhZ2VfdGFibGVbal0pKQpAQCAtNzQ3LDggKzc0Nyw4 IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9zZXR1cF9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCiAJCQkJCWNvbnN0IGludCBwdCkKIHsKIAlkbWFfYWRkcl90IHB0X2Fk ZHI7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnBkaXIgPSBwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5W3BkXTsKLQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdGFi ID0gcGRpci0+cGFnZV90YWJsZVtwdF07CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBk aXIgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkXTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX3Rh YmxlICpwdGFiID0gcGRpci0+cGFnZV90YWJsZVtwdF07CiAJc3RydWN0IHBhZ2UgKnAgPSBwdGFi LT5wYWdlOwogCWludCByZXQ7CiAKQEAgLTgxNSwxMSArODE1LDExIEBAIHN0YXRpYyBpbnQgZ2Vu OF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkK IAkgKiB3aWxsIG5ldmVyIG5lZWQgdG8gdG91Y2ggdGhlIFBERXMgYWdhaW4uCiAJICovCiAJZm9y IChpID0gMDsgaSA8IEdFTjhfTEVHQUNZX1BEUEVTOyBpKyspIHsKLQkJc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnlfZW50cnkgKnBkID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXTsKKwkJ c3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkID0gcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9y eVtpXTsKIAkJZ2VuOF9wZGVfdCAqcGRfdmFkZHI7CiAJCXBkX3ZhZGRyID0ga21hcF9hdG9taWMo cHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS0+cGFnZSk7CiAJCWZvciAoaiA9IDA7IGogPCBJ OTE1X1BERVM7IGorKykgewotCQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSBw ZC0+cGFnZV90YWJsZVtqXTsKKwkJCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0ID0gcGQtPnBh Z2VfdGFibGVbal07CiAJCQlkbWFfYWRkcl90IGFkZHIgPSBwdC0+ZGFkZHI7CiAJCQlwZF92YWRk cltqXSA9IGdlbjhfcGRlX2VuY29kZShwcGd0dC0+YmFzZS5kZXYsIGFkZHIsCiAJCQkJCQkgICAg ICBJOTE1X0NBQ0hFX0xMQyk7CkBAIC05MTQsOCArOTE0LDggQEAgc3RhdGljIHZvaWQgZ2VuNl9k dW1wX3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICpt KQogfQogCiAvKiBXcml0ZSBwZGUgKGluZGV4KSBmcm9tIHRoZSBwYWdlIGRpcmVjdG9yeSBAcGQg dG8gdGhlIHBhZ2UgdGFibGUgQHB0ICovCi1zdGF0aWMgdm9pZCBnZW42X3dyaXRlX3BkZShzdHJ1 Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCi0JCQkgICAgY29uc3QgaW50IHBkZSwg c3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQpCitzdGF0aWMgdm9pZCBnZW42X3dyaXRl X3BkZShzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQsCisJCQkgICAgY29uc3QgaW50IHBk ZSwgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQpCiB7CiAJLyogQ2FsbGVyIG5lZWRzIHRvIG1h a2Ugc3VyZSB0aGUgd3JpdGUgY29tcGxldGVzIGlmIG5lY2Vzc2FyeSAqLwogCXN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCA9CkBAIC05MzEsMTAgKzkzMSwxMCBAQCBzdGF0aWMgdm9pZCBnZW42 X3dyaXRlX3BkZShzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCiAvKiBXcml0 ZSBhbGwgdGhlIHBhZ2UgdGFibGVzIGZvdW5kIGluIHRoZSBwcGd0dCBzdHJ1Y3R1cmUgdG8gaW5j cmVtZW50aW5nIHBhZ2UKICAqIGRpcmVjdG9yaWVzLiAqLwogc3RhdGljIHZvaWQgZ2VuNl93cml0 ZV9wYWdlX3JhbmdlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkgIHN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCwKKwkJCQkgIHN0cnVjdCBpOTE1X3Bh Z2VfZGlyZWN0b3J5ICpwZCwKIAkJCQkgIHVpbnQzMl90IHN0YXJ0LCB1aW50MzJfdCBsZW5ndGgp CiB7Ci0Jc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisJc3RydWN0IGk5MTVfcGFn ZV90YWJsZSAqcHQ7CiAJdWludDMyX3QgcGRlLCB0ZW1wOwogCiAJZ2VuNl9mb3JfZWFjaF9wZGUo cHQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpCkBAIC0xMTY5LDcgKzExNjksNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgbWFya190bGJzX2RpcnR5KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCkKIH0KIAogc3RhdGljIHZvaWQgZ2VuNl9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLAotCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCkKKwkJ c3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQpCiB7CiAJZ2VuNl9wdGVfdCAqcHRfdmFkZHIsIHNj cmF0Y2hfcHRlOwogCWludCBpOwpAQCAtMTE5NSw3ICsxMTk1LDcgQEAgc3RhdGljIGludCBnZW42 X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3 X3BwZ3R0LCBiYXNlKTsKLQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdDsKKwlzdHJ1 Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKIAljb25zdCB1aW50MzJfdCBzdGFydF9zYXZlID0gc3Rh cnQsIGxlbmd0aF9zYXZlID0gbGVuZ3RoOwogCXVpbnQzMl90IHBkZSwgdGVtcDsKIAlpbnQgcmV0 OwpAQCAtMTI2Myw3ICsxMjYzLDcgQEAgc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCiB1bndpbmRfb3V0OgogCWZvcl9lYWNoX3Nl dF9iaXQocGRlLCBuZXdfcGFnZV90YWJsZXMsIEk5MTVfUERFUykgewotCQlzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlX2VudHJ5ICpwdCA9IHBwZ3R0LT5wZC5wYWdlX3RhYmxlW3BkZV07CisJCXN0cnVj dCBpOTE1X3BhZ2VfdGFibGUgKnB0ID0gcHBndHQtPnBkLnBhZ2VfdGFibGVbcGRlXTsKIAogCQlw cGd0dC0+cGQucGFnZV90YWJsZVtwZGVdID0gcHBndHQtPnNjcmF0Y2hfcHQ7CiAJCXVubWFwX2Fu ZF9mcmVlX3B0KHB0LCB2bS0+ZGV2KTsKQEAgLTEyNzgsNyArMTI3OCw3IEBAIHN0YXRpYyB2b2lk IGdlbjZfcHBndHRfZnJlZShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJaW50IGk7CiAK IAlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9lbnRyaWVzOyBpKyspIHsKLQkJc3RydWN0 IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSBwcGd0dC0+cGQucGFnZV90YWJsZVtpXTsKKwkJ c3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQgPSBwcGd0dC0+cGQucGFnZV90YWJsZVtpXTsKIAog CQlpZiAocHQgIT0gcHBndHQtPnNjcmF0Y2hfcHQpCiAJCQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0 dC0+cGQucGFnZV90YWJsZVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKQEAgLTEzNTgsNyArMTM1OCw3 IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCiBzdGF0aWMgdm9pZCBnZW42X3NjcmF0Y2hfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0LAogCQkJCSAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsKLQlz dHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICp1bnVzZWQ7CisJc3RydWN0IGk5MTVfcGFnZV90 YWJsZSAqdW51c2VkOwogCXVpbnQzMl90IHBkZSwgdGVtcDsKIAogCWdlbjZfZm9yX2VhY2hfcGRl KHVudXNlZCwgJnBwZ3R0LT5wZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRlKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBmYzAzYzk5Li4xMzg0Nzg5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMjA2LDI2ICsyMDYsMjYgQEAgc3RydWN0IGk5MTVfdm1h IHsKIAkJCSB1MzIgZmxhZ3MpOwogfTsKIAotc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSB7 CitzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlIHsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAlkbWFfYWRk cl90IGRhZGRyOwogCiAJdW5zaWduZWQgbG9uZyAqdXNlZF9wdGVzOwogfTsKIAotc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgeworc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnkgewog CXN0cnVjdCBwYWdlICpwYWdlOyAvKiBOVUxMIGZvciBHRU42LUdFTjcgKi8KIAl1bmlvbiB7CiAJ CXVpbnQzMl90IHBkX29mZnNldDsKIAkJZG1hX2FkZHJfdCBkYWRkcjsKIAl9OwogCi0Jc3RydWN0 IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcGFnZV90YWJsZVtJOTE1X1BERVNdOyAvKiBQREVzICov CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcGFnZV90YWJsZVtJOTE1X1BERVNdOyAvKiBQREVz ICovCiB9OwogCi1zdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5IHsKK3N0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgewogCS8qIHN0cnVjdCBwYWdlICpwYWdl OyAqLwotCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwYWdlX2RpcmVjdG9yeVtH RU44X0xFR0FDWV9QRFBFU107CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBhZ2VfZGly ZWN0b3J5W0dFTjhfTEVHQUNZX1BEUEVTXTsKIH07CiAKIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgewpAQCAtMzE3LDExICszMTcsMTEgQEAgc3RydWN0IGk5MTVfaHdfcHBndHQgewogCXVuc2ln bmVkIG51bV9wZF9lbnRyaWVzOwogCXVuc2lnbmVkIG51bV9wZF9wYWdlczsgLyogZ2VuOCsgKi8K IAl1bmlvbiB7Ci0JCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJfZW50cnkgcGRw OwotCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSBwZDsKKwkJc3RydWN0IGk5MTVf cGFnZV9kaXJlY3RvcnlfcG9pbnRlciBwZHA7CisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5 IHBkOwogCX07CiAKLQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpzY3JhdGNoX3B0Owor CXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnNjcmF0Y2hfcHQ7CiAKIAlzdHJ1Y3QgZHJtX2k5MTVf ZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfdHJhY2UuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAppbmRl eCBiMzA3MGE0Li40NTc0ZjBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3RyYWNlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCkBAIC0yMjEs NyArMjIxLDcgQEAgREVGSU5FX0VWRU5UKGk5MTVfcGFnZV90YWJsZV9lbnRyeSwgaTkxNV9wYWdl X3RhYmxlX2VudHJ5X2FsbG9jLAogCiBERUNMQVJFX0VWRU5UX0NMQVNTKGk5MTVfcGFnZV90YWJs ZV9lbnRyeV91cGRhdGUsCiAJVFBfUFJPVE8oc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s IHUzMiBwZGUsCi0JCSBzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwgdTMyIGZpcnN0 LCB1MzIgY291bnQsIHUzMiBiaXRzKSwKKwkJIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0LCB1 MzIgZmlyc3QsIHUzMiBjb3VudCwgdTMyIGJpdHMpLAogCVRQX0FSR1Modm0sIHBkZSwgcHQsIGZp cnN0LCBjb3VudCwgYml0cyksCiAKIAlUUF9TVFJVQ1RfX2VudHJ5KApAQCAtMjUxLDcgKzI1MSw3 IEBAIERFQ0xBUkVfRVZFTlRfQ0xBU1MoaTkxNV9wYWdlX3RhYmxlX2VudHJ5X3VwZGF0ZSwKIAog REVGSU5FX0VWRU5UKGk5MTVfcGFnZV90YWJsZV9lbnRyeV91cGRhdGUsIGk5MTVfcGFnZV90YWJs ZV9lbnRyeV9tYXAsCiAJVFBfUFJPVE8oc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sIHUz MiBwZGUsCi0JCSBzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICpwdCwgdTMyIGZpcnN0LCB1 MzIgY291bnQsIHUzMiBiaXRzKSwKKwkJIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0LCB1MzIg Zmlyc3QsIHUzMiBjb3VudCwgdTMyIGJpdHMpLAogCVRQX0FSR1Modm0sIHBkZSwgcHQsIGZpcnN0 LCBjb3VudCwgYml0cykKICk7CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=