From: Andres Rodriguez Subject: [PATCH 14/17] drm/amdgpu: allocate queues horizontally across pipes Date: Thu, 13 Apr 2017 17:35:39 -0400 Message-ID: <20170413213542.18802-15-andresx7@gmail.com> References: <20170413213542.18802-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170413213542.18802-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@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: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org UGlwZXMgcHJvdmlkZSBiZXR0ZXIgY29uY3VycmVuY3kgdGhhbiBxdWV1ZXMsIHRoZXJlZm9yZSB3 ZSB3YW50IHRvIG1ha2UKc3VyZSB0aGF0IGFwcHMgdXNlIHF1ZXVlcyBmcm9tIGRpZmZlcmVudCBw aXBlcyB3aGVuZXZlciBwb3NzaWJsZS4KCk9wdGltaXplIGZvciB0aGUgdHJpdmlhbCBjYXNlIHdo ZXJlIGFuIGFwcCB3aWxsIGNvbnN1bWUgcmluZ3MgaW4gb3JkZXIsCnRoZXJlZm9yZSB3ZSBkb24n dCB3YW50IGFkamFjZW50IHJpbmdzIHRvIGJlbG9uZyB0byB0aGUgc2FtZSBwaXBlLgoKUmV2aWV3 ZWQtYnk6IEVkd2FyZCBPJ0NhbGxhZ2hhbiA8ZnVuZnVuY3RvckBmb2xrbG9yZTE5ODQubmV0PgpB Y2tlZC1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+CkFja2VkLWJ5 OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25lZC1vZmYt Ynk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgIHwgMTMgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjdfMC5jIHwgODMgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIHwgODYgKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTEzIGluc2VydGlv bnMoKyksIDY5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5k ZXggNjE5OTBiZS4uMDU4MzM5NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAg LTE3NjIsNDAgKzE3NjIsNTMgQEAgc3RhdGljIGlubGluZSB2b2lkIGFtZGdwdV9yaW5nX3dyaXRl X211bHRpcGxlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdm9pZCAqc3IKIAkJcmluZy0+Y291 bnRfZHcgLT0gY291bnRfZHc7CiAJfQogfQogCiBzdGF0aWMgaW5saW5lIHN0cnVjdCBhbWRncHVf c2RtYV9pbnN0YW5jZSAqCiBhbWRncHVfZ2V0X3NkbWFfaW5zdGFuY2Uoc3RydWN0IGFtZGdwdV9y aW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsK IAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5zZG1hLm51bV9pbnN0YW5jZXM7IGkr KykKIAkJaWYgKCZhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnJpbmcgPT0gcmluZykKIAkJCWJyZWFr OwogCiAJaWYgKGkgPCBBTURHUFVfTUFYX1NETUFfSU5TVEFOQ0VTKQogCQlyZXR1cm4gJmFkZXYt PnNkbWEuaW5zdGFuY2VbaV07CiAJZWxzZQogCQlyZXR1cm4gTlVMTDsKIH0KIAorc3RhdGljIGlu bGluZSBib29sIGFtZGdwdV9pc19tZWNfcXVldWVfZW5hYmxlZChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKKwkJCQkJCWludCBtZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJaW50IGJp dCA9IDA7CisKKwliaXQgKz0gbWVjICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjCisJ CSogYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisJYml0ICs9IHBpcGUgKiBhZGV2 LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsKKwliaXQgKz0gcXVldWU7CisKKwlyZXR1cm4g dGVzdF9iaXQoYml0LCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCk7Cit9CisKIC8qCiAgKiBB U0lDcyBtYWNyby4KICAqLwogI2RlZmluZSBhbWRncHVfYXNpY19zZXRfdmdhX3N0YXRlKGFkZXYs IHN0YXRlKSAoYWRldiktPmFzaWNfZnVuY3MtPnNldF92Z2Ffc3RhdGUoKGFkZXYpLCAoc3RhdGUp KQogI2RlZmluZSBhbWRncHVfYXNpY19yZXNldChhZGV2KSAoYWRldiktPmFzaWNfZnVuY3MtPnJl c2V0KChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfZ2V0X3hjbGsoYWRldikgKGFkZXYpLT5h c2ljX2Z1bmNzLT5nZXRfeGNsaygoYWRldikpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX3NldF91dmRf Y2xvY2tzKGFkZXYsIHYsIGQpIChhZGV2KS0+YXNpY19mdW5jcy0+c2V0X3V2ZF9jbG9ja3MoKGFk ZXYpLCAodiksIChkKSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfc2V0X3ZjZV9jbG9ja3MoYWRldiwg ZXYsIGVjKSAoYWRldiktPmFzaWNfZnVuY3MtPnNldF92Y2VfY2xvY2tzKChhZGV2KSwgKGV2KSwg KGVjKSkKICNkZWZpbmUgYW1kZ3B1X2dldF9wY2llX2xhbmVzKGFkZXYpIChhZGV2KS0+YXNpY19m dW5jcy0+Z2V0X3BjaWVfbGFuZXMoKGFkZXYpKQogI2RlZmluZSBhbWRncHVfc2V0X3BjaWVfbGFu ZXMoYWRldiwgbCkgKGFkZXYpLT5hc2ljX2Z1bmNzLT5zZXRfcGNpZV9sYW5lcygoYWRldiksIChs KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfZ2V0X2dwdV9jbG9ja19jb3VudGVyKGFkZXYpIChhZGV2 KS0+YXNpY19mdW5jcy0+Z2V0X2dwdV9jbG9ja19jb3VudGVyKChhZGV2KSkKICNkZWZpbmUgYW1k Z3B1X2FzaWNfcmVhZF9kaXNhYmxlZF9iaW9zKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+cmVh ZF9kaXNhYmxlZF9iaW9zKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfcmVhZF9iaW9zX2Zy b21fcm9tKGFkZXYsIGIsIGwpIChhZGV2KS0+YXNpY19mdW5jcy0+cmVhZF9iaW9zX2Zyb21fcm9t KChhZGV2KSwgKGIpLCAobCkpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX3JlYWRfcmVnaXN0ZXIoYWRl diwgc2UsIHNoLCBvZmZzZXQsIHYpKChhZGV2KS0+YXNpY19mdW5jcy0+cmVhZF9yZWdpc3Rlcigo YWRldiksIChzZSksIChzaCksIChvZmZzZXQpLCAodikpKQogI2RlZmluZSBhbWRncHVfYXNpY19n ZXRfY29uZmlnX21lbXNpemUoYWRldikgKGFkZXYpLT5hc2ljX2Z1bmNzLT5nZXRfY29uZmlnX21l bXNpemUoKGFkZXYpKQogI2RlZmluZSBhbWRncHVfZ2FydF9mbHVzaF9ncHVfdGxiKGFkZXYsIHZt aWQpIChhZGV2KS0+Z2FydC5nYXJ0X2Z1bmNzLT5mbHVzaF9ncHVfdGxiKChhZGV2KSwgKHZtaWQp KQogI2RlZmluZSBhbWRncHVfZ2FydF9zZXRfcHRlX3BkZShhZGV2LCBwdCwgaWR4LCBhZGRyLCBm bGFncykgKGFkZXYpLT5nYXJ0LmdhcnRfZnVuY3MtPnNldF9wdGVfcGRlKChhZGV2KSwgKHB0KSwg KGlkeCksIChhZGRyKSwgKGZsYWdzKSkKICNkZWZpbmUgYW1kZ3B1X3ZtX2NvcHlfcHRlKGFkZXYs IGliLCBwZSwgc3JjLCBjb3VudCkgKChhZGV2KS0+dm1fbWFuYWdlci52bV9wdGVfZnVuY3MtPmNv cHlfcHRlKChpYiksIChwZSksIChzcmMpLCAoY291bnQpKSkKICNkZWZpbmUgYW1kZ3B1X3ZtX3dy aXRlX3B0ZShhZGV2LCBpYiwgcGUsIHZhbHVlLCBjb3VudCwgaW5jcikgKChhZGV2KS0+dm1fbWFu YWdlci52bV9wdGVfZnVuY3MtPndyaXRlX3B0ZSgoaWIpLCAocGUpLCAodmFsdWUpLCAoY291bnQp LCAoaW5jcikpKQogI2RlZmluZSBhbWRncHVfdm1fc2V0X3B0ZV9wZGUoYWRldiwgaWIsIHBlLCBh ZGRyLCBjb3VudCwgaW5jciwgZmxhZ3MpICgoYWRldiktPnZtX21hbmFnZXIudm1fcHRlX2Z1bmNz LT5zZXRfcHRlX3BkZSgoaWIpLCAocGUpLCAoYWRkciksIChjb3VudCksIChpbmNyKSwgKGZsYWdz KSkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYwppbmRleCA4OTY5YzY5Li42ODRm MDUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMKQEAgLTQ3MzMsNDUgKzQ3 MzMsNzYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y3XzBfZ3B1X2Vhcmx5X2luaXQoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAJYWRldi0+Z2Z4LmNvbmZpZy5udW1fZ3B1cyA9IDE7CiAJYWRldi0+ Z2Z4LmNvbmZpZy5tdWx0aV9ncHVfdGlsZV9zaXplID0gNjQ7CiAKIAkvKiBmaXggdXAgcm93IHNp emUgKi8KIAlnYl9hZGRyX2NvbmZpZyAmPSB+R0JfQUREUl9DT05GSUdfX1JPV19TSVpFX01BU0s7 CiAJc3dpdGNoIChhZGV2LT5nZnguY29uZmlnLm1lbV9yb3dfc2l6ZV9pbl9rYikgewogCWNhc2Ug MToKIAlkZWZhdWx0OgogCQlnYl9hZGRyX2NvbmZpZyB8PSAoMCA8PCBHQl9BRERSX0NPTkZJR19f Uk9XX1NJWkVfX1NISUZUKTsKIAkJYnJlYWs7CiAJY2FzZSAyOgogCQlnYl9hZGRyX2NvbmZpZyB8 PSAoMSA8PCBHQl9BRERSX0NPTkZJR19fUk9XX1NJWkVfX1NISUZUKTsKIAkJYnJlYWs7CiAJY2Fz ZSA0OgogCQlnYl9hZGRyX2NvbmZpZyB8PSAoMiA8PCBHQl9BRERSX0NPTkZJR19fUk9XX1NJWkVf X1NISUZUKTsKIAkJYnJlYWs7CiAJfQogCWFkZXYtPmdmeC5jb25maWcuZ2JfYWRkcl9jb25maWcg PSBnYl9hZGRyX2NvbmZpZzsKIH0KIAorc3RhdGljIGludCBnZnhfdjdfMF9jb21wdXRlX3Jpbmdf aW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IHJpbmdfaWQsCisJCQkJCWludCBt ZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJaW50IHI7CisJdW5zaWduZWQgaXJxX3R5cGU7 CisJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3Jpbmdbcmlu Z19pZF07CisKKwkvKiBtZWMwIGlzIG1lMSAqLworCXJpbmctPm1lID0gbWVjICsgMTsKKwlyaW5n LT5waXBlID0gcGlwZTsKKwlyaW5nLT5xdWV1ZSA9IHF1ZXVlOworCisJcmluZy0+cmluZ19vYmog PSBOVUxMOworCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7CisJcmluZy0+ZG9vcmJlbGxfaW5k ZXggPSBBTURHUFVfRE9PUkJFTExfTUVDX1JJTkcwICsgcmluZ19pZDsKKwlzcHJpbnRmKHJpbmct Pm5hbWUsICJjb21wXyVkLiVkLiVkIiwgcmluZy0+bWUsIHJpbmctPnBpcGUsIHJpbmctPnF1ZXVl KTsKKworCWlycV90eXBlID0gQU1ER1BVX0NQX0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QCisJ CSsgKChyaW5nLT5tZSAtIDEpICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjKQorCQkr IHJpbmctPnBpcGU7CisKKwkvKiB0eXBlLTIgcGFja2V0cyBhcmUgZGVwcmVjYXRlZCBvbiBNRUMs IHVzZSB0eXBlLTMgaW5zdGVhZCAqLworCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcs IDEwMjQsCisJCQkmYWRldi0+Z2Z4LmVvcF9pcnEsIGlycV90eXBlKTsKKwlpZiAocikKKwkJcmV0 dXJuIHI7CisKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IGdmeF92N18wX3N3X2luaXQo dm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAlzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKLQlpbnQg aSwgciwgcmluZ19pZDsKKwlpbnQgaSwgaiwgaywgciwgcmluZ19pZDsKIAogCS8qIEVPUCBFdmVu dCAqLwogCXIgPSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBBTURHUFVfSUhfQ0xJRU5USURfTEVH QUNZLCAxODEsICZhZGV2LT5nZnguZW9wX2lycSk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJ LyogUHJpdmlsZWdlZCByZWcgKi8KIAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgQU1ER1BV X0lIX0NMSUVOVElEX0xFR0FDWSwgMTg0LAogCQkJICAgICAgJmFkZXYtPmdmeC5wcml2X3JlZ19p cnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCS8qIFByaXZpbGVnZWQgaW5zdCAqLwogCXIg PSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBBTURHUFVfSUhfQ0xJRU5USURfTEVHQUNZLCAxODUs CiAJCQkgICAgICAmYWRldi0+Z2Z4LnByaXZfaW5zdF9pcnEpOwogCWlmIChyKQogCQlyZXR1cm4g cjsKIAogCWdmeF92N18wX3NjcmF0Y2hfaW5pdChhZGV2KTsKIApAQCAtNDc4Nyw3MyArNDgxOCw1 NyBAQCBzdGF0aWMgaW50IGdmeF92N18wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlyZXR1cm4g cjsKIAl9CiAKIAkvKiBhbGxvY2F0ZSBtZWMgYnVmZmVycyAqLwogCXIgPSBnZnhfdjdfMF9tZWNf aW5pdChhZGV2KTsKIAlpZiAocikgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBpbml0IE1FQyBC T3MhXG4iKTsKIAkJcmV0dXJuIHI7CiAJfQogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPmdmeC5u dW1fZ2Z4X3JpbmdzOyBpKyspIHsKIAkJcmluZyA9ICZhZGV2LT5nZnguZ2Z4X3JpbmdbaV07CiAJ CXJpbmctPnJpbmdfb2JqID0gTlVMTDsKIAkJc3ByaW50ZihyaW5nLT5uYW1lLCAiZ2Z4Iik7CiAJ CXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDEwMjQsCiAJCQkJICAgICAmYWRldi0+ Z2Z4LmVvcF9pcnEsIEFNREdQVV9DUF9JUlFfR0ZYX0VPUCk7CiAJCWlmIChyKQogCQkJcmV0dXJu IHI7CiAJfQogCi0JLyogc2V0IHVwIHRoZSBjb21wdXRlIHF1ZXVlcyAqLwotCWZvciAoaSA9IDAs IHJpbmdfaWQgPSAwOyBpIDwgQU1ER1BVX01BWF9DT01QVVRFX1FVRVVFUzsgaSsrKSB7Ci0JCXVu c2lnbmVkIGlycV90eXBlOwotCi0JCWlmICghdGVzdF9iaXQoaSwgYWRldi0+Z2Z4Lm1lYy5xdWV1 ZV9iaXRtYXApKQotCQkJY29udGludWU7Ci0KLQkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9y aW5nW3JpbmdfaWRdOwotCi0JCS8qIG1lYzAgaXMgbWUxICovCi0JCXJpbmctPm1lID0gKChpIC8g YWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCi0JCQkJLyBhZGV2LT5nZngubWVjLm51 bV9waXBlX3Blcl9tZWMpCi0JCQkJKyAxOwotCQlyaW5nLT5waXBlID0gKGkgLyBhZGV2LT5nZngu bWVjLm51bV9xdWV1ZV9wZXJfcGlwZSkKLQkJCQklIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVy X21lYzsKLQkJcmluZy0+cXVldWUgPSBpICUgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3Bp cGU7Ci0KLQkJcmluZy0+cmluZ19vYmogPSBOVUxMOwotCQlyaW5nLT51c2VfZG9vcmJlbGwgPSB0 cnVlOwotCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9NRUNfUklORzAg KyByaW5nX2lkOwotCQlzcHJpbnRmKHJpbmctPm5hbWUsICJjb21wXyVkLiVkLiVkIiwgcmluZy0+ bWUsIHJpbmctPnBpcGUsIHJpbmctPnF1ZXVlKTsKLQotCQlpcnFfdHlwZSA9IEFNREdQVV9DUF9J UlFfQ09NUFVURV9NRUMxX1BJUEUwX0VPUAotCQkJKyAoKHJpbmctPm1lIC0gMSkgKiBhZGV2LT5n ZngubWVjLm51bV9waXBlX3Blcl9tZWMpCi0JCQkrIHJpbmctPnBpcGU7Ci0KLQkJLyogdHlwZS0y IHBhY2tldHMgYXJlIGRlcHJlY2F0ZWQgb24gTUVDLCB1c2UgdHlwZS0zIGluc3RlYWQgKi8KLQkJ ciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKLQkJCQkgICAgICZhZGV2LT5n ZnguZW9wX2lycSwgaXJxX3R5cGUpOwotCQlpZiAocikKLQkJCXJldHVybiByOwotCi0JCXJpbmdf aWQrKzsKKwkvKiBzZXQgdXAgdGhlIGNvbXB1dGUgcXVldWVzIC0gYWxsb2NhdGUgaG9yaXpvbnRh bGx5IGFjcm9zcyBwaXBlcyAqLworCXJpbmdfaWQgPSAwOworCWZvciAoaSA9IDA7IGkgPCBhZGV2 LT5nZngubWVjLm51bV9tZWM7ICsraSkgeworCQlmb3IgKGogPSAwOyBqIDwgYWRldi0+Z2Z4Lm1l Yy5udW1fcXVldWVfcGVyX3BpcGU7IGorKykgeworCQkJZm9yIChrID0gMDsgayA8IGFkZXYtPmdm eC5tZWMubnVtX3BpcGVfcGVyX21lYzsgaysrKSB7CisJCQkJaWYgKCFhbWRncHVfaXNfbWVjX3F1 ZXVlX2VuYWJsZWQoYWRldiwgaSwgaywgaikpCisJCQkJCWNvbnRpbnVlOworCisJCQkJciA9IGdm eF92N18wX2NvbXB1dGVfcmluZ19pbml0KGFkZXYsCisJCQkJCQkJCXJpbmdfaWQsCisJCQkJCQkJ CWksIGssIGopOworCQkJCWlmIChyKQorCQkJCQlyZXR1cm4gcjsKKworCQkJCXJpbmdfaWQrKzsK KwkJCX0KKwkJfQogCX0KIAogCS8qIHJlc2VydmUgR0RTLCBHV1MgYW5kIE9BIHJlc291cmNlIGZv ciBnZnggKi8KIAlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgYWRldi0+Z2RzLm1l bS5nZnhfcGFydGl0aW9uX3NpemUsCiAJCQkJICAgIFBBR0VfU0laRSwgQU1ER1BVX0dFTV9ET01B SU5fR0RTLAogCQkJCSAgICAmYWRldi0+Z2RzLmdkc19nZnhfYm8sIE5VTEwsIE5VTEwpOwogCWlm IChyKQogCQlyZXR1cm4gcjsKIAogCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBh ZGV2LT5nZHMuZ3dzLmdmeF9wYXJ0aXRpb25fc2l6ZSwKIAkJCQkgICAgUEFHRV9TSVpFLCBBTURH UFVfR0VNX0RPTUFJTl9HV1MsCiAJCQkJICAgICZhZGV2LT5nZHMuZ3dzX2dmeF9ibywgTlVMTCwg TlVMTCk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJciA9IGFtZGdwdV9ib19jcmVhdGVfa2Vy bmVsKGFkZXYsIGFkZXYtPmdkcy5vYS5nZnhfcGFydGl0aW9uX3NpemUsCiAJCQkJICAgIFBBR0Vf U0laRSwgQU1ER1BVX0dFTV9ET01BSU5fT0EsCiAJCQkJICAgICZhZGV2LT5nZHMub2FfZ2Z4X2Jv LCBOVUxMLCBOVUxMKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ2Z4X3Y4XzAuYwppbmRleCA4Y2M5ODc0Li45MGUxZGQzIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OF8wLmMKQEAgLTIxMDIsNDMgKzIxMDIsNzggQEAgc3RhdGljIGludCBnZnhf djhfMF9ncHVfZWFybHlfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlhZGV2LT5n ZnguY29uZmlnLm11bHRpX2dwdV90aWxlX3NpemUgPSA2NDsKIAogCS8qIGZpeCB1cCByb3cgc2l6 ZSAqLwogCXN3aXRjaCAoYWRldi0+Z2Z4LmNvbmZpZy5tZW1fcm93X3NpemVfaW5fa2IpIHsKIAlj YXNlIDE6CiAJZGVmYXVsdDoKIAkJZ2JfYWRkcl9jb25maWcgPSBSRUdfU0VUX0ZJRUxEKGdiX2Fk ZHJfY29uZmlnLCBHQl9BRERSX0NPTkZJRywgUk9XX1NJWkUsIDApOwogCQlicmVhazsKIAljYXNl IDI6CiAJCWdiX2FkZHJfY29uZmlnID0gUkVHX1NFVF9GSUVMRChnYl9hZGRyX2NvbmZpZywgR0Jf QUREUl9DT05GSUcsIFJPV19TSVpFLCAxKTsKIAkJYnJlYWs7CiAJY2FzZSA0OgogCQlnYl9hZGRy X2NvbmZpZyA9IFJFR19TRVRfRklFTEQoZ2JfYWRkcl9jb25maWcsIEdCX0FERFJfQ09ORklHLCBS T1dfU0laRSwgMik7CiAJCWJyZWFrOwogCX0KIAlhZGV2LT5nZnguY29uZmlnLmdiX2FkZHJfY29u ZmlnID0gZ2JfYWRkcl9jb25maWc7CiAKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIGludCBnZnhf djhfMF9jb21wdXRlX3JpbmdfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IHJp bmdfaWQsCisJCQkJCWludCBtZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJaW50IHI7CisJ dW5zaWduZWQgaXJxX3R5cGU7CisJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPmdm eC5jb21wdXRlX3JpbmdbcmluZ19pZF07CisKKwlyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3Jp bmdbcmluZ19pZF07CisKKwkvKiBtZWMwIGlzIG1lMSAqLworCXJpbmctPm1lID0gbWVjICsgMTsK KwlyaW5nLT5waXBlID0gcGlwZTsKKwlyaW5nLT5xdWV1ZSA9IHF1ZXVlOworCisJcmluZy0+cmlu Z19vYmogPSBOVUxMOworCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7CisJcmluZy0+ZG9vcmJl bGxfaW5kZXggPSBBTURHUFVfRE9PUkJFTExfTUVDX1JJTkcwICsgcmluZ19pZDsKKwlyaW5nLT5l b3BfZ3B1X2FkZHIgPSBhZGV2LT5nZngubWVjLmhwZF9lb3BfZ3B1X2FkZHIKKwkJCQkrIChyaW5n X2lkICogR0ZYOF9NRUNfSFBEX1NJWkUpOworCXNwcmludGYocmluZy0+bmFtZSwgImNvbXBfJWQu JWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUpOworCisJaXJxX3R5cGUg PSBBTURHUFVfQ1BfSVJRX0NPTVBVVEVfTUVDMV9QSVBFMF9FT1AKKwkJKyAoKHJpbmctPm1lIC0g MSkgKiBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMpCisJCSsgcmluZy0+cGlwZTsKKwor CS8qIHR5cGUtMiBwYWNrZXRzIGFyZSBkZXByZWNhdGVkIG9uIE1FQywgdXNlIHR5cGUtMyBpbnN0 ZWFkICovCisJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKKwkJCSZhZGV2 LT5nZnguZW9wX2lycSwgaXJxX3R5cGUpOworCWlmIChyKQorCQlyZXR1cm4gcjsKKworCisJcmV0 dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiB7 Ci0JaW50IGksIHIsIHJpbmdfaWQ7CisJaW50IGksIGosIGssIHIsIHJpbmdfaWQ7CiAJc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nOwogCXN0cnVjdCBhbWRncHVfa2lxICpraXE7CiAJc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAKIAkv KiBLSVEgZXZlbnQgKi8KIAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgQU1ER1BVX0lIX0NM SUVOVElEX0xFR0FDWSwgMTc4LCAmYWRldi0+Z2Z4LmtpcS5pcnEpOwogCWlmIChyKQogCQlyZXR1 cm4gcjsKIAogCS8qIEVPUCBFdmVudCAqLwogCXIgPSBhbWRncHVfaXJxX2FkZF9pZChhZGV2LCBB TURHUFVfSUhfQ0xJRU5USURfTEVHQUNZLCAxODEsICZhZGV2LT5nZnguZW9wX2lycSk7CiAJaWYg KHIpCiAJCXJldHVybiByOwogCiAJLyogUHJpdmlsZWdlZCByZWcgKi8KIAlyID0gYW1kZ3B1X2ly cV9hZGRfaWQoYWRldiwgQU1ER1BVX0lIX0NMSUVOVElEX0xFR0FDWSwgMTg0LAogCQkJICAgICAg JmFkZXYtPmdmeC5wcml2X3JlZ19pcnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIApAQCAtMjE3 MCw3NyArMjIwNSw1OCBAQCBzdGF0aWMgaW50IGdmeF92OF8wX3N3X2luaXQodm9pZCAqaGFuZGxl KQogCQlyZXR1cm4gcjsKIAl9CiAKIAkvKiBzZXQgdXAgdGhlIGdmeCByaW5nICovCiAJZm9yIChp ID0gMDsgaSA8IGFkZXYtPmdmeC5udW1fZ2Z4X3JpbmdzOyBpKyspIHsKIAkJcmluZyA9ICZhZGV2 LT5nZnguZ2Z4X3JpbmdbaV07CiAJCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKIAkJc3ByaW50Zihy aW5nLT5uYW1lLCAiZ2Z4Iik7CiAJCS8qIG5vIGdmeCBkb29yYmVsbHMgb24gaWNlbGFuZCAqLwog CQlpZiAoYWRldi0+YXNpY190eXBlICE9IENISVBfVE9QQVopIHsKIAkJCXJpbmctPnVzZV9kb29y YmVsbCA9IHRydWU7CiAJCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9H RlhfUklORzA7CiAJCX0KIAogCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0 LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCiAJCQkJICAgICBBTURHUFVfQ1BfSVJRX0dGWF9FT1ApOwog CQlpZiAocikKIAkJCXJldHVybiByOwogCX0KIAotCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBxdWV1 ZXMgKi8KLQlmb3IgKGkgPSAwLCByaW5nX2lkID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVURV9R VUVVRVM7IGkrKykgewotCQl1bnNpZ25lZCBpcnFfdHlwZTsKLQotCQlpZiAoIXRlc3RfYml0KGks IGFkZXYtPmdmeC5tZWMucXVldWVfYml0bWFwKSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChXQVJO X09OKHJpbmdfaWQgPj0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKSkKLQkJCWJyZWFrOwotCi0J CXJpbmcgPSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1tyaW5nX2lkXTsKLQotCQkvKiBtZWMwIGlz IG1lMSAqLwotCQlyaW5nLT5tZSA9ICgoaSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9w aXBlKQotCQkJCS8gYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjKQotCQkJCSsgMTsKLQkJ cmluZy0+cGlwZSA9IChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCi0JCQkJ JSBhZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7Ci0JCXJpbmctPnF1ZXVlID0gaSAlIGFk ZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOwotCi0JCXJpbmctPnJpbmdfb2JqID0gTlVM TDsKLQkJcmluZy0+dXNlX2Rvb3JiZWxsID0gdHJ1ZTsKLQkJcmluZy0+ZW9wX2dwdV9hZGRyID0g YWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX2dwdV9hZGRyICsgKHJpbmdfaWQgKiBHRlg4X01FQ19IUERf U0laRSk7Ci0JCXJpbmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX01FQ19SSU5H MCArIHJpbmdfaWQ7Ci0JCXNwcmludGYocmluZy0+bmFtZSwgImNvbXBfJWQuJWQuJWQiLCByaW5n LT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUpOwogCi0JCWlycV90eXBlID0gQU1ER1BVX0NQ X0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QCi0JCQkrICgocmluZy0+bWUgLSAxKSAqIGFkZXYt PmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYykKLQkJCSsgcmluZy0+cGlwZTsKKwkvKiBzZXQgdXAg dGhlIGNvbXB1dGUgcXVldWVzIC0gYWxsb2NhdGUgaG9yaXpvbnRhbGx5IGFjcm9zcyBwaXBlcyAq LworCXJpbmdfaWQgPSAwOworCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5nZngubWVjLm51bV9tZWM7 ICsraSkgeworCQlmb3IgKGogPSAwOyBqIDwgYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3Bp cGU7IGorKykgeworCQkJZm9yIChrID0gMDsgayA8IGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVy X21lYzsgaysrKSB7CisJCQkJaWYgKCFhbWRncHVfaXNfbWVjX3F1ZXVlX2VuYWJsZWQoYWRldiwg aSwgaywgaikpCisJCQkJCWNvbnRpbnVlOwogCi0JCS8qIHR5cGUtMiBwYWNrZXRzIGFyZSBkZXBy ZWNhdGVkIG9uIE1FQywgdXNlIHR5cGUtMyBpbnN0ZWFkICovCi0JCXIgPSBhbWRncHVfcmluZ19p bml0KGFkZXYsIHJpbmcsIDEwMjQsICZhZGV2LT5nZnguZW9wX2lycSwKLQkJCQkgICAgIGlycV90 eXBlKTsKLQkJaWYgKHIpCi0JCQlyZXR1cm4gcjsKKwkJCQlyID0gZ2Z4X3Y4XzBfY29tcHV0ZV9y aW5nX2luaXQoYWRldiwKKwkJCQkJCQkJcmluZ19pZCwKKwkJCQkJCQkJaSwgaywgaik7CisJCQkJ aWYgKHIpCisJCQkJCXJldHVybiByOwogCi0JCXJpbmdfaWQrKzsKKwkJCQlyaW5nX2lkKys7CisJ CQl9CisJCX0KIAl9CiAKIAlyID0gZ2Z4X3Y4XzBfa2lxX2luaXQoYWRldik7CiAJaWYgKHIpIHsK IAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdCBLSVEgQk9zIVxuIik7CiAJCXJldHVybiByOwog CX0KIAogCWtpcSA9ICZhZGV2LT5nZngua2lxOwogCXIgPSBnZnhfdjhfMF9raXFfaW5pdF9yaW5n KGFkZXYsICZraXEtPnJpbmcsICZraXEtPmlycSk7CiAJaWYgKHIpCiAJCXJldHVybiByOwogCiAJ LyogY3JlYXRlIE1RRCBmb3IgYWxsIGNvbXB1dGUgcXVldWVzIGFzIHdlbGwgYXMgS0lRIGZvciBT UklPViBjYXNlICovCiAJciA9IGdmeF92OF8wX2NvbXB1dGVfbXFkX3N3X2luaXQoYWRldik7CiAJ aWYgKHIpCiAJCXJldHVybiByOwogCiAJLyogcmVzZXJ2ZSBHRFMsIEdXUyBhbmQgT0EgcmVzb3Vy Y2UgZm9yIGdmeCAqLwogCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBhZGV2LT5n ZHMubWVtLmdmeF9wYXJ0aXRpb25fc2l6ZSwKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK