From: Harry Wentland Subject: [PATCH v2 01/16] drm/amd/display: decouple per-crtc-plane model Date: Mon, 3 Apr 2017 19:43:03 -0400 Message-ID: <20170403234318.26100-2-harry.wentland@amd.com> References: <20170403234318.26100-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170403234318.26100-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Shirish S RnJvbTogU2hpcmlzaCBTIDxzaGlyaXNoLnNAYW1kLmNvbT4KCkN1cnJlbnQgZGVzaWduIGhhcyBw ZXItY3J0Yy1wbGFuZSBtb2RlbC4KQXMgYSByZXN1bHQsIGZvciBhc2ljJ3MgdGhhdCBzdXBwb3J0 IHVuZGVybGF5LAphcmUgdW5hYmxlIHRvIGV4cG9zZSBpdCB0byB1c2VyIHNwYWNlIGZvciBtb2Rl c2V0dGluZy4KClRvIGVuYWJsZSB0aGlzLCB0aGUgZHJtIGRyaXZlciBpbnRpYWxpc2F0aW9uIG5v dyBydW5zCmZvciBudW1iZXIgb2Ygc3VyZmFjZXMgaW5zdGVhZCBvZiBzdHJlYW0vY3J0Yy4KClRo aXMgcGF0Y2ggcGx1bWJzIHN1cmZhY2UgY2FwYWJpbGl0aWVzIHRvIGRybSBmcmFtZXdvcmsKc28g dGhhdCBpdCBjYW4gYmUgZWZmZWN0aXZlbHkgdXNlZCBieSB1c2VyIHNwYWNlLgoKVGVzdHM6IChP biBDaHJvbWl1bSBPUyBmb3IgU3RvbmV5IE9ubHkpCiogJ21vZGV0ZXN0IC1wJyAgbm93IHNob3dz IGFkZGl0aW9uYWwgcGxhbmUKICB3aXRoIFlVViBjYXBhYmlsaXRpZXMgaW4gY2FzZSBvZiBDWiBh bmQgU1QuCiogJ3BsYW5lX3Rlc3QnIGZhaWxzIHdpdGggYmVsb3cgZXJyb3I6CiAgW2RybTphbWRn cHVfZG1fY29ubmVjdG9yX2F0b21pY19zZXRfcHJvcGVydHkgW2FtZGdwdV1dICpFUlJPUiogVW5z dXBwb3J0ZWQgc2NyZWVuIGRlcHRoIDAKICBhcyB0aGVyIGlzIG5vIHN1cHBvcnQgZm9yIFlVWVYK KiBDaGVja2VkIG11bHRpbW9uaXRvciBkaXNwbGF5IHdvcmtzIGZpbmUKCkNoYW5nZS1JZDogSWJj MTEyZDFjN2Y3NjUzOWI1MzBiNGUxMTg2MmJiNTdmMmU0ODAxMjEKU2lnbmVkLW9mZi1ieTogU2hp cmlzaCBTIDxzaGlyaXNoLnNAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfbW9kZS5oICAgICAgICAgICB8ICA4ICsrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyAgfCA2NyArKysrKysrKysrKysrKy0tLS0tCiAu Li4vZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYyAgICB8IDc1ICsr KysrKysrKysrKysrKy0tLS0tLS0KIC4uLi9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbV90eXBlcy5oICAgIHwgIDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Yy5oICAgICAgICAgICAgICAgIHwgIDEgKwogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMDAv ZGNlMTAwX3Jlc291cmNlLmMgICAgfCAgMiArCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTEx MC9kY2UxMTBfcmVzb3VyY2UuYyAgICB8ICAyICsKIC4uLi9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNl MTEyL2RjZTExMl9yZXNvdXJjZS5jICAgIHwgIDIgKwogLi4uL2RybS9hbWQvZGlzcGxheS9kYy9k Y2UxMjAvZGNlMTIwX3Jlc291cmNlLmMgICAgfCAgMiArCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY2U4MC9kY2U4MF9yZXNvdXJjZS5jICB8ICAyICsKIDEwIGZpbGVzIGNoYW5nZWQsIDEy NyBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X21vZGUuaAppbmRleCAzMTQ4NDEyNWU4NzUuLmRhM2IxMjU5OTAxOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X21vZGUuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCkBAIC01OSw2ICs1OSw3IEBAIHN0 cnVjdCBhbWRncHVfaHBkOwogCiAjZGVmaW5lIEFNREdQVV9NQVhfSFBEX1BJTlMgNgogI2RlZmlu ZSBBTURHUFVfTUFYX0NSVENTIDYKKyNkZWZpbmUgQU1ER1BVX01BWF9QTEFORVMgNgogI2RlZmlu ZSBBTURHUFVfTUFYX0FGTVRfQkxPQ0tTIDkKIAogZW51bSBhbWRncHVfcm14X3R5cGUgewpAQCAt MzM4LDYgKzMzOSw3IEBAIHN0cnVjdCBhbWRncHVfbW9kZV9pbmZvIHsKIAlzdHJ1Y3QgY2FyZF9p bmZvICphdG9tX2NhcmRfaW5mbzsKIAlib29sIG1vZGVfY29uZmlnX2luaXRpYWxpemVkOwogCXN0 cnVjdCBhbWRncHVfY3J0YyAqY3J0Y3NbQU1ER1BVX01BWF9DUlRDU107CisJc3RydWN0IGFtZGdw dV9wbGFuZSAqcGxhbmVzW0FNREdQVV9NQVhfUExBTkVTXTsKIAlzdHJ1Y3QgYW1kZ3B1X2FmbXQg KmFmbXRbQU1ER1BVX01BWF9BRk1UX0JMT0NLU107CiAJLyogRFZJLUkgcHJvcGVydGllcyAqLwog CXN0cnVjdCBkcm1fcHJvcGVydHkgKmNvaGVyZW50X21vZGVfcHJvcGVydHk7CkBAIC0zNzEsNiAr MzczLDcgQEAgc3RydWN0IGFtZGdwdV9tb2RlX2luZm8gewogCWludAkJCW51bV9kaWc7IC8qIG51 bWJlciBvZiBkaWcgYmxvY2tzICovCiAJaW50CQkJZGlzcF9wcmlvcml0eTsKIAljb25zdCBzdHJ1 Y3QgYW1kZ3B1X2Rpc3BsYXlfZnVuY3MgKmZ1bmNzOworCWVudW0gZHJtX3BsYW5lX3R5cGUgKnBs YW5lX3R5cGU7CiB9OwogCiAjZGVmaW5lIEFNREdQVV9NQVhfQkxfTEVWRUwgMHhGRgpAQCAtNDUy LDYgKzQ1NSwxMSBAQCBzdHJ1Y3QgYW1kZ3B1X2NydGMgewogCXN0cnVjdCBkcm1fcGVuZGluZ192 YmxhbmtfZXZlbnQgKmV2ZW50OwogfTsKIAorc3RydWN0IGFtZGdwdV9wbGFuZSB7CisJc3RydWN0 IGRybV9wbGFuZSBiYXNlOworCWVudW0gZHJtX3BsYW5lX3R5cGUgcGxhbmVfdHlwZTsKK307CisK IHN0cnVjdCBhbWRncHVfZW5jb2Rlcl9hdG9tX2RpZyB7CiAJYm9vbCBsaW5rYjsKIAkvKiBhdG9t IGRpZyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9k bS9hbWRncHVfZG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1k Z3B1X2RtLmMKaW5kZXggZWQ3Y2E2NzVmZjM3Li4xODYzNTk1NGY5ZmQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwpAQCAtNTUsNiAr NTUsMjggQEAKIAogI2luY2x1ZGUgIm1vZHVsZXMvaW5jL21vZF9mcmVlc3luYy5oIgogCitzdGF0 aWMgZW51bSBkcm1fcGxhbmVfdHlwZSBkbV9zdXJmYWNlc190eXBlX2RlZmF1bHRbQU1ER1BVX01B WF9QTEFORVNdID0geworCURSTV9QTEFORV9UWVBFX1BSSU1BUlksCisJRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSwKKwlEUk1fUExBTkVfVFlQRV9QUklNQVJZLAorCURSTV9QTEFORV9UWVBFX1BSSU1B UlksCisJRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKKwlEUk1fUExBTkVfVFlQRV9QUklNQVJZLAor fTsKKworc3RhdGljIGVudW0gZHJtX3BsYW5lX3R5cGUgZG1fc3VyZmFjZXNfdHlwZV9jYXJpenpv W0FNREdQVV9NQVhfUExBTkVTXSA9IHsKKwlEUk1fUExBTkVfVFlQRV9QUklNQVJZLAorCURSTV9Q TEFORV9UWVBFX1BSSU1BUlksCisJRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKKwlEUk1fUExBTkVf VFlQRV9PVkVSTEFZLC8qIFlVViBDYXBhYmxlIFVuZGVybGF5ICovCit9OworCitzdGF0aWMgZW51 bSBkcm1fcGxhbmVfdHlwZSBkbV9zdXJmYWNlc190eXBlX3N0b25leVtBTURHUFVfTUFYX1BMQU5F U10gPSB7CisJRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKKwlEUk1fUExBTkVfVFlQRV9QUklNQVJZ LAorCURSTV9QTEFORV9UWVBFX09WRVJMQVksIC8qIFlVViBDYXBhYmxlIFVuZGVybGF5ICovCit9 OworCiAvKgogICogZG1fdmJsYW5rX2dldF9jb3VudGVyCiAgKgpAQCAtMTA1NywzMCArMTA3OSwz NCBAQCBpbnQgYW1kZ3B1X2RtX2luaXRpYWxpemVfZHJtX2RldmljZShzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIAl1aW50MzJfdCBpOwogCXN0cnVjdCBhbWRncHVfY29ubmVjdG9yICphY29u bmVjdG9yOwogCXN0cnVjdCBhbWRncHVfZW5jb2RlciAqYWVuY29kZXI7Ci0Jc3RydWN0IGFtZGdw dV9jcnRjICphY3J0YzsKKwlzdHJ1Y3QgYW1kZ3B1X21vZGVfaW5mbyAqbW9kZV9pbmZvID0gJmFk ZXYtPm1vZGVfaW5mbzsKIAl1aW50MzJfdCBsaW5rX2NudDsKIAogCWxpbmtfY250ID0gZG0tPmRj LT5jYXBzLm1heF9saW5rczsKLQogCWlmIChhbWRncHVfZG1fbW9kZV9jb25maWdfaW5pdChkbS0+ YWRldikpIHsKIAkJRFJNX0VSUk9SKCJETTogRmFpbGVkIHRvIGluaXRpYWxpemUgbW9kZSBjb25m aWdcbiIpOwotCQlyZXR1cm4gLTE7CisJCWdvdG8gZmFpbDsKIAl9CiAKLQlmb3IgKGkgPSAwOyBp IDwgZG0tPmRjLT5jYXBzLm1heF9zdHJlYW1zOyBpKyspIHsKLQkJYWNydGMgPSBremFsbG9jKHNp emVvZihzdHJ1Y3QgYW1kZ3B1X2NydGMpLCBHRlBfS0VSTkVMKTsKLQkJaWYgKCFhY3J0YykKLQkJ CWdvdG8gZmFpbDsKKwlmb3IgKGkgPSAwOyBpIDwgZG0tPmRjLT5jYXBzLm1heF9zdXJmYWNlczsg aSsrKSB7CisJCW1vZGVfaW5mby0+cGxhbmVzW2ldID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGFt ZGdwdV9wbGFuZSksCisJCQkJCQkJCSBHRlBfS0VSTkVMKTsKKwkJaWYgKCFtb2RlX2luZm8tPnBs YW5lc1tpXSkgeworCQkJRFJNX0VSUk9SKCJLTVM6IEZhaWxlZCB0byBhbGxvY2F0ZSBzdXJmYWNl XG4iKTsKKwkJCWdvdG8gZmFpbF9mcmVlX3BsYW5lczsKKwkJfQorCQltb2RlX2luZm8tPnBsYW5l c1tpXS0+cGxhbmVfdHlwZSA9IG1vZGVfaW5mby0+cGxhbmVfdHlwZVtpXTsKKwkJaWYgKGFtZGdw dV9kbV9wbGFuZV9pbml0KGRtLCBtb2RlX2luZm8tPnBsYW5lc1tpXSwgMSkpIHsKKwkJCURSTV9F UlJPUigiS01TOiBGYWlsZWQgdG8gaW5pdGlhbGl6ZSBwbGFuZVxuIik7CisJCQlnb3RvIGZhaWxf ZnJlZV9wbGFuZXM7CisJCX0KKwl9CiAKLQkJaWYgKGFtZGdwdV9kbV9jcnRjX2luaXQoCi0JCQlk bSwKLQkJCWFjcnRjLAotCQkJaSkpIHsKKwlmb3IgKGkgPSAwOyBpIDwgZG0tPmRjLT5jYXBzLm1h eF9zdHJlYW1zOyBpKyspCisJCWlmIChhbWRncHVfZG1fY3J0Y19pbml0KGRtLCAmbW9kZV9pbmZv LT5wbGFuZXNbaV0tPmJhc2UsIGkpKSB7CiAJCQlEUk1fRVJST1IoIktNUzogRmFpbGVkIHRvIGlu aXRpYWxpemUgY3J0Y1xuIik7Ci0JCQlrZnJlZShhY3J0Yyk7Ci0JCQlnb3RvIGZhaWw7CisJCQln b3RvIGZhaWxfZnJlZV9wbGFuZXM7CiAJCX0KLQl9CiAKIAlkbS0+ZGlzcGxheV9pbmRleGVzX251 bSA9IGRtLT5kYy0+Y2Fwcy5tYXhfc3RyZWFtczsKIApAQCAtMTEzMSwxMiArMTE1NywxMiBAQCBp bnQgYW1kZ3B1X2RtX2luaXRpYWxpemVfZHJtX2RldmljZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAljYXNlIENISVBfVkVHQTEwOgogCQlpZiAoZGNlMTEwX3JlZ2lzdGVyX2lycV9oYW5k bGVycyhkbS0+YWRldikpIHsKIAkJCURSTV9FUlJPUigiRE06IEZhaWxlZCB0byBpbml0aWFsaXpl IElSUVxuIik7Ci0JCQlyZXR1cm4gLTE7CisJCQlnb3RvIGZhaWxfZnJlZV9lbmNvZGVyOwogCQl9 CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCURSTV9FUlJPUigiVXN1cHBvcnRlZCBBU0lDIHR5cGU6 IDB4JVhcbiIsIGFkZXYtPmFzaWNfdHlwZSk7Ci0JCXJldHVybiAtMTsKKwkJZ290byBmYWlsX2Zy ZWVfZW5jb2RlcjsKIAl9CiAKIAlkcm1fbW9kZV9jb25maWdfcmVzZXQoZG0tPmRkZXYpOwpAQCAt MTE0Niw2ICsxMTcyLDkgQEAgaW50IGFtZGdwdV9kbV9pbml0aWFsaXplX2RybV9kZXZpY2Uoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJa2ZyZWUoYWVuY29kZXIpOwogZmFpbF9mcmVlX2Nv bm5lY3RvcjoKIAlrZnJlZShhY29ubmVjdG9yKTsKK2ZhaWxfZnJlZV9wbGFuZXM6CisJZm9yIChp ID0gMDsgaSA8IGRtLT5kYy0+Y2Fwcy5tYXhfc3VyZmFjZXM7IGkrKykKKwkJa2ZyZWUobW9kZV9p bmZvLT5wbGFuZXNbaV0pOwogZmFpbDoKIAlyZXR1cm4gLTE7CiB9CkBAIC0xNTM3LDYgKzE1NjYs NyBAQCBzdGF0aWMgaW50IGRtX2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogCQlhZGV2LT5tb2Rl X2luZm8ubnVtX2NydGMgPSA2OwogCQlhZGV2LT5tb2RlX2luZm8ubnVtX2hwZCA9IDY7CiAJCWFk ZXYtPm1vZGVfaW5mby5udW1fZGlnID0gNjsKKwkJYWRldi0+bW9kZV9pbmZvLnBsYW5lX3R5cGUg PSBkbV9zdXJmYWNlc190eXBlX2RlZmF1bHQ7CiAjaWZkZWYgQ09ORklHX0RSTV9BTURHUFVfQ0lL CiAJCWlmIChhZGV2LT5tb2RlX2luZm8uZnVuY3MgPT0gTlVMTCkKIAkJCWFkZXYtPm1vZGVfaW5m by5mdW5jcyA9ICZkbV9kY2VfdjhfMF9kaXNwbGF5X2Z1bmNzOwpAQCAtMTU0Nyw2ICsxNTc3LDcg QEAgc3RhdGljIGludCBkbV9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkKIAkJYWRldi0+bW9kZV9p bmZvLm51bV9jcnRjID0gNjsKIAkJYWRldi0+bW9kZV9pbmZvLm51bV9ocGQgPSA2OwogCQlhZGV2 LT5tb2RlX2luZm8ubnVtX2RpZyA9IDc7CisJCWFkZXYtPm1vZGVfaW5mby5wbGFuZV90eXBlID0g ZG1fc3VyZmFjZXNfdHlwZV9kZWZhdWx0OwogCQlpZiAoYWRldi0+bW9kZV9pbmZvLmZ1bmNzID09 IE5VTEwpCiAJCQlhZGV2LT5tb2RlX2luZm8uZnVuY3MgPSAmZG1fZGNlX3YxMF8wX2Rpc3BsYXlf ZnVuY3M7CiAJCWJyZWFrOwpAQCAtMTU1NCw2ICsxNTg1LDcgQEAgc3RhdGljIGludCBkbV9lYXJs eV9pbml0KHZvaWQgKmhhbmRsZSkKIAkJYWRldi0+bW9kZV9pbmZvLm51bV9jcnRjID0gMzsKIAkJ YWRldi0+bW9kZV9pbmZvLm51bV9ocGQgPSA2OwogCQlhZGV2LT5tb2RlX2luZm8ubnVtX2RpZyA9 IDk7CisJCWFkZXYtPm1vZGVfaW5mby5wbGFuZV90eXBlID0gZG1fc3VyZmFjZXNfdHlwZV9jYXJp enpvOwogCQlpZiAoYWRldi0+bW9kZV9pbmZvLmZ1bmNzID09IE5VTEwpCiAJCQlhZGV2LT5tb2Rl X2luZm8uZnVuY3MgPSAmZG1fZGNlX3YxMV8wX2Rpc3BsYXlfZnVuY3M7CiAJCWJyZWFrOwpAQCAt MTU2MSw2ICsxNTkzLDcgQEAgc3RhdGljIGludCBkbV9lYXJseV9pbml0KHZvaWQgKmhhbmRsZSkK IAkJYWRldi0+bW9kZV9pbmZvLm51bV9jcnRjID0gMjsKIAkJYWRldi0+bW9kZV9pbmZvLm51bV9o cGQgPSA2OwogCQlhZGV2LT5tb2RlX2luZm8ubnVtX2RpZyA9IDk7CisJCWFkZXYtPm1vZGVfaW5m by5wbGFuZV90eXBlID0gZG1fc3VyZmFjZXNfdHlwZV9zdG9uZXk7CiAJCWlmIChhZGV2LT5tb2Rl X2luZm8uZnVuY3MgPT0gTlVMTCkKIAkJCWFkZXYtPm1vZGVfaW5mby5mdW5jcyA9ICZkbV9kY2Vf djExXzBfZGlzcGxheV9mdW5jczsKIAkJYnJlYWs7CkBAIC0xNTY5LDYgKzE2MDIsNyBAQCBzdGF0 aWMgaW50IGRtX2Vhcmx5X2luaXQodm9pZCAqaGFuZGxlKQogCQlhZGV2LT5tb2RlX2luZm8ubnVt X2NydGMgPSA1OwogCQlhZGV2LT5tb2RlX2luZm8ubnVtX2hwZCA9IDU7CiAJCWFkZXYtPm1vZGVf aW5mby5udW1fZGlnID0gNTsKKwkJYWRldi0+bW9kZV9pbmZvLnBsYW5lX3R5cGUgPSBkbV9zdXJm YWNlc190eXBlX2RlZmF1bHQ7CiAJCWlmIChhZGV2LT5tb2RlX2luZm8uZnVuY3MgPT0gTlVMTCkK IAkJCWFkZXYtPm1vZGVfaW5mby5mdW5jcyA9ICZkbV9kY2VfdjExXzBfZGlzcGxheV9mdW5jczsK IAkJYnJlYWs7CkBAIC0xNTc2LDYgKzE2MTAsNyBAQCBzdGF0aWMgaW50IGRtX2Vhcmx5X2luaXQo dm9pZCAqaGFuZGxlKQogCQlhZGV2LT5tb2RlX2luZm8ubnVtX2NydGMgPSA2OwogCQlhZGV2LT5t b2RlX2luZm8ubnVtX2hwZCA9IDY7CiAJCWFkZXYtPm1vZGVfaW5mby5udW1fZGlnID0gNjsKKwkJ YWRldi0+bW9kZV9pbmZvLnBsYW5lX3R5cGUgPSBkbV9zdXJmYWNlc190eXBlX2RlZmF1bHQ7CiAJ CWlmIChhZGV2LT5tb2RlX2luZm8uZnVuY3MgPT0gTlVMTCkKIAkJCWFkZXYtPm1vZGVfaW5mby5m dW5jcyA9ICZkbV9kY2VfdjExXzBfZGlzcGxheV9mdW5jczsKIAkJYnJlYWs7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMu YwppbmRleCA5MjlhNGM4ZWE2MmQuLjI2NTVkYTMwM2NmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCkBAIC0x NjEwLDYgKzE2MTAsOCBAQCBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzIGFt ZGdwdV9kbV9lbmNvZGVyX2hlbHBlcl9mdW5jcyA9IHsKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX2Z1bmNzIGRtX3BsYW5lX2Z1bmNzID0geworCS51cGRhdGVfcGxhbmUgICA9 IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKKwkuZGlzYWJsZV9wbGFuZSAgPSBkcm1f YXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lLAogCS5yZXNldCA9IGRybV9hdG9taWNfaGVscGVy X3BsYW5lX3Jlc2V0LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJtX2F0b21pY19oZWxw ZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGRybV9h dG9taWNfaGVscGVyX3BsYW5lX2Rlc3Ryb3lfc3RhdGUKQEAgLTE3NDEsMzcgKzE3NDMsNjcgQEAg c3RhdGljIHVpbnQzMl90IHJnYl9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9BQkdSMjEwMTAx MCwKIH07CiAKLWludCBhbWRncHVfZG1fY3J0Y19pbml0KHN0cnVjdCBhbWRncHVfZGlzcGxheV9t YW5hZ2VyICpkbSwKLQkJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGMsCi0JCQl1aW50MzJfdCBj cnRjX2luZGV4KQorc3RhdGljIHVpbnQzMl90IHl1dl9mb3JtYXRzW10gPSB7CisJRFJNX0ZPUk1B VF9ZVVlWLAorCURSTV9GT1JNQVRfWVZZVSwKKwlEUk1fRk9STUFUX1VZVlksCisJRFJNX0ZPUk1B VF9WWVVZLAorfTsKKworaW50IGFtZGdwdV9kbV9wbGFuZV9pbml0KHN0cnVjdCBhbWRncHVfZGlz cGxheV9tYW5hZ2VyICpkbSwKKwkJCXN0cnVjdCBhbWRncHVfcGxhbmUgKmFwbGFuZSwKKwkJCXVu c2lnbmVkIGxvbmcgcG9zc2libGVfY3J0Y3MpCiB7Ci0JaW50IHJlcyA9IC1FTk9NRU07CisJaW50 IHJlcyA9IC1FUEVSTTsKIAotCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnlfcGxhbmUgPQotCQlr emFsbG9jKHNpemVvZigqcHJpbWFyeV9wbGFuZSksIEdGUF9LRVJORUwpOworCXN3aXRjaCAoYXBs YW5lLT5wbGFuZV90eXBlKSB7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQlhcGxh bmUtPmJhc2UuZm9ybWF0X2RlZmF1bHQgPSB0cnVlOwogCi0JaWYgKCFwcmltYXJ5X3BsYW5lKQot CQlnb3RvIGZhaWxfcGxhbmU7CisJCXJlcyA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgKKwkJ CQlkbS0+YWRldi0+ZGRldiwKKwkJCQkmYXBsYW5lLT5iYXNlLAorCQkJCXBvc3NpYmxlX2NydGNz LAorCQkJCSZkbV9wbGFuZV9mdW5jcywKKwkJCQlyZ2JfZm9ybWF0cywKKwkJCQlBUlJBWV9TSVpF KHJnYl9mb3JtYXRzKSwKKwkJCQlhcGxhbmUtPnBsYW5lX3R5cGUsIE5VTEwpOworCQlicmVhazsK KwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6CisJCXJlcyA9IGRybV91bml2ZXJzYWxfcGxh bmVfaW5pdCgKKwkJCQlkbS0+YWRldi0+ZGRldiwKKwkJCQkmYXBsYW5lLT5iYXNlLAorCQkJCXBv c3NpYmxlX2NydGNzLAorCQkJCSZkbV9wbGFuZV9mdW5jcywKKwkJCQl5dXZfZm9ybWF0cywKKwkJ CQlBUlJBWV9TSVpFKHl1dl9mb3JtYXRzKSwKKwkJCQlhcGxhbmUtPnBsYW5lX3R5cGUsIE5VTEwp OworCQlicmVhazsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKKwkJRFJNX0VSUk9SKCJL TVM6IEN1cnNvciBwbGFuZSBub3QgaW1wbGVtZW50ZWQuIik7CisJCWJyZWFrOworCX0KIAotCXBy aW1hcnlfcGxhbmUtPmZvcm1hdF9kZWZhdWx0ID0gdHJ1ZTsKKwlkcm1fcGxhbmVfaGVscGVyX2Fk ZCgmYXBsYW5lLT5iYXNlLCAmZG1fcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAotCXJlcyA9IGRybV91 bml2ZXJzYWxfcGxhbmVfaW5pdCgKLQkJZG0tPmFkZXYtPmRkZXYsCi0JCXByaW1hcnlfcGxhbmUs Ci0JCTAsCi0JCSZkbV9wbGFuZV9mdW5jcywKLQkJcmdiX2Zvcm1hdHMsCi0JCUFSUkFZX1NJWkUo cmdiX2Zvcm1hdHMpLAotCQlEUk1fUExBTkVfVFlQRV9QUklNQVJZLCBOVUxMKTsKKwlyZXR1cm4g cmVzOworfQogCi0JcHJpbWFyeV9wbGFuZS0+Y3J0YyA9ICZhY3J0Yy0+YmFzZTsKK2ludCBhbWRn cHVfZG1fY3J0Y19pbml0KHN0cnVjdCBhbWRncHVfZGlzcGxheV9tYW5hZ2VyICpkbSwKKwkJCXN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJdWludDMyX3QgY3J0Y19pbmRleCkKK3sKKwlzdHJ1 Y3QgYW1kZ3B1X2NydGMgKmFjcnRjOworCWludCByZXMgPSAtRU5PTUVNOwogCi0JZHJtX3BsYW5l X2hlbHBlcl9hZGQocHJpbWFyeV9wbGFuZSwgJmRtX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisJYWNy dGMgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgYW1kZ3B1X2NydGMpLCBHRlBfS0VSTkVMKTsKKwlp ZiAoIWFjcnRjKQorCQlnb3RvIGZhaWw7CiAKIAlyZXMgPSBkcm1fY3J0Y19pbml0X3dpdGhfcGxh bmVzKAogCQkJZG0tPmRkZXYsCiAJCQkmYWNydGMtPmJhc2UsCi0JCQlwcmltYXJ5X3BsYW5lLAor CQkJcGxhbmUsCiAJCQlOVUxMLAogCQkJJmFtZGdwdV9kbV9jcnRjX2Z1bmNzLCBOVUxMKTsKIApA QCAtMTc5MSw4ICsxODIzLDcgQEAgaW50IGFtZGdwdV9kbV9jcnRjX2luaXQoc3RydWN0IGFtZGdw dV9kaXNwbGF5X21hbmFnZXIgKmRtLAogCiAJcmV0dXJuIDA7CiBmYWlsOgotCWtmcmVlKHByaW1h cnlfcGxhbmUpOwotZmFpbF9wbGFuZToKKwlrZnJlZShhY3J0Yyk7CiAJYWNydGMtPmNydGNfaWQg PSAtMTsKIAlyZXR1cm4gcmVzOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmgKaW5kZXggMWJiZWI4N2RjOWQwLi5h YjZkNTFkYmJmNGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRn cHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuaApAQCAtMzQsOCArMzQsMTEgQEAgc3RydWN0IGRj X3ZhbGlkYXRpb25fc2V0Owogc3RydWN0IGRjX3N1cmZhY2U7CiAKIC8qVE9ETyBKb2RhbiBIZXJz ZW4gdXNlIHRoZSBvbmUgaW4gYW1kZ3B1X2RtKi8KK2ludCBhbWRncHVfZG1fcGxhbmVfaW5pdChz dHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0sCisJCQlzdHJ1Y3QgYW1kZ3B1X3BsYW5l ICphcGxhbmUsCisJCQl1bnNpZ25lZCBsb25nIHBvc3NpYmxlX2NydGNzKTsKIGludCBhbWRncHVf ZG1fY3J0Y19pbml0KHN0cnVjdCBhbWRncHVfZGlzcGxheV9tYW5hZ2VyICpkbSwKLQkJCXN0cnVj dCBhbWRncHVfY3J0YyAqYW1kZ3B1X2NydGMsCisJCQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAkJCXVpbnQzMl90IGxpbmtfaW5kZXgpOwogaW50IGFtZGdwdV9kbV9jb25uZWN0b3JfaW5pdChz dHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0sCiAJCQlzdHJ1Y3QgYW1kZ3B1X2Nvbm5l Y3RvciAqYW1kZ3B1X2Nvbm5lY3RvciwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKaW5k ZXggMDczMTA0NWY2MDg0Li45ZGQ4YjJhZDRjNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kYy5oCkBAIC00NSw2ICs0NSw3IEBAIHN0cnVjdCBkY19jYXBzIHsKIAl1aW50MzJfdCBtYXhf bGlua3M7CiAJdWludDMyX3QgbWF4X2F1ZGlvczsKIAl1aW50MzJfdCBtYXhfc2xhdmVfcGxhbmVz OworCXVpbnQzMl90IG1heF9zdXJmYWNlczsKIAl1aW50MzJfdCBtYXhfZG93bnNjYWxlX3JhdGlv OwogCXVpbnQzMl90IGkyY19zcGVlZF9pbl9raHo7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTAwL2RjZTEwMF9yZXNvdXJjZS5jCmluZGV4IGI2Zjc3 Zjg4YmU5Yy4uZDE2ODVkZjA5ODE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvZGNlMTAwL2RjZTEwMF9yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UxMDAvZGNlMTAwX3Jlc291cmNlLmMKQEAgLTEwMzUsNiArMTAzNSw4 IEBAIHN0YXRpYyBib29sIGNvbnN0cnVjdCgKIAkJfQogCX0KIAorCWRjLT5wdWJsaWMuY2Fwcy5t YXhfc3VyZmFjZXMgPSAgcG9vbC0+YmFzZS5waXBlX2NvdW50OworCiAJaWYgKCFyZXNvdXJjZV9j b25zdHJ1Y3QobnVtX3ZpcnR1YWxfbGlua3MsIGRjLCAmcG9vbC0+YmFzZSwKIAkJCSZyZXNfY3Jl YXRlX2Z1bmNzKSkKIAkJZ290byByZXNfY3JlYXRlX2ZhaWw7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYwppbmRleCBl MzAwMjAzMWM0MGQuLjA2NWEyOTg2YjY2NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9yZXNvdXJjZS5jCkBAIC0xNDU1LDYgKzE0 NTUsOCBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAJaWYgKCFkY2UxMTBfaHdfc2VxdWVuY2Vy X2NvbnN0cnVjdChkYykpCiAJCWdvdG8gcmVzX2NyZWF0ZV9mYWlsOwogCisJZGMtPnB1YmxpYy5j YXBzLm1heF9zdXJmYWNlcyA9ICBwb29sLT5iYXNlLnBpcGVfY291bnQ7CisKIAlid19jYWxjc19p bml0KCZkYy0+YndfZGNlaXAsICZkYy0+YndfdmJpb3MsIGRjLT5jdHgtPmFzaWNfaWQpOwogCiAJ YndfY2FsY3NfZGF0YV91cGRhdGVfZnJvbV9wcGxpYihkYyk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEyL2RjZTExMl9yZXNvdXJjZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMi9kY2UxMTJfcmVzb3VyY2UuYwppbmRleCAz MmFhMWI1YmYxZjkuLmVjZTNlYzcyMzYzZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjZTExMi9kY2UxMTJfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEyL2RjZTExMl9yZXNvdXJjZS5jCkBAIC0xNDA5LDYgKzE0 MDksOCBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3QoCiAJCQkgICZyZXNfY3JlYXRlX2Z1bmNzKSkK IAkJZ290byByZXNfY3JlYXRlX2ZhaWw7CiAKKwlkYy0+cHVibGljLmNhcHMubWF4X3N1cmZhY2Vz ID0gIHBvb2wtPmJhc2UucGlwZV9jb3VudDsKKwogCS8qIENyZWF0ZSBoYXJkd2FyZSBzZXF1ZW5j ZXIgKi8KIAlpZiAoIWRjZTExMl9od19zZXF1ZW5jZXJfY29uc3RydWN0KGRjKSkKIAkJZ290byBy ZXNfY3JlYXRlX2ZhaWw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNlMTIwL2RjZTEyMF9yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjZTEyMC9kY2UxMjBfcmVzb3VyY2UuYwppbmRleCBlZmE1ODg4OTA1OGIuLmY2NzdhNzdj YTZlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTEyMC9k Y2UxMjBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNl MTIwL2RjZTEyMF9yZXNvdXJjZS5jCkBAIC0xMDYwLDYgKzEwNjAsOCBAQCBzdGF0aWMgYm9vbCBj b25zdHJ1Y3QoCiAJaWYgKCFkY2UxMjBfaHdfc2VxdWVuY2VyX2NyZWF0ZShkYykpCiAJCWdvdG8g Y29udHJvbGxlcl9jcmVhdGVfZmFpbDsKIAorCWRjLT5wdWJsaWMuY2Fwcy5tYXhfc3VyZmFjZXMg PSAgcG9vbC0+YmFzZS5waXBlX2NvdW50OworCiAJYndfY2FsY3NfaW5pdCgmZGMtPmJ3X2RjZWlw LCAmZGMtPmJ3X3ZiaW9zLCBkYy0+Y3R4LT5hc2ljX2lkKTsKIAogCWJ3X2NhbGNzX2RhdGFfdXBk YXRlX2Zyb21fcHBsaWIoZGMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNw bGF5L2RjL2RjZTgwL2RjZTgwX3Jlc291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvZGNlODAvZGNlODBfcmVzb3VyY2UuYwppbmRleCBhM2U4MTgyODg1YjIuLjc1MmUwZTc1 NzliOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgwL2Rj ZTgwX3Jlc291cmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTgw L2RjZTgwX3Jlc291cmNlLmMKQEAgLTEwNDMsNiArMTA0Myw4IEBAIHN0YXRpYyBib29sIGNvbnN0 cnVjdCgKIAkJfQogCX0KIAorCWRjLT5wdWJsaWMuY2Fwcy5tYXhfc3VyZmFjZXMgPSAgcG9vbC0+ YmFzZS5waXBlX2NvdW50OworCiAJaWYgKCFyZXNvdXJjZV9jb25zdHJ1Y3QobnVtX3ZpcnR1YWxf bGlua3MsIGRjLCAmcG9vbC0+YmFzZSwKIAkJCSZyZXNfY3JlYXRlX2Z1bmNzKSkKIAkJZ290byBy ZXNfY3JlYXRlX2ZhaWw7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vYW1kLWdmeAo=