From: Andres Rodriguez Subject: [PATCH 14/17] drm/amdgpu: allocate queues horizontally across pipes Date: Fri, 21 Apr 2017 16:02:39 -0400 Message-ID: <20170421200242.3072-15-andresx7@gmail.com> References: <20170421200242.3072-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170421200242.3072-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 ZXggNTZmYzMyNy4uZjI5MjkwNDFjODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5o CkBAIC0xNzYxLDQwICsxNzYxLDUzIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfcmluZ193 cml0ZV9tdWx0aXBsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHZvaWQgKnNyCiAJCXJpbmct PmNvdW50X2R3IC09IGNvdW50X2R3OwogCX0KIH0KIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgYW1k Z3B1X3NkbWFfaW5zdGFuY2UgKgogYW1kZ3B1X2dldF9zZG1hX2luc3RhbmNlKHN0cnVjdCBhbWRn cHVfcmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFk ZXY7CiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+c2RtYS5udW1faW5zdGFuY2Vz OyBpKyspCiAJCWlmICgmYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nID09IHJpbmcpCiAJCQli cmVhazsKIAogCWlmIChpIDwgQU1ER1BVX01BWF9TRE1BX0lOU1RBTkNFUykKIAkJcmV0dXJuICZh ZGV2LT5zZG1hLmluc3RhbmNlW2ldOwogCWVsc2UKIAkJcmV0dXJuIE5VTEw7CiB9CiAKK3N0YXRp YyBpbmxpbmUgYm9vbCBhbWRncHVfaXNfbWVjX3F1ZXVlX2VuYWJsZWQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCisJCQkJCQlpbnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQoreworCWlu dCBiaXQgPSAwOworCisJYml0ICs9IG1lYyAqIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21l YworCQkqIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOworCWJpdCArPSBwaXBlICog YWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGU7CisJYml0ICs9IHF1ZXVlOworCisJcmV0 dXJuIHRlc3RfYml0KGJpdCwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApOworfQorCiAvKgog ICogQVNJQ3MgbWFjcm8uCiAgKi8KICNkZWZpbmUgYW1kZ3B1X2FzaWNfc2V0X3ZnYV9zdGF0ZShh ZGV2LCBzdGF0ZSkgKGFkZXYpLT5hc2ljX2Z1bmNzLT5zZXRfdmdhX3N0YXRlKChhZGV2KSwgKHN0 YXRlKSkKICNkZWZpbmUgYW1kZ3B1X2FzaWNfcmVzZXQoYWRldikgKGFkZXYpLT5hc2ljX2Z1bmNz LT5yZXNldCgoYWRldikpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX2dldF94Y2xrKGFkZXYpIChhZGV2 KS0+YXNpY19mdW5jcy0+Z2V0X3hjbGsoKGFkZXYpKQogI2RlZmluZSBhbWRncHVfYXNpY19zZXRf dXZkX2Nsb2NrcyhhZGV2LCB2LCBkKSAoYWRldiktPmFzaWNfZnVuY3MtPnNldF91dmRfY2xvY2tz KChhZGV2KSwgKHYpLCAoZCkpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX3NldF92Y2VfY2xvY2tzKGFk ZXYsIGV2LCBlYykgKGFkZXYpLT5hc2ljX2Z1bmNzLT5zZXRfdmNlX2Nsb2NrcygoYWRldiksIChl diksIChlYykpCiAjZGVmaW5lIGFtZGdwdV9nZXRfcGNpZV9sYW5lcyhhZGV2KSAoYWRldiktPmFz aWNfZnVuY3MtPmdldF9wY2llX2xhbmVzKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X3NldF9wY2ll X2xhbmVzKGFkZXYsIGwpIChhZGV2KS0+YXNpY19mdW5jcy0+c2V0X3BjaWVfbGFuZXMoKGFkZXYp LCAobCkpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX2dldF9ncHVfY2xvY2tfY291bnRlcihhZGV2KSAo YWRldiktPmFzaWNfZnVuY3MtPmdldF9ncHVfY2xvY2tfY291bnRlcigoYWRldikpCiAjZGVmaW5l IGFtZGdwdV9hc2ljX3JlYWRfZGlzYWJsZWRfYmlvcyhhZGV2KSAoYWRldiktPmFzaWNfZnVuY3Mt PnJlYWRfZGlzYWJsZWRfYmlvcygoYWRldikpCiAjZGVmaW5lIGFtZGdwdV9hc2ljX3JlYWRfYmlv c19mcm9tX3JvbShhZGV2LCBiLCBsKSAoYWRldiktPmFzaWNfZnVuY3MtPnJlYWRfYmlvc19mcm9t X3JvbSgoYWRldiksIChiKSwgKGwpKQogI2RlZmluZSBhbWRncHVfYXNpY19yZWFkX3JlZ2lzdGVy KGFkZXYsIHNlLCBzaCwgb2Zmc2V0LCB2KSgoYWRldiktPmFzaWNfZnVuY3MtPnJlYWRfcmVnaXN0 ZXIoKGFkZXYpLCAoc2UpLCAoc2gpLCAob2Zmc2V0KSwgKHYpKSkKICNkZWZpbmUgYW1kZ3B1X2Fz aWNfZ2V0X2NvbmZpZ19tZW1zaXplKGFkZXYpIChhZGV2KS0+YXNpY19mdW5jcy0+Z2V0X2NvbmZp Z19tZW1zaXplKChhZGV2KSkKICNkZWZpbmUgYW1kZ3B1X2dhcnRfZmx1c2hfZ3B1X3RsYihhZGV2 LCB2bWlkKSAoYWRldiktPmdhcnQuZ2FydF9mdW5jcy0+Zmx1c2hfZ3B1X3RsYigoYWRldiksICh2 bWlkKSkKICNkZWZpbmUgYW1kZ3B1X2dhcnRfc2V0X3B0ZV9wZGUoYWRldiwgcHQsIGlkeCwgYWRk ciwgZmxhZ3MpIChhZGV2KS0+Z2FydC5nYXJ0X2Z1bmNzLT5zZXRfcHRlX3BkZSgoYWRldiksIChw dCksIChpZHgpLCAoYWRkciksIChmbGFncykpCiAjZGVmaW5lIGFtZGdwdV92bV9jb3B5X3B0ZShh ZGV2LCBpYiwgcGUsIHNyYywgY291bnQpICgoYWRldiktPnZtX21hbmFnZXIudm1fcHRlX2Z1bmNz LT5jb3B5X3B0ZSgoaWIpLCAocGUpLCAoc3JjKSwgKGNvdW50KSkpCiAjZGVmaW5lIGFtZGdwdV92 bV93cml0ZV9wdGUoYWRldiwgaWIsIHBlLCB2YWx1ZSwgY291bnQsIGluY3IpICgoYWRldiktPnZt X21hbmFnZXIudm1fcHRlX2Z1bmNzLT53cml0ZV9wdGUoKGliKSwgKHBlKSwgKHZhbHVlKSwgKGNv dW50KSwgKGluY3IpKSkKICNkZWZpbmUgYW1kZ3B1X3ZtX3NldF9wdGVfcGRlKGFkZXYsIGliLCBw ZSwgYWRkciwgY291bnQsIGluY3IsIGZsYWdzKSAoKGFkZXYpLT52bV9tYW5hZ2VyLnZtX3B0ZV9m dW5jcy0+c2V0X3B0ZV9wZGUoKGliKSwgKHBlKSwgKGFkZHIpLCAoY291bnQpLCAoaW5jciksIChm bGFncykpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMKaW5kZXggY2U5ZDQzMS4u MDYzMzhlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCkBAIC00NzM1LDQ1 ICs0NzM1LDc2IEBAIHN0YXRpYyB2b2lkIGdmeF92N18wX2dwdV9lYXJseV9pbml0KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KQogCWFkZXYtPmdmeC5jb25maWcubnVtX2dwdXMgPSAxOwogCWFk ZXYtPmdmeC5jb25maWcubXVsdGlfZ3B1X3RpbGVfc2l6ZSA9IDY0OwogCiAJLyogZml4IHVwIHJv dyBzaXplICovCiAJZ2JfYWRkcl9jb25maWcgJj0gfkdCX0FERFJfQ09ORklHX19ST1dfU0laRV9N QVNLOwogCXN3aXRjaCAoYWRldi0+Z2Z4LmNvbmZpZy5tZW1fcm93X3NpemVfaW5fa2IpIHsKIAlj YXNlIDE6CiAJZGVmYXVsdDoKIAkJZ2JfYWRkcl9jb25maWcgfD0gKDAgPDwgR0JfQUREUl9DT05G SUdfX1JPV19TSVpFX19TSElGVCk7CiAJCWJyZWFrOwogCWNhc2UgMjoKIAkJZ2JfYWRkcl9jb25m aWcgfD0gKDEgPDwgR0JfQUREUl9DT05GSUdfX1JPV19TSVpFX19TSElGVCk7CiAJCWJyZWFrOwog CWNhc2UgNDoKIAkJZ2JfYWRkcl9jb25maWcgfD0gKDIgPDwgR0JfQUREUl9DT05GSUdfX1JPV19T SVpFX19TSElGVCk7CiAJCWJyZWFrOwogCX0KIAlhZGV2LT5nZnguY29uZmlnLmdiX2FkZHJfY29u ZmlnID0gZ2JfYWRkcl9jb25maWc7CiB9CiAKK3N0YXRpYyBpbnQgZ2Z4X3Y3XzBfY29tcHV0ZV9y aW5nX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCByaW5nX2lkLAorCQkJCQlp bnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQoreworCWludCByOworCXVuc2lnbmVkIGlycV90 eXBlOworCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5n W3JpbmdfaWRdOworCisJLyogbWVjMCBpcyBtZTEgKi8KKwlyaW5nLT5tZSA9IG1lYyArIDE7CisJ cmluZy0+cGlwZSA9IHBpcGU7CisJcmluZy0+cXVldWUgPSBxdWV1ZTsKKworCXJpbmctPnJpbmdf b2JqID0gTlVMTDsKKwlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOworCXJpbmctPmRvb3JiZWxs X2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX01FQ19SSU5HMCArIHJpbmdfaWQ7CisJc3ByaW50Zihy aW5nLT5uYW1lLCAiY29tcF8lZC4lZC4lZCIsIHJpbmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5x dWV1ZSk7CisKKwlpcnFfdHlwZSA9IEFNREdQVV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJUEUwX0VP UAorCQkrICgocmluZy0+bWUgLSAxKSAqIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYykK KwkJKyByaW5nLT5waXBlOworCisJLyogdHlwZS0yIHBhY2tldHMgYXJlIGRlcHJlY2F0ZWQgb24g TUVDLCB1c2UgdHlwZS0zIGluc3RlYWQgKi8KKwlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCBy aW5nLCAxMDI0LAorCQkJJmFkZXYtPmdmeC5lb3BfaXJxLCBpcnFfdHlwZSk7CisJaWYgKHIpCisJ CXJldHVybiByOworCisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGludCBnZnhfdjdfMF9zd19p bml0KHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7CiAJc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7Ci0J aW50IGksIHIsIHJpbmdfaWQ7CisJaW50IGksIGosIGssIHIsIHJpbmdfaWQ7CiAKIAkvKiBFT1Ag RXZlbnQgKi8KIAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgQU1ER1BVX0lIX0NMSUVOVElE X0xFR0FDWSwgMTgxLCAmYWRldi0+Z2Z4LmVvcF9pcnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsK IAogCS8qIFByaXZpbGVnZWQgcmVnICovCiAJciA9IGFtZGdwdV9pcnFfYWRkX2lkKGFkZXYsIEFN REdQVV9JSF9DTElFTlRJRF9MRUdBQ1ksIDE4NCwKIAkJCSAgICAgICZhZGV2LT5nZngucHJpdl9y ZWdfaXJxKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKIAkvKiBQcml2aWxlZ2VkIGluc3QgKi8K IAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRldiwgQU1ER1BVX0lIX0NMSUVOVElEX0xFR0FDWSwg MTg1LAogCQkJICAgICAgJmFkZXYtPmdmeC5wcml2X2luc3RfaXJxKTsKIAlpZiAocikKIAkJcmV0 dXJuIHI7CiAKIAlnZnhfdjdfMF9zY3JhdGNoX2luaXQoYWRldik7CiAKQEAgLTQ3ODksNzMgKzQ4 MjAsNTcgQEAgc3RhdGljIGludCBnZnhfdjdfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJcmV0 dXJuIHI7CiAJfQogCiAJLyogYWxsb2NhdGUgbWVjIGJ1ZmZlcnMgKi8KIAlyID0gZ2Z4X3Y3XzBf bWVjX2luaXQoYWRldik7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdCBN RUMgQk9zIVxuIik7CiAJCXJldHVybiByOwogCX0KIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5n ZngubnVtX2dmeF9yaW5nczsgaSsrKSB7CiAJCXJpbmcgPSAmYWRldi0+Z2Z4LmdmeF9yaW5nW2ld OwogCQlyaW5nLT5yaW5nX29iaiA9IE5VTEw7CiAJCXNwcmludGYocmluZy0+bmFtZSwgImdmeCIp OwogCQlyID0gYW1kZ3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LAogCQkJCSAgICAgJmFk ZXYtPmdmeC5lb3BfaXJxLCBBTURHUFVfQ1BfSVJRX0dGWF9FT1ApOwogCQlpZiAocikKIAkJCXJl dHVybiByOwogCX0KIAotCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBxdWV1ZXMgKi8KLQlmb3IgKGkg PSAwLCByaW5nX2lkID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVURV9RVUVVRVM7IGkrKykgewot CQl1bnNpZ25lZCBpcnFfdHlwZTsKLQotCQlpZiAoIXRlc3RfYml0KGksIGFkZXYtPmdmeC5tZWMu cXVldWVfYml0bWFwKSkKLQkJCWNvbnRpbnVlOwotCi0JCXJpbmcgPSAmYWRldi0+Z2Z4LmNvbXB1 dGVfcmluZ1tyaW5nX2lkXTsKLQotCQkvKiBtZWMwIGlzIG1lMSAqLwotCQlyaW5nLT5tZSA9ICgo aSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQotCQkJCS8gYWRldi0+Z2Z4Lm1l Yy5udW1fcGlwZV9wZXJfbWVjKQotCQkJCSsgMTsKLQkJcmluZy0+cGlwZSA9IChpIC8gYWRldi0+ Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCi0JCQkJJSBhZGV2LT5nZngubWVjLm51bV9waXBl X3Blcl9tZWM7Ci0JCXJpbmctPnF1ZXVlID0gaSAlIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Bl cl9waXBlOwotCi0JCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKLQkJcmluZy0+dXNlX2Rvb3JiZWxs ID0gdHJ1ZTsKLQkJcmluZy0+ZG9vcmJlbGxfaW5kZXggPSBBTURHUFVfRE9PUkJFTExfTUVDX1JJ TkcwICsgcmluZ19pZDsKLQkJc3ByaW50ZihyaW5nLT5uYW1lLCAiY29tcF8lZC4lZC4lZCIsIHJp bmctPm1lLCByaW5nLT5waXBlLCByaW5nLT5xdWV1ZSk7Ci0KLQkJaXJxX3R5cGUgPSBBTURHUFVf Q1BfSVJRX0NPTVBVVEVfTUVDMV9QSVBFMF9FT1AKLQkJCSsgKChyaW5nLT5tZSAtIDEpICogYWRl di0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjKQotCQkJKyByaW5nLT5waXBlOwotCi0JCS8qIHR5 cGUtMiBwYWNrZXRzIGFyZSBkZXByZWNhdGVkIG9uIE1FQywgdXNlIHR5cGUtMyBpbnN0ZWFkICov Ci0JCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDEwMjQsCi0JCQkJICAgICAmYWRl di0+Z2Z4LmVvcF9pcnEsIGlycV90eXBlKTsKLQkJaWYgKHIpCi0JCQlyZXR1cm4gcjsKLQotCQly aW5nX2lkKys7CisJLyogc2V0IHVwIHRoZSBjb21wdXRlIHF1ZXVlcyAtIGFsbG9jYXRlIGhvcml6 b250YWxseSBhY3Jvc3MgcGlwZXMgKi8KKwlyaW5nX2lkID0gMDsKKwlmb3IgKGkgPSAwOyBpIDwg YWRldi0+Z2Z4Lm1lYy5udW1fbWVjOyArK2kpIHsKKwkJZm9yIChqID0gMDsgaiA8IGFkZXYtPmdm eC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlOyBqKyspIHsKKwkJCWZvciAoayA9IDA7IGsgPCBhZGV2 LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWM7IGsrKykgeworCQkJCWlmICghYW1kZ3B1X2lzX21l Y19xdWV1ZV9lbmFibGVkKGFkZXYsIGksIGssIGopKQorCQkJCQljb250aW51ZTsKKworCQkJCXIg PSBnZnhfdjdfMF9jb21wdXRlX3JpbmdfaW5pdChhZGV2LAorCQkJCQkJCQlyaW5nX2lkLAorCQkJ CQkJCQlpLCBrLCBqKTsKKwkJCQlpZiAocikKKwkJCQkJcmV0dXJuIHI7CisKKwkJCQlyaW5nX2lk Kys7CisJCQl9CisJCX0KIAl9CiAKIAkvKiByZXNlcnZlIEdEUywgR1dTIGFuZCBPQSByZXNvdXJj ZSBmb3IgZ2Z4ICovCiAJciA9IGFtZGdwdV9ib19jcmVhdGVfa2VybmVsKGFkZXYsIGFkZXYtPmdk cy5tZW0uZ2Z4X3BhcnRpdGlvbl9zaXplLAogCQkJCSAgICBQQUdFX1NJWkUsIEFNREdQVV9HRU1f RE9NQUlOX0dEUywKIAkJCQkgICAgJmFkZXYtPmdkcy5nZHNfZ2Z4X2JvLCBOVUxMLCBOVUxMKTsK IAlpZiAocikKIAkJcmV0dXJuIHI7CiAKIAlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRl diwgYWRldi0+Z2RzLmd3cy5nZnhfcGFydGl0aW9uX3NpemUsCiAJCQkJICAgIFBBR0VfU0laRSwg QU1ER1BVX0dFTV9ET01BSU5fR1dTLAogCQkJCSAgICAmYWRldi0+Z2RzLmd3c19nZnhfYm8sIE5V TEwsIE5VTEwpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCXIgPSBhbWRncHVfYm9fY3JlYXRl X2tlcm5lbChhZGV2LCBhZGV2LT5nZHMub2EuZ2Z4X3BhcnRpdGlvbl9zaXplLAogCQkJCSAgICBQ QUdFX1NJWkUsIEFNREdQVV9HRU1fRE9NQUlOX09BLAogCQkJCSAgICAmYWRldi0+Z2RzLm9hX2dm eF9ibywgTlVMTCwgTlVMTCk7CiAJaWYgKHIpCiAJCXJldHVybiByOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dmeF92OF8wLmMKaW5kZXggNmE4ZTkyMy4uOTlhMWEwZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjhfMC5jCkBAIC0yMTAzLDQzICsyMTAzLDc4IEBAIHN0YXRpYyBpbnQg Z2Z4X3Y4XzBfZ3B1X2Vhcmx5X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJYWRl di0+Z2Z4LmNvbmZpZy5tdWx0aV9ncHVfdGlsZV9zaXplID0gNjQ7CiAKIAkvKiBmaXggdXAgcm93 IHNpemUgKi8KIAlzd2l0Y2ggKGFkZXYtPmdmeC5jb25maWcubWVtX3Jvd19zaXplX2luX2tiKSB7 CiAJY2FzZSAxOgogCWRlZmF1bHQ6CiAJCWdiX2FkZHJfY29uZmlnID0gUkVHX1NFVF9GSUVMRChn Yl9hZGRyX2NvbmZpZywgR0JfQUREUl9DT05GSUcsIFJPV19TSVpFLCAwKTsKIAkJYnJlYWs7CiAJ Y2FzZSAyOgogCQlnYl9hZGRyX2NvbmZpZyA9IFJFR19TRVRfRklFTEQoZ2JfYWRkcl9jb25maWcs IEdCX0FERFJfQ09ORklHLCBST1dfU0laRSwgMSk7CiAJCWJyZWFrOwogCWNhc2UgNDoKIAkJZ2Jf YWRkcl9jb25maWcgPSBSRUdfU0VUX0ZJRUxEKGdiX2FkZHJfY29uZmlnLCBHQl9BRERSX0NPTkZJ RywgUk9XX1NJWkUsIDIpOwogCQlicmVhazsKIAl9CiAJYWRldi0+Z2Z4LmNvbmZpZy5nYl9hZGRy X2NvbmZpZyA9IGdiX2FkZHJfY29uZmlnOwogCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQg Z2Z4X3Y4XzBfY29tcHV0ZV9yaW5nX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGlu dCByaW5nX2lkLAorCQkJCQlpbnQgbWVjLCBpbnQgcGlwZSwgaW50IHF1ZXVlKQoreworCWludCBy OworCXVuc2lnbmVkIGlycV90eXBlOworCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9ICZhZGV2 LT5nZnguY29tcHV0ZV9yaW5nW3JpbmdfaWRdOworCisJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0 ZV9yaW5nW3JpbmdfaWRdOworCisJLyogbWVjMCBpcyBtZTEgKi8KKwlyaW5nLT5tZSA9IG1lYyAr IDE7CisJcmluZy0+cGlwZSA9IHBpcGU7CisJcmluZy0+cXVldWUgPSBxdWV1ZTsKKworCXJpbmct PnJpbmdfb2JqID0gTlVMTDsKKwlyaW5nLT51c2VfZG9vcmJlbGwgPSB0cnVlOworCXJpbmctPmRv b3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX01FQ19SSU5HMCArIHJpbmdfaWQ7CisJcmlu Zy0+ZW9wX2dwdV9hZGRyID0gYWRldi0+Z2Z4Lm1lYy5ocGRfZW9wX2dwdV9hZGRyCisJCQkJKyAo cmluZ19pZCAqIEdGWDhfTUVDX0hQRF9TSVpFKTsKKwlzcHJpbnRmKHJpbmctPm5hbWUsICJjb21w XyVkLiVkLiVkIiwgcmluZy0+bWUsIHJpbmctPnBpcGUsIHJpbmctPnF1ZXVlKTsKKworCWlycV90 eXBlID0gQU1ER1BVX0NQX0lSUV9DT01QVVRFX01FQzFfUElQRTBfRU9QCisJCSsgKChyaW5nLT5t ZSAtIDEpICogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjKQorCQkrIHJpbmctPnBpcGU7 CisKKwkvKiB0eXBlLTIgcGFja2V0cyBhcmUgZGVwcmVjYXRlZCBvbiBNRUMsIHVzZSB0eXBlLTMg aW5zdGVhZCAqLworCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDEwMjQsCisJCQkm YWRldi0+Z2Z4LmVvcF9pcnEsIGlycV90eXBlKTsKKwlpZiAocikKKwkJcmV0dXJuIHI7CisKKwor CXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IGdmeF92OF8wX3N3X2luaXQodm9pZCAqaGFuZGxl KQogewotCWludCBpLCByLCByaW5nX2lkOworCWludCBpLCBqLCBrLCByLCByaW5nX2lkOwogCXN0 cnVjdCBhbWRncHVfcmluZyAqcmluZzsKIAlzdHJ1Y3QgYW1kZ3B1X2tpcSAqa2lxOwogCXN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwog CiAJLyogS0lRIGV2ZW50ICovCiAJciA9IGFtZGdwdV9pcnFfYWRkX2lkKGFkZXYsIEFNREdQVV9J SF9DTElFTlRJRF9MRUdBQ1ksIDE3OCwgJmFkZXYtPmdmeC5raXEuaXJxKTsKIAlpZiAocikKIAkJ cmV0dXJuIHI7CiAKIAkvKiBFT1AgRXZlbnQgKi8KIAlyID0gYW1kZ3B1X2lycV9hZGRfaWQoYWRl diwgQU1ER1BVX0lIX0NMSUVOVElEX0xFR0FDWSwgMTgxLCAmYWRldi0+Z2Z4LmVvcF9pcnEpOwog CWlmIChyKQogCQlyZXR1cm4gcjsKIAogCS8qIFByaXZpbGVnZWQgcmVnICovCiAJciA9IGFtZGdw dV9pcnFfYWRkX2lkKGFkZXYsIEFNREdQVV9JSF9DTElFTlRJRF9MRUdBQ1ksIDE4NCwKIAkJCSAg ICAgICZhZGV2LT5nZngucHJpdl9yZWdfaXJxKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKQEAg LTIxNzEsNzcgKzIyMDYsNTggQEAgc3RhdGljIGludCBnZnhfdjhfMF9zd19pbml0KHZvaWQgKmhh bmRsZSkKIAkJcmV0dXJuIHI7CiAJfQogCiAJLyogc2V0IHVwIHRoZSBnZnggcmluZyAqLwogCWZv ciAoaSA9IDA7IGkgPCBhZGV2LT5nZngubnVtX2dmeF9yaW5nczsgaSsrKSB7CiAJCXJpbmcgPSAm YWRldi0+Z2Z4LmdmeF9yaW5nW2ldOwogCQlyaW5nLT5yaW5nX29iaiA9IE5VTEw7CiAJCXNwcmlu dGYocmluZy0+bmFtZSwgImdmeCIpOwogCQkvKiBubyBnZnggZG9vcmJlbGxzIG9uIGljZWxhbmQg Ki8KIAkJaWYgKGFkZXYtPmFzaWNfdHlwZSAhPSBDSElQX1RPUEFaKSB7CiAJCQlyaW5nLT51c2Vf ZG9vcmJlbGwgPSB0cnVlOwogCQkJcmluZy0+ZG9vcmJlbGxfaW5kZXggPSBBTURHUFVfRE9PUkJF TExfR0ZYX1JJTkcwOwogCQl9CiAKIAkJciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywg MTAyNCwgJmFkZXYtPmdmeC5lb3BfaXJxLAogCQkJCSAgICAgQU1ER1BVX0NQX0lSUV9HRlhfRU9Q KTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKIAl9CiAKLQkvKiBzZXQgdXAgdGhlIGNvbXB1dGUg cXVldWVzICovCi0JZm9yIChpID0gMCwgcmluZ19pZCA9IDA7IGkgPCBBTURHUFVfTUFYX0NPTVBV VEVfUVVFVUVTOyBpKyspIHsKLQkJdW5zaWduZWQgaXJxX3R5cGU7Ci0KLQkJaWYgKCF0ZXN0X2Jp dChpLCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCi0JCQljb250aW51ZTsKLQotCQlpZiAo V0FSTl9PTihyaW5nX2lkID49IEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUykpCi0JCQlicmVhazsK LQotCQlyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbcmluZ19pZF07Ci0KLQkJLyogbWVj MCBpcyBtZTEgKi8KLQkJcmluZy0+bWUgPSAoKGkgLyBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9w ZXJfcGlwZSkKLQkJCQkvIGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVyX21lYykKLQkJCQkrIDE7 Ci0JCXJpbmctPnBpcGUgPSAoaSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQot CQkJCSUgYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjOwotCQlyaW5nLT5xdWV1ZSA9IGkg JSBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsKLQotCQlyaW5nLT5yaW5nX29iaiA9 IE5VTEw7Ci0JCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7Ci0JCXJpbmctPmVvcF9ncHVfYWRk ciA9IGFkZXYtPmdmeC5tZWMuaHBkX2VvcF9ncHVfYWRkciArIChyaW5nX2lkICogR0ZYOF9NRUNf SFBEX1NJWkUpOwotCQlyaW5nLT5kb29yYmVsbF9pbmRleCA9IEFNREdQVV9ET09SQkVMTF9NRUNf UklORzAgKyByaW5nX2lkOwotCQlzcHJpbnRmKHJpbmctPm5hbWUsICJjb21wXyVkLiVkLiVkIiwg cmluZy0+bWUsIHJpbmctPnBpcGUsIHJpbmctPnF1ZXVlKTsKIAotCQlpcnFfdHlwZSA9IEFNREdQ VV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJUEUwX0VPUAotCQkJKyAoKHJpbmctPm1lIC0gMSkgKiBh ZGV2LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMpCi0JCQkrIHJpbmctPnBpcGU7CisJLyogc2V0 IHVwIHRoZSBjb21wdXRlIHF1ZXVlcyAtIGFsbG9jYXRlIGhvcml6b250YWxseSBhY3Jvc3MgcGlw ZXMgKi8KKwlyaW5nX2lkID0gMDsKKwlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm1lYy5udW1f bWVjOyArK2kpIHsKKwkJZm9yIChqID0gMDsgaiA8IGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Bl cl9waXBlOyBqKyspIHsKKwkJCWZvciAoayA9IDA7IGsgPCBhZGV2LT5nZngubWVjLm51bV9waXBl X3Blcl9tZWM7IGsrKykgeworCQkJCWlmICghYW1kZ3B1X2lzX21lY19xdWV1ZV9lbmFibGVkKGFk ZXYsIGksIGssIGopKQorCQkJCQljb250aW51ZTsKIAotCQkvKiB0eXBlLTIgcGFja2V0cyBhcmUg ZGVwcmVjYXRlZCBvbiBNRUMsIHVzZSB0eXBlLTMgaW5zdGVhZCAqLwotCQlyID0gYW1kZ3B1X3Jp bmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCi0JCQkJICAgICBp cnFfdHlwZSk7Ci0JCWlmIChyKQotCQkJcmV0dXJuIHI7CisJCQkJciA9IGdmeF92OF8wX2NvbXB1 dGVfcmluZ19pbml0KGFkZXYsCisJCQkJCQkJCXJpbmdfaWQsCisJCQkJCQkJCWksIGssIGopOwor CQkJCWlmIChyKQorCQkJCQlyZXR1cm4gcjsKIAotCQlyaW5nX2lkKys7CisJCQkJcmluZ19pZCsr OworCQkJfQorCQl9CiAJfQogCiAJciA9IGdmeF92OF8wX2tpcV9pbml0KGFkZXYpOwogCWlmIChy KSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGluaXQgS0lRIEJPcyFcbiIpOwogCQlyZXR1cm4g cjsKIAl9CiAKIAlraXEgPSAmYWRldi0+Z2Z4LmtpcTsKIAlyID0gZ2Z4X3Y4XzBfa2lxX2luaXRf cmluZyhhZGV2LCAma2lxLT5yaW5nLCAma2lxLT5pcnEpOwogCWlmIChyKQogCQlyZXR1cm4gcjsK IAogCS8qIGNyZWF0ZSBNUUQgZm9yIGFsbCBjb21wdXRlIHF1ZXVlcyBhcyB3ZWxsIGFzIEtJUSBm b3IgU1JJT1YgY2FzZSAqLwogCXIgPSBnZnhfdjhfMF9jb21wdXRlX21xZF9zd19pbml0KGFkZXYp OwogCWlmIChyKQogCQlyZXR1cm4gcjsKIAogCS8qIHJlc2VydmUgR0RTLCBHV1MgYW5kIE9BIHJl c291cmNlIGZvciBnZnggKi8KIAlyID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgYWRl di0+Z2RzLm1lbS5nZnhfcGFydGl0aW9uX3NpemUsCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==