From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B0B36E5C0 for ; Wed, 17 Mar 2021 14:47:16 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Wed, 17 Mar 2021 15:46:05 +0100 Message-Id: <20210317144610.108372-31-zbigniew.kempczynski@intel.com> In-Reply-To: <20210317144610.108372-1-zbigniew.kempczynski@intel.com> References: <20210317144610.108372-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v26 30/35] tests/gem|kms: Remove intel_bb from fixture 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 List-ID: QXMgaW50ZWxfYmIgIm9wZW5zIiBjb25uZWN0aW9uIHRvIGFsbG9jYXRvciB3aGVuIHRlc3QgY29t cGxldGVzIGl0IGNhbgpsZWF2ZSBhbGxvY2F0b3IgaW4gdW5rbm93biBzdGF0ZSAobW9zdGx5IGlu IGZhaWxlZCB0ZXN0cykuIEFzIGlndF9jb3JlCndhcyBhcm1lZCBpbiByZXNldHRpbmcgYWxsb2Nh dG9yIGluZnJhc3RydWN0dXJlIGNvbm5lY3Rpb24gdG8gaXQgaW5zaWRlCmludGVsX2JiIGlzIG5v dCB2YWxpZCBhbnltb3JlLiBUcnlpbmcgdG8gdXNlIGl0IGxlYWRzIHRvIGNhdGFzdHJvZmljCmVy cm9ycy4KCk1pZ3JhdGUgaW50ZWxfYmIgb3V0IG9mIGZpeHR1cmUgYW5kIGNyZWF0ZSBpdCBpbnNp ZGUgdGVzdHMgaW5kaXZpZHVhbGx5LgoKU2lnbmVkLW9mZi1ieTogWmJpZ25pZXcgS2VtcGN6ecWE c2tpIDx6Ymlnbmlldy5rZW1wY3p5bnNraUBpbnRlbC5jb20+CkNjOiBEb21pbmlrIEdyemVnb3J6 ZWsgPGRvbWluaWsuZ3J6ZWdvcnpla0BpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiB0ZXN0cy9pOTE1L2dlbV9jYWNoaW5nLmMgICAgICAg ICAgICAgIHwgMTQgKysrKysrKystLQogdGVzdHMvaTkxNS9nZW1fcGFydGlhbF9wd3JpdGVfcHJl YWQuYyB8IDQwICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogdGVzdHMvaTkxNS9nZW1fcmVu ZGVyX2NvcHkuYyAgICAgICAgICB8IDMxICsrKysrKysrKystLS0tLS0tLS0tLQogdGVzdHMva21z X2JpZ19mYi5jICAgICAgICAgICAgICAgICAgICB8IDEyICsrKysrLS0tCiA0IGZpbGVzIGNoYW5n ZWQsIDYxIGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3Rz L2k5MTUvZ2VtX2NhY2hpbmcuYyBiL3Rlc3RzL2k5MTUvZ2VtX2NhY2hpbmcuYwppbmRleCBiZGFm ZjY4YTAuLjRlODQ0OTUyZiAxMDA2NDQKLS0tIGEvdGVzdHMvaTkxNS9nZW1fY2FjaGluZy5jCisr KyBiL3Rlc3RzL2k5MTUvZ2VtX2NhY2hpbmcuYwpAQCAtMTU4LDcgKzE1OCw2IEBAIGlndF9tYWlu CiAJCQlmbGFncyA9IDA7CiAJCX0KIAkJZGF0YS5ib3BzID0gYnVmX29wc19jcmVhdGUoZGF0YS5m ZCk7Ci0JCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmZkLCBQQUdFX1NJWkUpOwogCiAJCXNj cmF0Y2hfYnVmID0gaW50ZWxfYnVmX2NyZWF0ZShkYXRhLmJvcHMsIEJPX1NJWkUvNCwgMSwKIAkJ CQkJICAgICAgIDMyLCAwLCBJOTE1X1RJTElOR19OT05FLCAwKTsKQEAgLTE3NCw2ICsxNzMsOCBA QCBpZ3RfbWFpbgogCiAJCWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHJlYWRzXG4iKTsKIAor CQlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5mZCwgUEFHRV9TSVpFKTsKKwogCQlmb3IgKGkg PSAwOyBpIDwgUk9VTkRTOyBpKyspIHsKIAkJCXVpbnQ4X3QgdmFsMCA9IGk7CiAJCQlpbnQgc3Rh cnQsIGxlbjsKQEAgLTE5NSwxMSArMTk2LDE1IEBAIGlndF9tYWluCiAKIAkJCWlndF9wcm9ncmVz cygicGFydGlhbCByZWFkcyB0ZXN0OiAiLCBpLCBST1VORFMpOwogCQl9CisKKwkJaW50ZWxfYmJf ZGVzdHJveShpYmIpOwogCX0KIAogCWlndF9zdWJ0ZXN0KCJ3cml0ZXMiKSB7CiAJCWlndF9yZXF1 aXJlKGZsYWdzICYgVEVTVF9XUklURSk7CiAKKwkJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEu ZmQsIFBBR0VfU0laRSk7CisKIAkJaWd0X2luZm8oImNoZWNraW5nIHBhcnRpYWwgd3JpdGVzXG4i KTsKIAogCQlmb3IgKGkgPSAwOyBpIDwgUk9VTkRTOyBpKyspIHsKQEAgLTI0MCwxMSArMjQ1LDE1 IEBAIGlndF9tYWluCiAKIAkJCWlndF9wcm9ncmVzcygicGFydGlhbCB3cml0ZXMgdGVzdDogIiwg aSwgUk9VTkRTKTsKIAkJfQorCisJCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKIAl9CiAKIAlpZ3Rf c3VidGVzdCgicmVhZC13cml0ZXMiKSB7CiAJCWlndF9yZXF1aXJlKChmbGFncyAmIFRFU1RfQk9U SCkgPT0gVEVTVF9CT1RIKTsKIAorCQlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5mZCwgUEFH RV9TSVpFKTsKKwogCQlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCB3cml0ZXMgYWZ0ZXIgcGFy dGlhbCByZWFkc1xuIik7CiAKIAkJZm9yIChpID0gMDsgaSA8IFJPVU5EUzsgaSsrKSB7CkBAIC0z MDcsMTAgKzMxNiwxMSBAQCBpZ3RfbWFpbgogCiAJCQlpZ3RfcHJvZ3Jlc3MoInBhcnRpYWwgcmVh ZC93cml0ZXMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAkJfQorCisJCWludGVsX2JiX2Rlc3Ryb3ko aWJiKTsKIAl9CiAKIAlpZ3RfZml4dHVyZSB7Ci0JCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKIAkJ aW50ZWxfYnVmX2Rlc3Ryb3koc2NyYXRjaF9idWYpOwogCQlpbnRlbF9idWZfZGVzdHJveShzdGFn aW5nX2J1Zik7CiAJCWJ1Zl9vcHNfZGVzdHJveShkYXRhLmJvcHMpOwpkaWZmIC0tZ2l0IGEvdGVz dHMvaTkxNS9nZW1fcGFydGlhbF9wd3JpdGVfcHJlYWQuYyBiL3Rlc3RzL2k5MTUvZ2VtX3BhcnRp YWxfcHdyaXRlX3ByZWFkLmMKaW5kZXggNzJjMzM1MzlkLi5jMmNhNTYxZTMgMTAwNjQ0Ci0tLSBh L3Rlc3RzL2k5MTUvZ2VtX3BhcnRpYWxfcHdyaXRlX3ByZWFkLmMKKysrIGIvdGVzdHMvaTkxNS9n ZW1fcGFydGlhbF9wd3JpdGVfcHJlYWQuYwpAQCAtNTMsNyArNTMsNiBAQCBJR1RfVEVTVF9ERVND UklQVElPTigiVGVzdCBwd3JpdGUvcHJlYWQgY29uc2lzdGVuY3kgd2hlbiB0b3VjaGluZyBwYXJ0 aWFsIgogI2RlZmluZSBQQUdFX1NJWkUgNDA5NgogI2RlZmluZSBCT19TSVpFICg0KjQwOTYpCiAK LXN0cnVjdCBpbnRlbF9iYiAqaWJiOwogc3RydWN0IGludGVsX2J1ZiAqc2NyYXRjaF9idWY7CiBz dHJ1Y3QgaW50ZWxfYnVmICpzdGFnaW5nX2J1ZjsKIApAQCAtNzcsNyArNzYsOCBAQCBzdGF0aWMg dm9pZCAqX190cnlfZ3R0X21hcF9maXJzdChkYXRhX3QgKmRhdGEsIHN0cnVjdCBpbnRlbF9idWYg KmJ1ZiwKIAlyZXR1cm4gcHRyOwogfQogCi1zdGF0aWMgdm9pZCBjb3B5X2JvKHN0cnVjdCBpbnRl bF9idWYgKnNyYywgc3RydWN0IGludGVsX2J1ZiAqZHN0KQorc3RhdGljIHZvaWQgY29weV9ibyhz dHJ1Y3QgaW50ZWxfYmIgKmliYiwKKwkJICAgIHN0cnVjdCBpbnRlbF9idWYgKnNyYywgc3RydWN0 IGludGVsX2J1ZiAqZHN0KQogewogCWJvb2wgaGFzXzY0Yl9yZWxvYzsKIApAQCAtMTA5LDggKzEw OSw4IEBAIHN0YXRpYyB2b2lkIGNvcHlfYm8oc3RydWN0IGludGVsX2J1ZiAqc3JjLCBzdHJ1Y3Qg aW50ZWxfYnVmICpkc3QpCiB9CiAKIHN0YXRpYyB2b2lkCi1ibHRfYm9fZmlsbChkYXRhX3QgKmRh dGEsIHN0cnVjdCBpbnRlbF9idWYgKnRtcF9ibywKLQkJc3RydWN0IGludGVsX2J1ZiAqYm8sIHVp bnQ4X3QgdmFsKQorYmx0X2JvX2ZpbGwoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgaW50ZWxfYmIgKmli YiwKKwkgICAgc3RydWN0IGludGVsX2J1ZiAqdG1wX2JvLCBzdHJ1Y3QgaW50ZWxfYnVmICpibywg dWludDhfdCB2YWwpCiB7CiAJdWludDhfdCAqZ3R0X3B0cjsKIAlpbnQgaTsKQEAgLTEyNCw3ICsx MjQsNyBAQCBibHRfYm9fZmlsbChkYXRhX3QgKmRhdGEsIHN0cnVjdCBpbnRlbF9idWYgKnRtcF9i bywKIAogCWlndF9kcm9wX2NhY2hlc19zZXQoZGF0YS0+ZHJtX2ZkLCBEUk9QX0JPVU5EKTsKIAot CWNvcHlfYm8odG1wX2JvLCBibyk7CisJY29weV9ibyhpYmIsIHRtcF9ibywgYm8pOwogfQogCiAj ZGVmaW5lIE1BWF9CTFRfU0laRSAxMjgKQEAgLTEzOSwxNCArMTM5LDE3IEBAIHN0YXRpYyB2b2lk IGdldF9yYW5nZShpbnQgKnN0YXJ0LCBpbnQgKmxlbikKIAogc3RhdGljIHZvaWQgdGVzdF9wYXJ0 aWFsX3JlYWRzKGRhdGFfdCAqZGF0YSkKIHsKKwlzdHJ1Y3QgaW50ZWxfYmIgKmliYjsKIAlpbnQg aSwgajsKIAorCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLT5kcm1fZmQsIFBBR0VfU0laRSk7 CisKIAlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCByZWFkc1xuIik7CiAJZm9yIChpID0gMDsg aSA8IFJPVU5EUzsgaSsrKSB7CiAJCXVpbnQ4X3QgdmFsID0gaTsKIAkJaW50IHN0YXJ0LCBsZW47 CiAKLQkJYmx0X2JvX2ZpbGwoZGF0YSwgc3RhZ2luZ19idWYsIHNjcmF0Y2hfYnVmLCB2YWwpOwor CQlibHRfYm9fZmlsbChkYXRhLCBpYmIsIHN0YWdpbmdfYnVmLCBzY3JhdGNoX2J1ZiwgdmFsKTsK IAogCQlnZXRfcmFuZ2UoJnN0YXJ0LCAmbGVuKTsKIAkJZ2VtX3JlYWQoZGF0YS0+ZHJtX2ZkLCBz Y3JhdGNoX2J1Zi0+aGFuZGxlLCBzdGFydCwgdG1wLCBsZW4pOwpAQCAtMTU5LDI2ICsxNjIsMzEg QEAgc3RhdGljIHZvaWQgdGVzdF9wYXJ0aWFsX3JlYWRzKGRhdGFfdCAqZGF0YSkKIAogCQlpZ3Rf cHJvZ3Jlc3MoInBhcnRpYWwgcmVhZHMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAl9CisKKwlpbnRl bF9iYl9kZXN0cm95KGliYik7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RfcGFydGlhbF93cml0ZXMo ZGF0YV90ICpkYXRhKQogeworCXN0cnVjdCBpbnRlbF9iYiAqaWJiOwogCWludCBpLCBqOwogCXVp bnQ4X3QgKmd0dF9wdHI7CiAKKwlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS0+ZHJtX2ZkLCBQ QUdFX1NJWkUpOworCiAJaWd0X2luZm8oImNoZWNraW5nIHBhcnRpYWwgd3JpdGVzXG4iKTsKIAlm b3IgKGkgPSAwOyBpIDwgUk9VTkRTOyBpKyspIHsKIAkJdWludDhfdCB2YWwgPSBpOwogCQlpbnQg c3RhcnQsIGxlbjsKIAotCQlibHRfYm9fZmlsbChkYXRhLCBzdGFnaW5nX2J1Ziwgc2NyYXRjaF9i dWYsIHZhbCk7CisJCWJsdF9ib19maWxsKGRhdGEsIGliYiwgc3RhZ2luZ19idWYsIHNjcmF0Y2hf YnVmLCB2YWwpOwogCiAJCW1lbXNldCh0bXAsIGkgKyA2MywgQk9fU0laRSk7CiAKIAkJZ2V0X3Jh bmdlKCZzdGFydCwgJmxlbik7CiAJCWdlbV93cml0ZShkYXRhLT5kcm1fZmQsIHNjcmF0Y2hfYnVm LT5oYW5kbGUsIHN0YXJ0LCB0bXAsIGxlbik7CiAKLQkJY29weV9ibyhzY3JhdGNoX2J1Ziwgc3Rh Z2luZ19idWYpOworCQljb3B5X2JvKGliYiwgc2NyYXRjaF9idWYsIHN0YWdpbmdfYnVmKTsKIAkJ Z3R0X3B0ciA9IF9fdHJ5X2d0dF9tYXBfZmlyc3QoZGF0YSwgc3RhZ2luZ19idWYsIDApOwogCiAJ CWZvciAoaiA9IDA7IGogPCBzdGFydDsgaisrKSB7CkBAIC0yMDAsMTkgKzIwOCwyNCBAQCBzdGF0 aWMgdm9pZCB0ZXN0X3BhcnRpYWxfd3JpdGVzKGRhdGFfdCAqZGF0YSkKIAogCQlpZ3RfcHJvZ3Jl c3MoInBhcnRpYWwgd3JpdGVzIHRlc3Q6ICIsIGksIFJPVU5EUyk7CiAJfQorCisJaW50ZWxfYmJf ZGVzdHJveShpYmIpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxfcmVhZF93cml0ZXMo ZGF0YV90ICpkYXRhKQogeworCXN0cnVjdCBpbnRlbF9iYiAqaWJiOwogCWludCBpLCBqOwogCXVp bnQ4X3QgKmd0dF9wdHI7CiAKKwlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS0+ZHJtX2ZkLCBQ QUdFX1NJWkUpOworCiAJaWd0X2luZm8oImNoZWNraW5nIHBhcnRpYWwgd3JpdGVzIGFmdGVyIHBh cnRpYWwgcmVhZHNcbiIpOwogCWZvciAoaSA9IDA7IGkgPCBST1VORFM7IGkrKykgewogCQl1aW50 OF90IHZhbCA9IGk7CiAJCWludCBzdGFydCwgbGVuOwogCi0JCWJsdF9ib19maWxsKGRhdGEsIHN0 YWdpbmdfYnVmLCBzY3JhdGNoX2J1ZiwgdmFsKTsKKwkJYmx0X2JvX2ZpbGwoZGF0YSwgaWJiLCBz dGFnaW5nX2J1Ziwgc2NyYXRjaF9idWYsIHZhbCk7CiAKIAkJLyogcGFydGlhbCByZWFkICovCiAJ CWdldF9yYW5nZSgmc3RhcnQsICZsZW4pOwpAQCAtMjI2LDcgKzIzOSw3IEBAIHN0YXRpYyB2b2lk IHRlc3RfcGFydGlhbF9yZWFkX3dyaXRlcyhkYXRhX3QgKmRhdGEpCiAJCS8qIENoYW5nZSBjb250 ZW50cyB0aHJvdWdoIGd0dCB0byBtYWtlIHRoZSBwcmVhZCBjYWNoZWxpbmVzCiAJCSAqIHN0YWxl LiAqLwogCQl2YWwgKz0gMTc7Ci0JCWJsdF9ib19maWxsKGRhdGEsIHN0YWdpbmdfYnVmLCBzY3Jh dGNoX2J1ZiwgdmFsKTsKKwkJYmx0X2JvX2ZpbGwoZGF0YSwgaWJiLCBzdGFnaW5nX2J1Ziwgc2Ny YXRjaF9idWYsIHZhbCk7CiAKIAkJLyogcGFydGlhbCB3cml0ZSAqLwogCQltZW1zZXQodG1wLCBp ICsgNjMsIEJPX1NJWkUpOwpAQCAtMjM0LDcgKzI0Nyw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGFy dGlhbF9yZWFkX3dyaXRlcyhkYXRhX3QgKmRhdGEpCiAJCWdldF9yYW5nZSgmc3RhcnQsICZsZW4p OwogCQlnZW1fd3JpdGUoZGF0YS0+ZHJtX2ZkLCBzY3JhdGNoX2J1Zi0+aGFuZGxlLCBzdGFydCwg dG1wLCBsZW4pOwogCi0JCWNvcHlfYm8oc2NyYXRjaF9idWYsIHN0YWdpbmdfYnVmKTsKKwkJY29w eV9ibyhpYmIsIHNjcmF0Y2hfYnVmLCBzdGFnaW5nX2J1Zik7CiAJCWd0dF9wdHIgPSBfX3RyeV9n dHRfbWFwX2ZpcnN0KGRhdGEsIHN0YWdpbmdfYnVmLCAwKTsKIAogCQlmb3IgKGogPSAwOyBqIDwg c3RhcnQ7IGorKykgewpAQCAtMjU2LDYgKzI2OSw4IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGFydGlh bF9yZWFkX3dyaXRlcyhkYXRhX3QgKmRhdGEpCiAKIAkJaWd0X3Byb2dyZXNzKCJwYXJ0aWFsIHJl YWQvd3JpdGVzIHRlc3Q6ICIsIGksIFJPVU5EUyk7CiAJfQorCisJaW50ZWxfYmJfZGVzdHJveShp YmIpOwogfQogCiBzdGF0aWMgdm9pZCBkb190ZXN0cyhkYXRhX3QgKmRhdGEsIGludCBjYWNoZV9s ZXZlbCwgY29uc3QgY2hhciAqc3VmZml4KQpAQCAtMjg4LDggKzMwMyw2IEBAIGlndF9tYWluCiAJ CWRhdGEuZGV2aWQgPSBpbnRlbF9nZXRfZHJtX2RldmlkKGRhdGEuZHJtX2ZkKTsKIAkJZGF0YS5i b3BzID0gYnVmX29wc19jcmVhdGUoZGF0YS5kcm1fZmQpOwogCi0JCWliYiA9IGludGVsX2JiX2Ny ZWF0ZShkYXRhLmRybV9mZCwgUEFHRV9TSVpFKTsKLQogCQkvKiBvdmVyYWxsb2NhdGUgdGhlIGJ1 ZmZlcnMgd2UncmUgYWN0dWFsbHkgdXNpbmcgYmVjYXVzZSAqLwkKIAkJc2NyYXRjaF9idWYgPSBp bnRlbF9idWZfY3JlYXRlKGRhdGEuYm9wcywgQk9fU0laRS80LCAxLCAzMiwgMCwgSTkxNV9USUxJ TkdfTk9ORSwgMCk7CiAJCXN0YWdpbmdfYnVmID0gaW50ZWxfYnVmX2NyZWF0ZShkYXRhLmJvcHMs IEJPX1NJWkUvNCwgMSwgMzIsIDAsIEk5MTVfVElMSU5HX05PTkUsIDApOwpAQCAtMzAzLDcgKzMx Niw2IEBAIGlndF9tYWluCiAJZG9fdGVzdHMoJmRhdGEsIDIsICItZGlzcGxheSIpOwogCiAJaWd0 X2ZpeHR1cmUgewotCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJCWludGVsX2J1Zl9kZXN0cm95 KHNjcmF0Y2hfYnVmKTsKIAkJaW50ZWxfYnVmX2Rlc3Ryb3koc3RhZ2luZ19idWYpOwogCQlidWZf b3BzX2Rlc3Ryb3koZGF0YS5ib3BzKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUvZ2VtX3JlbmRl cl9jb3B5LmMgYi90ZXN0cy9pOTE1L2dlbV9yZW5kZXJfY29weS5jCmluZGV4IGFmYzQ5MGYxYS4u ZTQ4YjViOTk2IDEwMDY0NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9yZW5kZXJfY29weS5jCisrKyBi L3Rlc3RzL2k5MTUvZ2VtX3JlbmRlcl9jb3B5LmMKQEAgLTU4LDcgKzU4LDYgQEAgdHlwZWRlZiBz dHJ1Y3QgewogCWludCBkcm1fZmQ7CiAJdWludDMyX3QgZGV2aWQ7CiAJc3RydWN0IGJ1Zl9vcHMg KmJvcHM7Ci0Jc3RydWN0IGludGVsX2JiICppYmI7CiAJaWd0X3JlbmRlcl9jb3B5ZnVuY190IHJl bmRlcl9jb3B5OwogCWlndF92ZWJveF9jb3B5ZnVuY190IHZlYm94X2NvcHk7CiB9IGRhdGFfdDsK QEAgLTM0MSw2ICszNDAsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMy X3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkJIGVudW0gaTkxNV9jb21wcmVz c2lvbiBkc3RfY29tcHJlc3Npb24sCiAJCSBpbnQgZmxhZ3MpCiB7CisJc3RydWN0IGludGVsX2Ji ICppYmI7CiAJc3RydWN0IGludGVsX2J1ZiByZWYsIHNyY190aWxlZCwgc3JjX2NjcywgZHN0X2Nj cywgZHN0OwogCXN0cnVjdCB7CiAJCXN0cnVjdCBpbnRlbF9idWYgYnVmOwpAQCAtMzk3LDYgKzM5 Nyw4IEBAIHN0YXRpYyB2b2lkIHRlc3QoZGF0YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5n LCB1aW50MzJfdCBkc3RfdGlsaW5nLAogCSAgICBzcmNfY29tcHJlc3NlZCB8fCBkc3RfY29tcHJl c3NlZCkKIAkJaWd0X3JlcXVpcmUoaW50ZWxfZ2VuKGRhdGEtPmRldmlkKSA+PSA5KTsKIAorCWli YiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLT5kcm1fZmQsIDQwOTYpOworCiAJZm9yIChpbnQgaSA9 IDA7IGkgPCBudW1fc3JjOyBpKyspCiAJCXNjcmF0Y2hfYnVmX2luaXQoZGF0YSwgJnNyY1tpXS5i dWYsIFdJRFRILCBIRUlHSFQsIHNyY1tpXS50aWxpbmcsCiAJCQkJIEk5MTVfQ09NUFJFU1NJT05f Tk9ORSk7CkBAIC00NTYsMTIgKzQ1OCwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0 YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkgKi8KIAlpZiAo c3JjX21peGVkX3RpbGVkKSB7CiAJCWlmIChkc3RfY29tcHJlc3NlZCkKLQkJCWRhdGEtPnJlbmRl cl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICAmZHN0 LCAwLCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZkc3RfY2NzLCAwLCAwKTsKIAogCQlmb3Ig KGludCBpID0gMDsgaSA8IG51bV9zcmM7IGkrKykgewotCQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0 YS0+aWJiLAorCQkJZGF0YS0+cmVuZGVyX2NvcHkoaWJiLAogCQkJCQkgICZzcmNbaV0uYnVmLAog CQkJCQkgIFdJRFRILzQsIEhFSUdIVC80LCBXSURUSC8yLTIsIEhFSUdIVC8yLTIsCiAJCQkJCSAg ZHN0X2NvbXByZXNzZWQgPyAmZHN0X2NjcyA6ICZkc3QsCkBAIC00NjksMTMgKzQ3MSwxMyBAQCBz dGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMy X3QgZHN0X3RpbGluZywKIAkJfQogCiAJCWlmIChkc3RfY29tcHJlc3NlZCkKLQkJCWRhdGEtPnJl bmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICAm ZHN0X2NjcywgMCwgMCwgV0lEVEgsIEhFSUdIVCwKIAkJCQkJICAmZHN0LCAwLCAwKTsKIAogCX0g ZWxzZSB7CiAJCWlmIChzcmNfY29tcHJlc3Npb24gPT0gSTkxNV9DT01QUkVTU0lPTl9SRU5ERVIp IHsKLQkJCWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5 KGliYiwKIAkJCQkJICAmc3JjX3RpbGVkLCAwLCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZz cmNfY2NzLAogCQkJCQkgIDAsIDApOwpAQCAtNDg2LDcgKzQ4OCw3IEBAIHN0YXRpYyB2b2lkIHRl c3QoZGF0YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5nLCB1aW50MzJfdCBkc3RfdGlsaW5n LAogCQkJCQkJICAgICAgICJyZW5kZXItc3JjX2Njcy5iaW4iKTsKIAkJCX0KIAkJfSBlbHNlIGlm IChzcmNfY29tcHJlc3Npb24gPT0gSTkxNV9DT01QUkVTU0lPTl9NRURJQSkgewotCQkJZGF0YS0+ dmVib3hfY29weShkYXRhLT5pYmIsCisJCQlkYXRhLT52ZWJveF9jb3B5KGliYiwKIAkJCQkJICZz cmNfdGlsZWQsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmc3JjX2Njcyk7CiAJCQlpZiAoZHVtcF9j b21wcmVzc2VkX3NyY19idWYpIHsKQEAgLTQ5OCwzNCArNTAwLDM0IEBAIHN0YXRpYyB2b2lkIHRl c3QoZGF0YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5nLCB1aW50MzJfdCBkc3RfdGlsaW5n LAogCQl9CiAKIAkJaWYgKGRzdF9jb21wcmVzc2lvbiA9PSBJOTE1X0NPTVBSRVNTSU9OX1JFTkRF UikgewotCQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0YS0+aWJiLAorCQkJZGF0YS0+cmVuZGVyX2Nv cHkoaWJiLAogCQkJCQkgIHNyY19jb21wcmVzc2VkID8gJnNyY19jY3MgOiAmc3JjX3RpbGVkLAog CQkJCQkgIDAsIDAsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAgJmRzdF9jY3MsCiAJCQkJCSAgMCwg MCk7CiAKLQkJCWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9j b3B5KGliYiwKIAkJCQkJICAmZHN0X2NjcywKIAkJCQkJICAwLCAwLCBXSURUSCwgSEVJR0hULAog CQkJCQkgICZkc3QsCiAJCQkJCSAgMCwgMCk7CiAJCX0gZWxzZSBpZiAoZHN0X2NvbXByZXNzaW9u ID09IEk5MTVfQ09NUFJFU1NJT05fTUVESUEpIHsKLQkJCWRhdGEtPnZlYm94X2NvcHkoZGF0YS0+ aWJiLAorCQkJZGF0YS0+dmVib3hfY29weShpYmIsCiAJCQkJCSBzcmNfY29tcHJlc3NlZCA/ICZz cmNfY2NzIDogJnNyY190aWxlZCwKIAkJCQkJIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmZHN0X2Nj cyk7CiAKLQkJCWRhdGEtPnZlYm94X2NvcHkoZGF0YS0+aWJiLAorCQkJZGF0YS0+dmVib3hfY29w eShpYmIsCiAJCQkJCSAmZHN0X2NjcywKIAkJCQkJIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmZHN0 KTsKIAkJfSBlbHNlIGlmIChmb3JjZV92ZWJveF9kc3RfY29weSkgewotCQkJZGF0YS0+dmVib3hf Y29weShkYXRhLT5pYmIsCisJCQlkYXRhLT52ZWJveF9jb3B5KGliYiwKIAkJCQkJIHNyY19jb21w cmVzc2VkID8gJnNyY19jY3MgOiAmc3JjX3RpbGVkLAogCQkJCQkgV0lEVEgsIEhFSUdIVCwKIAkJ CQkJICZkc3QpOwogCQl9IGVsc2UgewotCQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0YS0+aWJiLAor CQkJZGF0YS0+cmVuZGVyX2NvcHkoaWJiLAogCQkJCQkgIHNyY19jb21wcmVzc2VkID8gJnNyY19j Y3MgOiAmc3JjX3RpbGVkLAogCQkJCQkgIDAsIDAsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAgJmRz dCwKQEAgLTU3Miw4ICs1NzQsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWlu dDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAlmb3IgKGludCBpID0gMDsg aSA8IG51bV9zcmM7IGkrKykKIAkJc2NyYXRjaF9idWZfZmluaSgmc3JjW2ldLmJ1Zik7CiAKLQkv KiBoYW5kbGVzIGdvbmUsIG5lZWQgdG8gY2xlYW4gdGhlIG9iamVjdHMgY2FjaGUgd2l0aGluIGlu dGVsX2JiICovCi0JaW50ZWxfYmJfcmVzZXQoZGF0YS0+aWJiLCB0cnVlKTsKKwlpbnRlbF9iYl9k ZXN0cm95KGliYik7CiB9CiAKIHN0YXRpYyBpbnQgb3B0X2hhbmRsZXIoaW50IG9wdCwgaW50IG9w dF9pbmRleCwgdm9pZCAqZGF0YSkKQEAgLTc5Niw3ICs3OTcsNiBAQCBpZ3RfbWFpbl9hcmdzKCJk YWMiLCBOVUxMLCBoZWxwX3N0ciwgb3B0X2hhbmRsZXIsIE5VTEwpCiAJCWRhdGEudmVib3hfY29w eSA9IGlndF9nZXRfdmVib3hfY29weWZ1bmMoZGF0YS5kZXZpZCk7CiAKIAkJZGF0YS5ib3BzID0g YnVmX29wc19jcmVhdGUoZGF0YS5kcm1fZmQpOwotCQlkYXRhLmliYiA9IGludGVsX2JiX2NyZWF0 ZShkYXRhLmRybV9mZCwgNDA5Nik7CiAKIAkJaWd0X2ZvcmtfaGFuZ19kZXRlY3RvcihkYXRhLmRy bV9mZCk7CiAJfQpAQCAtODQ5LDcgKzg0OSw2IEBAIGlndF9tYWluX2FyZ3MoImRhYyIsIE5VTEws IGhlbHBfc3RyLCBvcHRfaGFuZGxlciwgTlVMTCkKIAogCWlndF9maXh0dXJlIHsKIAkJaWd0X3N0 b3BfaGFuZ19kZXRlY3RvcigpOwotCQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsKIAkJYnVm X29wc19kZXN0cm95KGRhdGEuYm9wcyk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2Jp Z19mYi5jIGIvdGVzdHMva21zX2JpZ19mYi5jCmluZGV4IDUyNjAxNzZlMS4uYjY3MDdhNWE0IDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfYmlnX2ZiLmMKKysrIGIvdGVzdHMva21zX2JpZ19mYi5jCkBA IC02NjQsNyArNjY0LDYgQEAgaWd0X21haW4KIAkJCWRhdGEucmVuZGVyX2NvcHkgPSBpZ3RfZ2V0 X3JlbmRlcl9jb3B5ZnVuYyhkYXRhLmRldmlkKTsKIAogCQlkYXRhLmJvcHMgPSBidWZfb3BzX2Ny ZWF0ZShkYXRhLmRybV9mZCk7Ci0JCWRhdGEuaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEuZHJt X2ZkLCA0MDk2KTsKIAl9CiAKIAkvKgpAQCAtNjc3LDcgKzY3Niw5IEBAIGlndF9tYWluCiAJCWln dF9zdWJ0ZXN0X2YoIiVzLWFkZGZiLXNpemUtb3ZlcmZsb3ciLAogCQkJICAgICAgbW9kaWZpZXJz W2ldLm5hbWUpIHsKIAkJCWRhdGEubW9kaWZpZXIgPSBtb2RpZmllcnNbaV0ubW9kaWZpZXI7CisJ CQlkYXRhLmliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmRybV9mZCwgNDA5Nik7CiAJCQl0ZXN0 X3NpemVfb3ZlcmZsb3coJmRhdGEpOworCQkJaW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJ CX0KIAl9CiAKQEAgLTY4NSwxNSArNjg2LDE4IEBAIGlndF9tYWluCiAJCWlndF9zdWJ0ZXN0X2Yo IiVzLWFkZGZiLXNpemUtb2Zmc2V0LW92ZXJmbG93IiwKIAkJCSAgICAgIG1vZGlmaWVyc1tpXS5u YW1lKSB7CiAJCQlkYXRhLm1vZGlmaWVyID0gbW9kaWZpZXJzW2ldLm1vZGlmaWVyOworCQkJZGF0 YS5pYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJdGVzdF9zaXpl X29mZnNldF9vdmVyZmxvdygmZGF0YSk7CisJCQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsK IAkJfQogCX0KIAogCWZvciAoaW50IGkgPSAwOyBpIDwgQVJSQVlfU0laRShtb2RpZmllcnMpOyBp KyspIHsKIAkJaWd0X3N1YnRlc3RfZigiJXMtYWRkZmIiLCBtb2RpZmllcnNbaV0ubmFtZSkgewog CQkJZGF0YS5tb2RpZmllciA9IG1vZGlmaWVyc1tpXS5tb2RpZmllcjsKLQorCQkJZGF0YS5pYmIg PSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJdGVzdF9hZGRmYigmZGF0 YSk7CisJCQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsKIAkJfQogCX0KIApAQCAtNzExLDcg KzcxNSw5IEBAIGlndF9tYWluCiAJCQkJCWlndF9yZXF1aXJlKGRhdGEuZm9ybWF0ID09IERSTV9G T1JNQVRfQzggfHwKIAkJCQkJCSAgICBpZ3RfZmJfc3VwcG9ydGVkX2Zvcm1hdChkYXRhLmZvcm1h dCkpOwogCQkJCQlpZ3RfcmVxdWlyZShpZ3RfZGlzcGxheV9oYXNfZm9ybWF0X21vZCgmZGF0YS5k aXNwbGF5LCBkYXRhLmZvcm1hdCwgZGF0YS5tb2RpZmllcikpOworCQkJCQlkYXRhLmliYiA9IGlu dGVsX2JiX2NyZWF0ZShkYXRhLmRybV9mZCwgNDA5Nik7CiAJCQkJCXRlc3Rfc2Nhbm91dCgmZGF0 YSk7CisJCQkJCWludGVsX2JiX2Rlc3Ryb3koZGF0YS5pYmIpOwogCQkJCX0KIAkJCX0KIApAQCAt NzIyLDggKzcyOCw2IEBAIGlndF9tYWluCiAKIAlpZ3RfZml4dHVyZSB7CiAJCWlndF9kaXNwbGF5 X2ZpbmkoJmRhdGEuZGlzcGxheSk7Ci0KLQkJaW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJ CWJ1Zl9vcHNfZGVzdHJveShkYXRhLmJvcHMpOwogCX0KIH0KLS0gCjIuMjYuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxp c3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==