Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A8A46E8D9 for ; Thu, 30 Jul 2020 11:49:50 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Thu, 30 Jul 2020 13:49:13 +0200 Message-Id: <20200730114920.383-11-zbigniew.kempczynski@intel.com> In-Reply-To: <20200730114920.383-1-zbigniew.kempczynski@intel.com> References: <20200730114920.383-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v18 10/17] lib/igt_draw: remove libdrm dependency List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Chris Wilson List-ID: Q2hhbmdlIHJlbmRlcmNvcHkgdG8gdXNlIGludGVsX2JiIHRvIHJlbW92ZSBsaWJkcm0gZGVwZW5k ZW5jeS4KClNpZ25lZC1vZmYtYnk6IERvbWluaWsgR3J6ZWdvcnplayA8ZG9taW5pay5ncnplZ29y emVrQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogWmJpZ25pZXcgS2VtcGN6ecWEc2tpIDx6Ymln bmlldy5rZW1wY3p5bnNraUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KLS0tCiBsaWIvaWd0X2RyYXcuYyB8IDE1NCArKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBsaWIvaWd0X2RyYXcuaCB8ICAgOCAr LS0KIDIgZmlsZXMgY2hhbmdlZCwgNzggaW5zZXJ0aW9ucygrKSwgODQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGliL2lndF9kcmF3LmMgYi9saWIvaWd0X2RyYXcuYwppbmRleCBmMjM0MDEy Ny4uYzJiNmViM2UgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZHJhdy5jCisrKyBiL2xpYi9pZ3RfZHJh dy5jCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiaWd0X2RyYXcuaCIKIAogI2luY2x1ZGUg ImRybXRlc3QuaCIKKyNpbmNsdWRlICJpbnRlbF9idWZvcHMuaCIKICNpbmNsdWRlICJpbnRlbF9i YXRjaGJ1ZmZlci5oIgogI2luY2x1ZGUgImludGVsX2NoaXBzZXQuaCIKICNpbmNsdWRlICJpZ3Rf Y29yZS5oIgpAQCAtNjEsOCArNjIsOCBAQAogLyogU29tZSBpbnRlcm5hbCBkYXRhIHN0cnVjdHVy ZXMgdG8gYXZvaWQgaGF2aW5nIHRvIHBhc3MgdG9ucyBvZiBwYXJhbWV0ZXJzCiAgKiBhcm91bmQg ZXZlcnl0aGluZy4gKi8KIHN0cnVjdCBjbWRfZGF0YSB7Ci0JZHJtX2ludGVsX2J1Zm1nciAqYnVm bWdyOwotCWRybV9pbnRlbF9jb250ZXh0ICpjb250ZXh0OworCXN0cnVjdCBidWZfb3BzICpib3Bz OworCXVpbnQzMl90IGN0eDsKIH07CiAKIHN0cnVjdCBidWZfZGF0YSB7CkBAIC0yNjQsOCArMjY1 LDcgQEAgc3RhdGljIHZvaWQgc2V0X3BpeGVsKHZvaWQgKl9wdHIsIGludCBpbmRleCwgdWludDMy X3QgY29sb3IsIGludCBicHApCiAJfQogfQogCi1zdGF0aWMgdm9pZCBzd2l0Y2hfYmx0X3RpbGlu ZyhzdHJ1Y3QgaW50ZWxfYmF0Y2hidWZmZXIgKmJhdGNoLCB1aW50MzJfdCB0aWxpbmcsCi0JCQkg ICAgICBib29sIG9uKQorc3RhdGljIHZvaWQgc3dpdGNoX2JsdF90aWxpbmcoc3RydWN0IGludGVs X2JiICppYmIsIHVpbnQzMl90IHRpbGluZywgYm9vbCBvbikKIHsKIAl1aW50MzJfdCBiY3Nfc3dj dHJsOwogCkBAIC0yNzMsMjYgKzI3MywyMiBAQCBzdGF0aWMgdm9pZCBzd2l0Y2hfYmx0X3RpbGlu ZyhzdHJ1Y3QgaW50ZWxfYmF0Y2hidWZmZXIgKmJhdGNoLCB1aW50MzJfdCB0aWxpbmcsCiAJaWYg KHRpbGluZyAhPSBJOTE1X1RJTElOR19ZKQogCQlyZXR1cm47CiAKLQlpZ3RfcmVxdWlyZShiYXRj aC0+Z2VuID49IDYpOworCWlndF9yZXF1aXJlKGliYi0+Z2VuID49IDYpOwogCiAJYmNzX3N3Y3Ry bCA9ICgweDMgPDwgMTYpIHwgKG9uID8gMHgzIDogMHgwKTsKIAogCS8qIFRvIGNoYW5nZSB0aGUg dGlsZSByZWdpc3RlciwgaW5zZXJ0IGFuIE1JX0ZMVVNIX0RXIGZvbGxvd2VkIGJ5IGFuCiAJICog TUlfTE9BRF9SRUdJU1RFUl9JTU0KIAkgKi8KLQlCRUdJTl9CQVRDSCg0LCAwKTsKLQlPVVRfQkFU Q0goTUlfRkxVU0hfRFcgfCAyKTsKLQlPVVRfQkFUQ0goMHgwKTsKLQlPVVRfQkFUQ0goMHgwKTsK LQlPVVRfQkFUQ0goMHgwKTsKLQlBRFZBTkNFX0JBVENIKCk7Ci0KLQlCRUdJTl9CQVRDSCg0LCAw KTsKLQlPVVRfQkFUQ0goTUlfTE9BRF9SRUdJU1RFUl9JTU0pOwotCU9VVF9CQVRDSCgweDIyMjAw KTsgLyogQkNTX1NXQ1RSTCAqLwotCU9VVF9CQVRDSChiY3Nfc3djdHJsKTsKLQlPVVRfQkFUQ0go TUlfTk9PUCk7Ci0JQURWQU5DRV9CQVRDSCgpOworCWludGVsX2JiX291dChpYmIsIE1JX0ZMVVNI X0RXIHwgMik7CisJaW50ZWxfYmJfb3V0KGliYiwgMHgwKTsKKwlpbnRlbF9iYl9vdXQoaWJiLCAw eDApOworCWludGVsX2JiX291dChpYmIsIDB4MCk7CisKKwlpbnRlbF9iYl9vdXQoaWJiLCBNSV9M T0FEX1JFR0lTVEVSX0lNTSk7CisJaW50ZWxfYmJfb3V0KGliYiwgMHgyMjIwMCk7IC8qIEJDU19T V0NUUkwgKi8KKwlpbnRlbF9iYl9vdXQoaWJiLCBiY3Nfc3djdHJsKTsKKwlpbnRlbF9iYl9vdXQo aWJiLCBNSV9OT09QKTsKIH0KIAogc3RhdGljIHZvaWQgZHJhd19yZWN0X3B0cl9saW5lYXIodm9p ZCAqcHRyLCB1aW50MzJfdCBzdHJpZGUsCkBAIC01MDksMjIgKzUwNSwzOSBAQCBzdGF0aWMgdm9p ZCBkcmF3X3JlY3RfcHdyaXRlKGludCBmZCwgc3RydWN0IGJ1Zl9kYXRhICpidWYsCiAJfQogfQog CitzdGF0aWMgc3RydWN0IGludGVsX2J1ZiAqY3JlYXRlX2J1ZihpbnQgZmQsIHN0cnVjdCBidWZf b3BzICpib3BzLAorCQkJCSAgICBzdHJ1Y3QgYnVmX2RhdGEgKmZyb20sIHVpbnQzMl90IHRpbGlu ZykKK3sKKwlzdHJ1Y3QgaW50ZWxfYnVmICpidWYgPSBjYWxsb2Moc2l6ZW9mKCpidWYpLCAxKTsK Kwl1aW50MzJfdCBoYW5kbGUsIG5hbWUsIHdpZHRoLCBoZWlnaHQ7CisKKwlpZ3RfYXNzZXJ0KGJ1 Zik7CisKKwl3aWR0aCA9IGZyb20tPnN0cmlkZSAvIChmcm9tLT5icHAgLyA4KTsKKwloZWlnaHQg PSBmcm9tLT5zaXplIC8gZnJvbS0+c3RyaWRlOworCisJbmFtZSA9IGdlbV9mbGluayhmZCwgZnJv bS0+aGFuZGxlKTsKKwloYW5kbGUgPSBnZW1fb3BlbihmZCwgbmFtZSk7CisJaW50ZWxfYnVmX2lu aXRfdXNpbmdfaGFuZGxlKGJvcHMsIGhhbmRsZSwgYnVmLAorCQkJCSAgICB3aWR0aCwgaGVpZ2h0 LCBmcm9tLT5icHAsIDAsCisJCQkJICAgIHRpbGluZywgMCk7CisKKwlyZXR1cm4gYnVmOworfQor CiBzdGF0aWMgdm9pZCBkcmF3X3JlY3RfYmx0KGludCBmZCwgc3RydWN0IGNtZF9kYXRhICpjbWRf ZGF0YSwKIAkJCSAgc3RydWN0IGJ1Zl9kYXRhICpidWYsIHN0cnVjdCByZWN0ICpyZWN0LAogCQkJ ICB1aW50MzJfdCB0aWxpbmcsIHVpbnQzMl90IGNvbG9yKQogewotCWRybV9pbnRlbF9ibyAqZHN0 OwotCXN0cnVjdCBpbnRlbF9iYXRjaGJ1ZmZlciAqYmF0Y2g7CisJc3RydWN0IGludGVsX2JiICpp YmI7CisJc3RydWN0IGludGVsX2J1ZiAqZHN0OwogCWludCBibHRfY21kX2xlbiwgYmx0X2NtZF90 aWxpbmcsIGJsdF9jbWRfZGVwdGg7CiAJdWludDMyX3QgZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2Rl dmlkKGZkKTsKIAlpbnQgZ2VuID0gaW50ZWxfZ2VuKGRldmlkKTsKIAlpbnQgcGl0Y2g7CiAKLQlk c3QgPSBnZW1faGFuZGxlX3RvX2xpYmRybV9ibyhjbWRfZGF0YS0+YnVmbWdyLCBmZCwgIiIsIGJ1 Zi0+aGFuZGxlKTsKLQlpZ3RfYXNzZXJ0KGRzdCk7Ci0KLQliYXRjaCA9IGludGVsX2JhdGNoYnVm ZmVyX2FsbG9jKGNtZF9kYXRhLT5idWZtZ3IsIGRldmlkKTsKLQlpZ3RfYXNzZXJ0KGJhdGNoKTsK Kwlkc3QgPSBjcmVhdGVfYnVmKGZkLCBjbWRfZGF0YS0+Ym9wcywgYnVmLCB0aWxpbmcpOworCWli YiA9IGludGVsX2JiX2NyZWF0ZShmZCwgUEFHRV9TSVpFKTsKIAogCXN3aXRjaCAoYnVmLT5icHAp IHsKIAljYXNlIDg6CkBAIC01NDQsMzQgKzU1NywzMiBAQCBzdGF0aWMgdm9pZCBkcmF3X3JlY3Rf Ymx0KGludCBmZCwgc3RydWN0IGNtZF9kYXRhICpjbWRfZGF0YSwKIAlibHRfY21kX3RpbGluZyA9 ICh0aWxpbmcpID8gWFlfQ09MT1JfQkxUX1RJTEVEIDogMDsKIAlwaXRjaCA9IChnZW4gPj0gNCAm JiB0aWxpbmcpID8gYnVmLT5zdHJpZGUgLyA0IDogYnVmLT5zdHJpZGU7CiAKLQlzd2l0Y2hfYmx0 X3RpbGluZyhiYXRjaCwgdGlsaW5nLCB0cnVlKTsKKwlzd2l0Y2hfYmx0X3RpbGluZyhpYmIsIHRp bGluZywgdHJ1ZSk7CiAKLQlCRUdJTl9CQVRDSCg2LCAxKTsKLQlPVVRfQkFUQ0goWFlfQ09MT1Jf QkxUX0NNRF9OT0xFTiB8IFhZX0NPTE9SX0JMVF9XUklURV9BTFBIQSB8Ci0JCSAgWFlfQ09MT1Jf QkxUX1dSSVRFX1JHQiB8IGJsdF9jbWRfdGlsaW5nIHwgYmx0X2NtZF9sZW4pOwotCU9VVF9CQVRD SChibHRfY21kX2RlcHRoIHwgKDB4RjAgPDwgMTYpIHwgcGl0Y2gpOwotCU9VVF9CQVRDSCgocmVj dC0+eSA8PCAxNikgfCByZWN0LT54KTsKLQlPVVRfQkFUQ0goKChyZWN0LT55ICsgcmVjdC0+aCkg PDwgMTYpIHwgKHJlY3QtPnggKyByZWN0LT53KSk7Ci0JT1VUX1JFTE9DX0ZFTkNFRChkc3QsIDAs IEk5MTVfR0VNX0RPTUFJTl9SRU5ERVIsIDApOwotCU9VVF9CQVRDSChjb2xvcik7Ci0JQURWQU5D RV9CQVRDSCgpOworCWludGVsX2JiX291dChpYmIsIFhZX0NPTE9SX0JMVF9DTURfTk9MRU4gfCBY WV9DT0xPUl9CTFRfV1JJVEVfQUxQSEEgfAorCQkgICAgIFhZX0NPTE9SX0JMVF9XUklURV9SR0Ig fCBibHRfY21kX3RpbGluZyB8IGJsdF9jbWRfbGVuKTsKKwlpbnRlbF9iYl9vdXQoaWJiLCBibHRf Y21kX2RlcHRoIHwgKDB4RjAgPDwgMTYpIHwgcGl0Y2gpOworCWludGVsX2JiX291dChpYmIsIChy ZWN0LT55IDw8IDE2KSB8IHJlY3QtPngpOworCWludGVsX2JiX291dChpYmIsICgocmVjdC0+eSAr IHJlY3QtPmgpIDw8IDE2KSB8IChyZWN0LT54ICsgcmVjdC0+dykpOworCWludGVsX2JiX2VtaXRf cmVsb2NfZmVuY2VkKGliYiwgZHN0LT5oYW5kbGUsIDAsIEk5MTVfR0VNX0RPTUFJTl9SRU5ERVIs CisJCQkJICAgMCwgZHN0LT5hZGRyLm9mZnNldCk7CisJaW50ZWxfYmJfb3V0KGliYiwgY29sb3Ip OwogCi0Jc3dpdGNoX2JsdF90aWxpbmcoYmF0Y2gsIHRpbGluZywgZmFsc2UpOworCXN3aXRjaF9i bHRfdGlsaW5nKGliYiwgdGlsaW5nLCBmYWxzZSk7CiAKLQlpbnRlbF9iYXRjaGJ1ZmZlcl9mbHVz aChiYXRjaCk7Ci0JaW50ZWxfYmF0Y2hidWZmZXJfZnJlZShiYXRjaCk7Ci0JZHJtX2ludGVsX2Jv X3VucmVmZXJlbmNlKGRzdCk7CisJaW50ZWxfYmJfZmx1c2hfYmxpdChpYmIpOworCWludGVsX2Ji X2Rlc3Ryb3koaWJiKTsKKwlpbnRlbF9idWZfZGVzdHJveShkc3QpOwogfQogCiBzdGF0aWMgdm9p ZCBkcmF3X3JlY3RfcmVuZGVyKGludCBmZCwgc3RydWN0IGNtZF9kYXRhICpjbWRfZGF0YSwKIAkJ CSAgICAgc3RydWN0IGJ1Zl9kYXRhICpidWYsIHN0cnVjdCByZWN0ICpyZWN0LAogCQkJICAgICB1 aW50MzJfdCB0aWxpbmcsIHVpbnQzMl90IGNvbG9yKQogewotCWRybV9pbnRlbF9ibyAqc3JjLCAq ZHN0OworCXN0cnVjdCBpbnRlbF9idWYgKnNyYywgKmRzdDsKIAl1aW50MzJfdCBkZXZpZCA9IGlu dGVsX2dldF9kcm1fZGV2aWQoZmQpOwogCWlndF9yZW5kZXJfY29weWZ1bmNfdCByZW5kZXJjb3B5 ID0gaWd0X2dldF9yZW5kZXJfY29weWZ1bmMoZGV2aWQpOwotCXN0cnVjdCBpZ3RfYnVmIHNyY19i dWYgPSB7fSwgZHN0X2J1ZiA9IHt9OwotCXN0cnVjdCBpbnRlbF9iYXRjaGJ1ZmZlciAqYmF0Y2g7 CisJc3RydWN0IGludGVsX2JiICppYmI7CiAJc3RydWN0IGJ1Zl9kYXRhIHRtcDsKIAlpbnQgcGl4 ZWxfc2l6ZSA9IGJ1Zi0+YnBwIC8gODsKIApAQCAtNTg1LDQwICs1OTYsMjQgQEAgc3RhdGljIHZv aWQgZHJhd19yZWN0X3JlbmRlcihpbnQgZmQsIHN0cnVjdCBjbWRfZGF0YSAqY21kX2RhdGEsCiAJ ZHJhd19yZWN0X21tYXBfY3B1KGZkLCAmdG1wLCAmKHN0cnVjdCByZWN0KXswLCAwLCByZWN0LT53 LCByZWN0LT5ofSwKIAkJCSAgIEk5MTVfVElMSU5HX05PTkUsIEk5MTVfQklUXzZfU1dJWlpMRV9O T05FLCBjb2xvcik7CiAKLQlzcmMgPSBnZW1faGFuZGxlX3RvX2xpYmRybV9ibyhjbWRfZGF0YS0+ YnVmbWdyLCBmZCwgIiIsIHRtcC5oYW5kbGUpOwotCWlndF9hc3NlcnQoc3JjKTsKLQlkc3QgPSBn ZW1faGFuZGxlX3RvX2xpYmRybV9ibyhjbWRfZGF0YS0+YnVmbWdyLCBmZCwgIiIsIGJ1Zi0+aGFu ZGxlKTsKLQlpZ3RfYXNzZXJ0KGRzdCk7Ci0KLQlzcmNfYnVmLmJvID0gc3JjOwotCXNyY19idWYu c3VyZmFjZVswXS5zdHJpZGUgPSB0bXAuc3RyaWRlOwotCXNyY19idWYudGlsaW5nID0gSTkxNV9U SUxJTkdfTk9ORTsKLQlzcmNfYnVmLnN1cmZhY2VbMF0uc2l6ZSA9IHRtcC5zaXplOwotCXNyY19i dWYuYnBwID0gdG1wLmJwcDsKLQlkc3RfYnVmLmJvID0gZHN0OwotCWRzdF9idWYuc3VyZmFjZVsw XS5zdHJpZGUgPSBidWYtPnN0cmlkZTsKLQlkc3RfYnVmLnRpbGluZyA9IHRpbGluZzsKLQlkc3Rf YnVmLnN1cmZhY2VbMF0uc2l6ZSA9IGJ1Zi0+c2l6ZTsKLQlkc3RfYnVmLmJwcCA9IGJ1Zi0+YnBw OwotCi0JYmF0Y2ggPSBpbnRlbF9iYXRjaGJ1ZmZlcl9hbGxvYyhjbWRfZGF0YS0+YnVmbWdyLCBk ZXZpZCk7Ci0JaWd0X2Fzc2VydChiYXRjaCk7Ci0KLQlyZW5kZXJjb3B5KGJhdGNoLCBjbWRfZGF0 YS0+Y29udGV4dCwgJnNyY19idWYsIDAsIDAsIHJlY3QtPncsCi0JCSAgIHJlY3QtPmgsICZkc3Rf YnVmLCByZWN0LT54LCByZWN0LT55KTsKLQotCWludGVsX2JhdGNoYnVmZmVyX2ZyZWUoYmF0Y2gp OwotCWRybV9pbnRlbF9ib191bnJlZmVyZW5jZShzcmMpOwotCWRybV9pbnRlbF9ib191bnJlZmVy ZW5jZShkc3QpOworCXNyYyA9IGNyZWF0ZV9idWYoZmQsIGNtZF9kYXRhLT5ib3BzLCAmdG1wLCBJ OTE1X1RJTElOR19OT05FKTsKKwlkc3QgPSBjcmVhdGVfYnVmKGZkLCBjbWRfZGF0YS0+Ym9wcywg YnVmLCB0aWxpbmcpOworCWliYiA9IGludGVsX2JiX2NyZWF0ZShmZCwgUEFHRV9TSVpFKTsKKwor CXJlbmRlcmNvcHkoaWJiLCBjbWRfZGF0YS0+Y3R4LCBzcmMsIDAsIDAsIHJlY3QtPncsCisJCSAg IHJlY3QtPmgsIGRzdCwgcmVjdC0+eCwgcmVjdC0+eSk7CisKKwlpbnRlbF9iYl9kZXN0cm95KGli Yik7CisJaW50ZWxfYnVmX2Rlc3Ryb3koc3JjKTsKKwlpbnRlbF9idWZfZGVzdHJveShkc3QpOwog CWdlbV9jbG9zZShmZCwgdG1wLmhhbmRsZSk7CiB9CiAKIC8qKgogICogaWd0X2RyYXdfcmVjdDoK ICAqIEBmZDogdGhlIERSTSBmaWxlIGRlc2NyaXB0b3IKLSAqIEBidWZtZ3I6IHRoZSBsaWJkcm0g YnVmbWdyLCBvbmx5IHJlcXVpcmVkIGZvciBJR1RfRFJBV19CTFQgYW5kCi0gKiAgICAgICAgICBJ R1RfRFJBV19SRU5ERVIKLSAqIEBjb250ZXh0OiB0aGUgY29udGV4dCwgY2FuIGJlIE5VTEwgaWYg eW91IGRvbid0IHdhbnQgdG8gdGhpbmsgYWJvdXQgaXQKKyAqIEBib3BzOiBidWYgb3BzLCBvbmx5 IHJlcXVpcmVkIGZvciBJR1RfRFJBV19CTFQgYW5kIElHVF9EUkFXX1JFTkRFUgorICogQGN0eDog dGhlIGNvbnRleHQsIGNhbiBiZSAwIGlmIHlvdSBkb24ndCB3YW50IHRvIHRoaW5rIGFib3V0IGl0 CiAgKiBAYnVmX2hhbmRsZTogdGhlIGhhbmRsZSBvZiB0aGUgYnVmZmVyIHdoZXJlIHlvdSdyZSBn b2luZyB0byBkcmF3IHRvCiAgKiBAYnVmX3NpemU6IHRoZSBzaXplIG9mIHRoZSBidWZmZXIKICAq IEBidWZfc3RyaWRlOiB0aGUgc3RyaWRlIG9mIHRoZSBidWZmZXIKQEAgLTYzNCw3ICs2MjksNyBA QCBzdGF0aWMgdm9pZCBkcmF3X3JlY3RfcmVuZGVyKGludCBmZCwgc3RydWN0IGNtZF9kYXRhICpj bWRfZGF0YSwKICAqIFRoaXMgZnVuY3Rpb24gZHJhd3MgYSBjb2xvcmVkIHJlY3RhbmdsZSBvbiB0 aGUgZGVzdGluYXRpb24gYnVmZmVyLCBhbGxvd2luZwogICogeW91IHRvIHNwZWNpZnkgdGhlIG1l dGhvZCB1c2VkIHRvIGRyYXcgdGhlIHJlY3RhbmdsZS4KICAqLwotdm9pZCBpZ3RfZHJhd19yZWN0 KGludCBmZCwgZHJtX2ludGVsX2J1Zm1nciAqYnVmbWdyLCBkcm1faW50ZWxfY29udGV4dCAqY29u dGV4dCwKK3ZvaWQgaWd0X2RyYXdfcmVjdChpbnQgZmQsIHN0cnVjdCBidWZfb3BzICpib3BzLCB1 aW50MzJfdCBjdHgsCiAJCSAgIHVpbnQzMl90IGJ1Zl9oYW5kbGUsIHVpbnQzMl90IGJ1Zl9zaXpl LCB1aW50MzJfdCBidWZfc3RyaWRlLAogCQkgICB1aW50MzJfdCB0aWxpbmcsIGVudW0gaWd0X2Ry YXdfbWV0aG9kIG1ldGhvZCwKIAkJICAgaW50IHJlY3RfeCwgaW50IHJlY3RfeSwgaW50IHJlY3Rf dywgaW50IHJlY3RfaCwKQEAgLTY0Myw4ICs2MzgsOCBAQCB2b2lkIGlndF9kcmF3X3JlY3QoaW50 IGZkLCBkcm1faW50ZWxfYnVmbWdyICpidWZtZ3IsIGRybV9pbnRlbF9jb250ZXh0ICpjb250ZXh0 LAogCXVpbnQzMl90IGJ1Zl90aWxpbmcsIHN3aXp6bGU7CiAKIAlzdHJ1Y3QgY21kX2RhdGEgY21k X2RhdGEgPSB7Ci0JCS5idWZtZ3IgPSBidWZtZ3IsCi0JCS5jb250ZXh0ID0gY29udGV4dCwKKwkJ LmJvcHMgPSBib3BzLAorCQkuY3R4ID0gY3R4LAogCX07CiAJc3RydWN0IGJ1Zl9kYXRhIGJ1ZiA9 IHsKIAkJLmhhbmRsZSA9IGJ1Zl9oYW5kbGUsCkBAIC02OTMsOSArNjg4LDggQEAgdm9pZCBpZ3Rf ZHJhd19yZWN0KGludCBmZCwgZHJtX2ludGVsX2J1Zm1nciAqYnVmbWdyLCBkcm1faW50ZWxfY29u dGV4dCAqY29udGV4dCwKIC8qKgogICogaWd0X2RyYXdfcmVjdF9mYjoKICAqIEBmZDogdGhlIERS TSBmaWxlIGRlc2NyaXB0b3IKLSAqIEBidWZtZ3I6IHRoZSBsaWJkcm0gYnVmbWdyLCBvbmx5IHJl cXVpcmVkIGZvciBJR1RfRFJBV19CTFQgYW5kCi0gKiAgICAgICAgICBJR1RfRFJBV19SRU5ERVIK LSAqIEBjb250ZXh0OiB0aGUgY29udGV4dCwgY2FuIGJlIE5VTEwgaWYgeW91IGRvbid0IHdhbnQg dG8gdGhpbmsgYWJvdXQgaXQKKyAqIEBib3BzOiBidWYgb3BzLCBvbmx5IHJlcXVpcmVkIGZvciBJ R1RfRFJBV19CTFQgYW5kIElHVF9EUkFXX1JFTkRFUgorICogQGN0eDogY29udGV4dCwgY2FuIGJl IDAgaWYgeW91IGRvbid0IHdhbnQgdG8gdGhpbmsgYWJvdXQgaXQKICAqIEBmYjogZnJhbWVidWZm ZXIKICAqIEBtZXRob2Q6IG1ldGhvZCB5b3UncmUgZ29pbmcgdG8gdXNlIHRvIHdyaXRlIHRvIHRo ZSBidWZmZXIKICAqIEByZWN0X3g6IGhvcml6b250YWwgcG9zaXRpb24gb24gdGhlIGJ1ZmZlciB3 aGVyZSB5b3VyIHJlY3RhbmdsZSBzdGFydHMKQEAgLTcwNywxMiArNzAxLDEyIEBAIHZvaWQgaWd0 X2RyYXdfcmVjdChpbnQgZmQsIGRybV9pbnRlbF9idWZtZ3IgKmJ1Zm1nciwgZHJtX2ludGVsX2Nv bnRleHQgKmNvbnRleHQsCiAgKiBUaGlzIGlzIGV4YWN0bHkgdGhlIHNhbWUgYXMgaWd0X2RyYXdf cmVjdCwgYnV0IHlvdSBjYW4gcGFzcyBhbiBpZ3RfZmIgaW5zdGVhZAogICogb2YgbWFudWFsbHkg cHJvdmlkaW5nIGl0cyBkZXRhaWxzLiBTZWUgaWd0X2RyYXdfcmVjdC4KICAqLwotdm9pZCBpZ3Rf ZHJhd19yZWN0X2ZiKGludCBmZCwgZHJtX2ludGVsX2J1Zm1nciAqYnVmbWdyLAotCQkgICAgICBk cm1faW50ZWxfY29udGV4dCAqY29udGV4dCwgc3RydWN0IGlndF9mYiAqZmIsCit2b2lkIGlndF9k cmF3X3JlY3RfZmIoaW50IGZkLCBzdHJ1Y3QgYnVmX29wcyAqYm9wcywKKwkJICAgICAgdWludDMy X3QgY3R4LCBzdHJ1Y3QgaWd0X2ZiICpmYiwKIAkJICAgICAgZW51bSBpZ3RfZHJhd19tZXRob2Qg bWV0aG9kLCBpbnQgcmVjdF94LCBpbnQgcmVjdF95LAogCQkgICAgICBpbnQgcmVjdF93LCBpbnQg cmVjdF9oLCB1aW50MzJfdCBjb2xvcikKIHsKLQlpZ3RfZHJhd19yZWN0KGZkLCBidWZtZ3IsIGNv bnRleHQsIGZiLT5nZW1faGFuZGxlLCBmYi0+c2l6ZSwgZmItPnN0cmlkZXNbMF0sCisJaWd0X2Ry YXdfcmVjdChmZCwgYm9wcywgY3R4LCBmYi0+Z2VtX2hhbmRsZSwgZmItPnNpemUsIGZiLT5zdHJp ZGVzWzBdLAogCQkgICAgICBpZ3RfZmJfbW9kX3RvX3RpbGluZyhmYi0+bW9kaWZpZXIpLCBtZXRo b2QsCiAJCSAgICAgIHJlY3RfeCwgcmVjdF95LCByZWN0X3csIHJlY3RfaCwgY29sb3IsCiAJCSAg ICAgIGlndF9kcm1fZm9ybWF0X3RvX2JwcChmYi0+ZHJtX2Zvcm1hdCkpOwpAQCAtNzI4LDcgKzcy Miw3IEBAIHZvaWQgaWd0X2RyYXdfcmVjdF9mYihpbnQgZmQsIGRybV9pbnRlbF9idWZtZ3IgKmJ1 Zm1nciwKICAqLwogdm9pZCBpZ3RfZHJhd19maWxsX2ZiKGludCBmZCwgc3RydWN0IGlndF9mYiAq ZmIsIHVpbnQzMl90IGNvbG9yKQogewotCWlndF9kcmF3X3JlY3RfZmIoZmQsIE5VTEwsIE5VTEws IGZiLAorCWlndF9kcmF3X3JlY3RfZmIoZmQsIE5VTEwsIDAsIGZiLAogCQkJIGdlbV9oYXNfbWFw cGFibGVfZ2d0dChmZCkgPyBJR1RfRFJBV19NTUFQX0dUVCA6CiAJCQkJCQkgICAgIElHVF9EUkFX X01NQVBfV0MsCiAJCQkgMCwgMCwgZmItPndpZHRoLCBmYi0+aGVpZ2h0LCBjb2xvcik7CmRpZmYg LS1naXQgYS9saWIvaWd0X2RyYXcuaCBiL2xpYi9pZ3RfZHJhdy5oCmluZGV4IGVjMTQ2NzU0Li4y ZDE4ZWY2YyAxMDA2NDQKLS0tIGEvbGliL2lndF9kcmF3LmgKKysrIGIvbGliL2lndF9kcmF3LmgK QEAgLTI1LDcgKzI1LDcgQEAKICNpZm5kZWYgX19JR1RfRFJBV19IX18KICNkZWZpbmUgX19JR1Rf RFJBV19IX18KIAotI2luY2x1ZGUgPGludGVsX2J1Zm1nci5oPgorI2luY2x1ZGUgPGludGVsX2J1 Zm9wcy5oPgogI2luY2x1ZGUgImlndF9mYi5oIgogCiAvKioKQEAgLTUwLDE0ICs1MCwxNCBAQCBl bnVtIGlndF9kcmF3X21ldGhvZCB7CiAKIGNvbnN0IGNoYXIgKmlndF9kcmF3X2dldF9tZXRob2Rf bmFtZShlbnVtIGlndF9kcmF3X21ldGhvZCBtZXRob2QpOwogCi12b2lkIGlndF9kcmF3X3JlY3Qo aW50IGZkLCBkcm1faW50ZWxfYnVmbWdyICpidWZtZ3IsIGRybV9pbnRlbF9jb250ZXh0ICpjb250 ZXh0LAordm9pZCBpZ3RfZHJhd19yZWN0KGludCBmZCwgc3RydWN0IGJ1Zl9vcHMgKmJvcHMsIHVp bnQzMl90IGN0eCwKIAkJICAgdWludDMyX3QgYnVmX2hhbmRsZSwgdWludDMyX3QgYnVmX3NpemUs IHVpbnQzMl90IGJ1Zl9zdHJpZGUsCiAJCSAgIHVpbnQzMl90IHRpbGluZywgZW51bSBpZ3RfZHJh d19tZXRob2QgbWV0aG9kLAogCQkgICBpbnQgcmVjdF94LCBpbnQgcmVjdF95LCBpbnQgcmVjdF93 LCBpbnQgcmVjdF9oLAogCQkgICB1aW50MzJfdCBjb2xvciwgaW50IGJwcCk7CiAKLXZvaWQgaWd0 X2RyYXdfcmVjdF9mYihpbnQgZmQsIGRybV9pbnRlbF9idWZtZ3IgKmJ1Zm1nciwKLQkJICAgICAg ZHJtX2ludGVsX2NvbnRleHQgKmNvbnRleHQsIHN0cnVjdCBpZ3RfZmIgKmZiLAordm9pZCBpZ3Rf ZHJhd19yZWN0X2ZiKGludCBmZCwgc3RydWN0IGJ1Zl9vcHMgKmJvcHMsCisJCSAgICAgIHVpbnQz Ml90IGN0eCwgc3RydWN0IGlndF9mYiAqZmIsCiAJCSAgICAgIGVudW0gaWd0X2RyYXdfbWV0aG9k IG1ldGhvZCwgaW50IHJlY3RfeCwgaW50IHJlY3RfeSwKIAkJICAgICAgaW50IHJlY3RfdywgaW50 IHJlY3RfaCwgdWludDMyX3QgY29sb3IpOwogCi0tIAoyLjI2LjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1k ZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaWd0LWRldgo=