Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C9526E459 for ; Mon, 22 Mar 2021 12:38:40 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Mon, 22 Mar 2021 13:37:45 +0100 Message-Id: <20210322123750.94772-32-zbigniew.kempczynski@intel.com> In-Reply-To: <20210322123750.94772-1-zbigniew.kempczynski@intel.com> References: <20210322123750.94772-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v28 31/36] 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 QGNocmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+Ci0tLQogdGVzdHMvaTkxNS9nZW1fY2FjaGluZy5jICAgICAgICAgICAgICB8 IDE0ICsrKysrKysrLS0KIHRlc3RzL2k5MTUvZ2VtX3BhcnRpYWxfcHdyaXRlX3ByZWFkLmMgfCA0 MCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIHRlc3RzL2k5MTUvZ2VtX3JlbmRlcl9jb3B5 LmMgICAgICAgICAgfCAzMSArKysrKysrKysrLS0tLS0tLS0tLS0KIHRlc3RzL2ttc19iaWdfZmIu YyAgICAgICAgICAgICAgICAgICAgfCAxMiArKysrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCA2MSBp bnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2dl bV9jYWNoaW5nLmMgYi90ZXN0cy9pOTE1L2dlbV9jYWNoaW5nLmMKaW5kZXggYmRhZmY2OGEwLi40 ZTg0NDk1MmYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX2NhY2hpbmcuYworKysgYi90ZXN0 cy9pOTE1L2dlbV9jYWNoaW5nLmMKQEAgLTE1OCw3ICsxNTgsNiBAQCBpZ3RfbWFpbgogCQkJZmxh Z3MgPSAwOwogCQl9CiAJCWRhdGEuYm9wcyA9IGJ1Zl9vcHNfY3JlYXRlKGRhdGEuZmQpOwotCQlp YmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5mZCwgUEFHRV9TSVpFKTsKIAogCQlzY3JhdGNoX2J1 ZiA9IGludGVsX2J1Zl9jcmVhdGUoZGF0YS5ib3BzLCBCT19TSVpFLzQsIDEsCiAJCQkJCSAgICAg ICAzMiwgMCwgSTkxNV9USUxJTkdfTk9ORSwgMCk7CkBAIC0xNzQsNiArMTczLDggQEAgaWd0X21h aW4KIAogCQlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCByZWFkc1xuIik7CiAKKwkJaWJiID0g aW50ZWxfYmJfY3JlYXRlKGRhdGEuZmQsIFBBR0VfU0laRSk7CisKIAkJZm9yIChpID0gMDsgaSA8 IFJPVU5EUzsgaSsrKSB7CiAJCQl1aW50OF90IHZhbDAgPSBpOwogCQkJaW50IHN0YXJ0LCBsZW47 CkBAIC0xOTUsMTEgKzE5NiwxNSBAQCBpZ3RfbWFpbgogCiAJCQlpZ3RfcHJvZ3Jlc3MoInBhcnRp YWwgcmVhZHMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAkJfQorCisJCWludGVsX2JiX2Rlc3Ryb3ko aWJiKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdCgid3JpdGVzIikgewogCQlpZ3RfcmVxdWlyZShmbGFn cyAmIFRFU1RfV1JJVEUpOwogCisJCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmZkLCBQQUdF X1NJWkUpOworCiAJCWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHdyaXRlc1xuIik7CiAKIAkJ Zm9yIChpID0gMDsgaSA8IFJPVU5EUzsgaSsrKSB7CkBAIC0yNDAsMTEgKzI0NSwxNSBAQCBpZ3Rf bWFpbgogCiAJCQlpZ3RfcHJvZ3Jlc3MoInBhcnRpYWwgd3JpdGVzIHRlc3Q6ICIsIGksIFJPVU5E Uyk7CiAJCX0KKworCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJfQogCiAJaWd0X3N1YnRlc3Qo InJlYWQtd3JpdGVzIikgewogCQlpZ3RfcmVxdWlyZSgoZmxhZ3MgJiBURVNUX0JPVEgpID09IFRF U1RfQk9USCk7CiAKKwkJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEuZmQsIFBBR0VfU0laRSk7 CisKIAkJaWd0X2luZm8oImNoZWNraW5nIHBhcnRpYWwgd3JpdGVzIGFmdGVyIHBhcnRpYWwgcmVh ZHNcbiIpOwogCiAJCWZvciAoaSA9IDA7IGkgPCBST1VORFM7IGkrKykgewpAQCAtMzA3LDEwICsz MTYsMTEgQEAgaWd0X21haW4KIAogCQkJaWd0X3Byb2dyZXNzKCJwYXJ0aWFsIHJlYWQvd3JpdGVz IHRlc3Q6ICIsIGksIFJPVU5EUyk7CiAJCX0KKworCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJ fQogCiAJaWd0X2ZpeHR1cmUgewotCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJCWludGVsX2J1 Zl9kZXN0cm95KHNjcmF0Y2hfYnVmKTsKIAkJaW50ZWxfYnVmX2Rlc3Ryb3koc3RhZ2luZ19idWYp OwogCQlidWZfb3BzX2Rlc3Ryb3koZGF0YS5ib3BzKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUv Z2VtX3BhcnRpYWxfcHdyaXRlX3ByZWFkLmMgYi90ZXN0cy9pOTE1L2dlbV9wYXJ0aWFsX3B3cml0 ZV9wcmVhZC5jCmluZGV4IDVhMTRkNDI0Yi4uNGY4MWQzNGI4IDEwMDY0NAotLS0gYS90ZXN0cy9p OTE1L2dlbV9wYXJ0aWFsX3B3cml0ZV9wcmVhZC5jCisrKyBiL3Rlc3RzL2k5MTUvZ2VtX3BhcnRp YWxfcHdyaXRlX3ByZWFkLmMKQEAgLTUzLDcgKzUzLDYgQEAgSUdUX1RFU1RfREVTQ1JJUFRJT04o IlRlc3QgcHdyaXRlL3ByZWFkIGNvbnNpc3RlbmN5IHdoZW4gdG91Y2hpbmcgcGFydGlhbCIKICNk ZWZpbmUgUEFHRV9TSVpFIDQwOTYKICNkZWZpbmUgQk9fU0laRSAoNCo0MDk2KQogCi1zdHJ1Y3Qg aW50ZWxfYmIgKmliYjsKIHN0cnVjdCBpbnRlbF9idWYgKnNjcmF0Y2hfYnVmOwogc3RydWN0IGlu dGVsX2J1ZiAqc3RhZ2luZ19idWY7CiAKQEAgLTc3LDcgKzc2LDggQEAgc3RhdGljIHZvaWQgKl9f dHJ5X2d0dF9tYXBfZmlyc3QoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgaW50ZWxfYnVmICpidWYsCiAJ cmV0dXJuIHB0cjsKIH0KIAotc3RhdGljIHZvaWQgY29weV9ibyhzdHJ1Y3QgaW50ZWxfYnVmICpz cmMsIHN0cnVjdCBpbnRlbF9idWYgKmRzdCkKK3N0YXRpYyB2b2lkIGNvcHlfYm8oc3RydWN0IGlu dGVsX2JiICppYmIsCisJCSAgICBzdHJ1Y3QgaW50ZWxfYnVmICpzcmMsIHN0cnVjdCBpbnRlbF9i dWYgKmRzdCkKIHsKIAlib29sIGhhc182NGJfcmVsb2M7CiAKQEAgLTEwOSw4ICsxMDksOCBAQCBz dGF0aWMgdm9pZCBjb3B5X2JvKHN0cnVjdCBpbnRlbF9idWYgKnNyYywgc3RydWN0IGludGVsX2J1 ZiAqZHN0KQogfQogCiBzdGF0aWMgdm9pZAotYmx0X2JvX2ZpbGwoZGF0YV90ICpkYXRhLCBzdHJ1 Y3QgaW50ZWxfYnVmICp0bXBfYm8sCi0JCXN0cnVjdCBpbnRlbF9idWYgKmJvLCB1aW50OF90IHZh bCkKK2JsdF9ib19maWxsKGRhdGFfdCAqZGF0YSwgc3RydWN0IGludGVsX2JiICppYmIsCisJICAg IHN0cnVjdCBpbnRlbF9idWYgKnRtcF9ibywgc3RydWN0IGludGVsX2J1ZiAqYm8sIHVpbnQ4X3Qg dmFsKQogewogCXVpbnQ4X3QgKmd0dF9wdHI7CiAJaW50IGk7CkBAIC0xMjQsNyArMTI0LDcgQEAg Ymx0X2JvX2ZpbGwoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgaW50ZWxfYnVmICp0bXBfYm8sCiAKIAlp Z3RfZHJvcF9jYWNoZXNfc2V0KGRhdGEtPmRybV9mZCwgRFJPUF9CT1VORCk7CiAKLQljb3B5X2Jv KHRtcF9ibywgYm8pOworCWNvcHlfYm8oaWJiLCB0bXBfYm8sIGJvKTsKIH0KIAogI2RlZmluZSBN QVhfQkxUX1NJWkUgMTI4CkBAIC0xMzksMTQgKzEzOSwxNyBAQCBzdGF0aWMgdm9pZCBnZXRfcmFu Z2UoaW50ICpzdGFydCwgaW50ICpsZW4pCiAKIHN0YXRpYyB2b2lkIHRlc3RfcGFydGlhbF9yZWFk cyhkYXRhX3QgKmRhdGEpCiB7CisJc3RydWN0IGludGVsX2JiICppYmI7CiAJaW50IGksIGo7CiAK KwlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS0+ZHJtX2ZkLCBQQUdFX1NJWkUpOworCiAJaWd0 X2luZm8oImNoZWNraW5nIHBhcnRpYWwgcmVhZHNcbiIpOwogCWZvciAoaSA9IDA7IGkgPCBST1VO RFM7IGkrKykgewogCQl1aW50OF90IHZhbCA9IGk7CiAJCWludCBzdGFydCwgbGVuOwogCi0JCWJs dF9ib19maWxsKGRhdGEsIHN0YWdpbmdfYnVmLCBzY3JhdGNoX2J1ZiwgdmFsKTsKKwkJYmx0X2Jv X2ZpbGwoZGF0YSwgaWJiLCBzdGFnaW5nX2J1Ziwgc2NyYXRjaF9idWYsIHZhbCk7CiAKIAkJZ2V0 X3JhbmdlKCZzdGFydCwgJmxlbik7CiAJCWdlbV9yZWFkKGRhdGEtPmRybV9mZCwgc2NyYXRjaF9i dWYtPmhhbmRsZSwgc3RhcnQsIHRtcCwgbGVuKTsKQEAgLTE1OSwyNiArMTYyLDMxIEBAIHN0YXRp YyB2b2lkIHRlc3RfcGFydGlhbF9yZWFkcyhkYXRhX3QgKmRhdGEpCiAKIAkJaWd0X3Byb2dyZXNz KCJwYXJ0aWFsIHJlYWRzIHRlc3Q6ICIsIGksIFJPVU5EUyk7CiAJfQorCisJaW50ZWxfYmJfZGVz dHJveShpYmIpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxfd3JpdGVzKGRhdGFfdCAq ZGF0YSkKIHsKKwlzdHJ1Y3QgaW50ZWxfYmIgKmliYjsKIAlpbnQgaSwgajsKIAl1aW50OF90ICpn dHRfcHRyOwogCisJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEtPmRybV9mZCwgUEFHRV9TSVpF KTsKKwogCWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHdyaXRlc1xuIik7CiAJZm9yIChpID0g MDsgaSA8IFJPVU5EUzsgaSsrKSB7CiAJCXVpbnQ4X3QgdmFsID0gaTsKIAkJaW50IHN0YXJ0LCBs ZW47CiAKLQkJYmx0X2JvX2ZpbGwoZGF0YSwgc3RhZ2luZ19idWYsIHNjcmF0Y2hfYnVmLCB2YWwp OworCQlibHRfYm9fZmlsbChkYXRhLCBpYmIsIHN0YWdpbmdfYnVmLCBzY3JhdGNoX2J1ZiwgdmFs KTsKIAogCQltZW1zZXQodG1wLCBpICsgNjMsIEJPX1NJWkUpOwogCiAJCWdldF9yYW5nZSgmc3Rh cnQsICZsZW4pOwogCQlnZW1fd3JpdGUoZGF0YS0+ZHJtX2ZkLCBzY3JhdGNoX2J1Zi0+aGFuZGxl LCBzdGFydCwgdG1wLCBsZW4pOwogCi0JCWNvcHlfYm8oc2NyYXRjaF9idWYsIHN0YWdpbmdfYnVm KTsKKwkJY29weV9ibyhpYmIsIHNjcmF0Y2hfYnVmLCBzdGFnaW5nX2J1Zik7CiAJCWd0dF9wdHIg PSBfX3RyeV9ndHRfbWFwX2ZpcnN0KGRhdGEsIHN0YWdpbmdfYnVmLCAwKTsKIAogCQlmb3IgKGog PSAwOyBqIDwgc3RhcnQ7IGorKykgewpAQCAtMjAwLDE5ICsyMDgsMjQgQEAgc3RhdGljIHZvaWQg dGVzdF9wYXJ0aWFsX3dyaXRlcyhkYXRhX3QgKmRhdGEpCiAKIAkJaWd0X3Byb2dyZXNzKCJwYXJ0 aWFsIHdyaXRlcyB0ZXN0OiAiLCBpLCBST1VORFMpOwogCX0KKworCWludGVsX2JiX2Rlc3Ryb3ko aWJiKTsKIH0KIAogc3RhdGljIHZvaWQgdGVzdF9wYXJ0aWFsX3JlYWRfd3JpdGVzKGRhdGFfdCAq ZGF0YSkKIHsKKwlzdHJ1Y3QgaW50ZWxfYmIgKmliYjsKIAlpbnQgaSwgajsKIAl1aW50OF90ICpn dHRfcHRyOwogCisJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEtPmRybV9mZCwgUEFHRV9TSVpF KTsKKwogCWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHdyaXRlcyBhZnRlciBwYXJ0aWFsIHJl YWRzXG4iKTsKIAlmb3IgKGkgPSAwOyBpIDwgUk9VTkRTOyBpKyspIHsKIAkJdWludDhfdCB2YWwg PSBpOwogCQlpbnQgc3RhcnQsIGxlbjsKIAotCQlibHRfYm9fZmlsbChkYXRhLCBzdGFnaW5nX2J1 Ziwgc2NyYXRjaF9idWYsIHZhbCk7CisJCWJsdF9ib19maWxsKGRhdGEsIGliYiwgc3RhZ2luZ19i dWYsIHNjcmF0Y2hfYnVmLCB2YWwpOwogCiAJCS8qIHBhcnRpYWwgcmVhZCAqLwogCQlnZXRfcmFu Z2UoJnN0YXJ0LCAmbGVuKTsKQEAgLTIyNiw3ICsyMzksNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X3Bh cnRpYWxfcmVhZF93cml0ZXMoZGF0YV90ICpkYXRhKQogCQkvKiBDaGFuZ2UgY29udGVudHMgdGhy b3VnaCBndHQgdG8gbWFrZSB0aGUgcHJlYWQgY2FjaGVsaW5lcwogCQkgKiBzdGFsZS4gKi8KIAkJ dmFsICs9IDE3OwotCQlibHRfYm9fZmlsbChkYXRhLCBzdGFnaW5nX2J1Ziwgc2NyYXRjaF9idWYs IHZhbCk7CisJCWJsdF9ib19maWxsKGRhdGEsIGliYiwgc3RhZ2luZ19idWYsIHNjcmF0Y2hfYnVm LCB2YWwpOwogCiAJCS8qIHBhcnRpYWwgd3JpdGUgKi8KIAkJbWVtc2V0KHRtcCwgaSArIDYzLCBC T19TSVpFKTsKQEAgLTIzNCw3ICsyNDcsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxfcmVh ZF93cml0ZXMoZGF0YV90ICpkYXRhKQogCQlnZXRfcmFuZ2UoJnN0YXJ0LCAmbGVuKTsKIAkJZ2Vt X3dyaXRlKGRhdGEtPmRybV9mZCwgc2NyYXRjaF9idWYtPmhhbmRsZSwgc3RhcnQsIHRtcCwgbGVu KTsKIAotCQljb3B5X2JvKHNjcmF0Y2hfYnVmLCBzdGFnaW5nX2J1Zik7CisJCWNvcHlfYm8oaWJi LCBzY3JhdGNoX2J1Ziwgc3RhZ2luZ19idWYpOwogCQlndHRfcHRyID0gX190cnlfZ3R0X21hcF9m aXJzdChkYXRhLCBzdGFnaW5nX2J1ZiwgMCk7CiAKIAkJZm9yIChqID0gMDsgaiA8IHN0YXJ0OyBq KyspIHsKQEAgLTI1Niw2ICsyNjksOCBAQCBzdGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxfcmVhZF93 cml0ZXMoZGF0YV90ICpkYXRhKQogCiAJCWlndF9wcm9ncmVzcygicGFydGlhbCByZWFkL3dyaXRl cyB0ZXN0OiAiLCBpLCBST1VORFMpOwogCX0KKworCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKIH0K IAogc3RhdGljIHZvaWQgZG9fdGVzdHMoZGF0YV90ICpkYXRhLCBpbnQgY2FjaGVfbGV2ZWwsIGNv bnN0IGNoYXIgKnN1ZmZpeCkKQEAgLTI4OSw4ICszMDQsNiBAQCBpZ3RfbWFpbgogCQlkYXRhLmRl dmlkID0gaW50ZWxfZ2V0X2RybV9kZXZpZChkYXRhLmRybV9mZCk7CiAJCWRhdGEuYm9wcyA9IGJ1 Zl9vcHNfY3JlYXRlKGRhdGEuZHJtX2ZkKTsKIAotCQlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0 YS5kcm1fZmQsIFBBR0VfU0laRSk7Ci0KIAkJLyogb3ZlcmFsbG9jYXRlIHRoZSBidWZmZXJzIHdl J3JlIGFjdHVhbGx5IHVzaW5nIGJlY2F1c2UgKi8JCiAJCXNjcmF0Y2hfYnVmID0gaW50ZWxfYnVm X2NyZWF0ZShkYXRhLmJvcHMsIEJPX1NJWkUvNCwgMSwgMzIsIDAsIEk5MTVfVElMSU5HX05PTkUs IDApOwogCQlzdGFnaW5nX2J1ZiA9IGludGVsX2J1Zl9jcmVhdGUoZGF0YS5ib3BzLCBCT19TSVpF LzQsIDEsIDMyLCAwLCBJOTE1X1RJTElOR19OT05FLCAwKTsKQEAgLTMwNCw3ICszMTcsNiBAQCBp Z3RfbWFpbgogCWRvX3Rlc3RzKCZkYXRhLCAyLCAiLWRpc3BsYXkiKTsKIAogCWlndF9maXh0dXJl IHsKLQkJaW50ZWxfYmJfZGVzdHJveShpYmIpOwogCQlpbnRlbF9idWZfZGVzdHJveShzY3JhdGNo X2J1Zik7CiAJCWludGVsX2J1Zl9kZXN0cm95KHN0YWdpbmdfYnVmKTsKIAkJYnVmX29wc19kZXN0 cm95KGRhdGEuYm9wcyk7CmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2dlbV9yZW5kZXJfY29weS5j IGIvdGVzdHMvaTkxNS9nZW1fcmVuZGVyX2NvcHkuYwppbmRleCBhZmM0OTBmMWEuLmU0OGI1Yjk5 NiAxMDA2NDQKLS0tIGEvdGVzdHMvaTkxNS9nZW1fcmVuZGVyX2NvcHkuYworKysgYi90ZXN0cy9p OTE1L2dlbV9yZW5kZXJfY29weS5jCkBAIC01OCw3ICs1OCw2IEBAIHR5cGVkZWYgc3RydWN0IHsK IAlpbnQgZHJtX2ZkOwogCXVpbnQzMl90IGRldmlkOwogCXN0cnVjdCBidWZfb3BzICpib3BzOwot CXN0cnVjdCBpbnRlbF9iYiAqaWJiOwogCWlndF9yZW5kZXJfY29weWZ1bmNfdCByZW5kZXJfY29w eTsKIAlpZ3RfdmVib3hfY29weWZ1bmNfdCB2ZWJveF9jb3B5OwogfSBkYXRhX3Q7CkBAIC0zNDEs NiArMzQwLDcgQEAgc3RhdGljIHZvaWQgdGVzdChkYXRhX3QgKmRhdGEsIHVpbnQzMl90IHNyY190 aWxpbmcsIHVpbnQzMl90IGRzdF90aWxpbmcsCiAJCSBlbnVtIGk5MTVfY29tcHJlc3Npb24gZHN0 X2NvbXByZXNzaW9uLAogCQkgaW50IGZsYWdzKQogeworCXN0cnVjdCBpbnRlbF9iYiAqaWJiOwog CXN0cnVjdCBpbnRlbF9idWYgcmVmLCBzcmNfdGlsZWQsIHNyY19jY3MsIGRzdF9jY3MsIGRzdDsK IAlzdHJ1Y3QgewogCQlzdHJ1Y3QgaW50ZWxfYnVmIGJ1ZjsKQEAgLTM5Nyw2ICszOTcsOCBAQCBz dGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMy X3QgZHN0X3RpbGluZywKIAkgICAgc3JjX2NvbXByZXNzZWQgfHwgZHN0X2NvbXByZXNzZWQpCiAJ CWlndF9yZXF1aXJlKGludGVsX2dlbihkYXRhLT5kZXZpZCkgPj0gOSk7CiAKKwlpYmIgPSBpbnRl bF9iYl9jcmVhdGUoZGF0YS0+ZHJtX2ZkLCA0MDk2KTsKKwogCWZvciAoaW50IGkgPSAwOyBpIDwg bnVtX3NyYzsgaSsrKQogCQlzY3JhdGNoX2J1Zl9pbml0KGRhdGEsICZzcmNbaV0uYnVmLCBXSURU SCwgSEVJR0hULCBzcmNbaV0udGlsaW5nLAogCQkJCSBJOTE1X0NPTVBSRVNTSU9OX05PTkUpOwpA QCAtNDU2LDEyICs0NTgsMTIgQEAgc3RhdGljIHZvaWQgdGVzdChkYXRhX3QgKmRhdGEsIHVpbnQz Ml90IHNyY190aWxpbmcsIHVpbnQzMl90IGRzdF90aWxpbmcsCiAJICovCiAJaWYgKHNyY19taXhl ZF90aWxlZCkgewogCQlpZiAoZHN0X2NvbXByZXNzZWQpCi0JCQlkYXRhLT5yZW5kZXJfY29weShk YXRhLT5pYmIsCisJCQlkYXRhLT5yZW5kZXJfY29weShpYmIsCiAJCQkJCSAgJmRzdCwgMCwgMCwg V0lEVEgsIEhFSUdIVCwKIAkJCQkJICAmZHN0X2NjcywgMCwgMCk7CiAKIAkJZm9yIChpbnQgaSA9 IDA7IGkgPCBudW1fc3JjOyBpKyspIHsKLQkJCWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwK KwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICAmc3JjW2ldLmJ1ZiwKIAkJCQkJICBX SURUSC80LCBIRUlHSFQvNCwgV0lEVEgvMi0yLCBIRUlHSFQvMi0yLAogCQkJCQkgIGRzdF9jb21w cmVzc2VkID8gJmRzdF9jY3MgOiAmZHN0LApAQCAtNDY5LDEzICs0NzEsMTMgQEAgc3RhdGljIHZv aWQgdGVzdChkYXRhX3QgKmRhdGEsIHVpbnQzMl90IHNyY190aWxpbmcsIHVpbnQzMl90IGRzdF90 aWxpbmcsCiAJCX0KIAogCQlpZiAoZHN0X2NvbXByZXNzZWQpCi0JCQlkYXRhLT5yZW5kZXJfY29w eShkYXRhLT5pYmIsCisJCQlkYXRhLT5yZW5kZXJfY29weShpYmIsCiAJCQkJCSAgJmRzdF9jY3Ms IDAsIDAsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAgJmRzdCwgMCwgMCk7CiAKIAl9IGVsc2Ugewog CQlpZiAoc3JjX2NvbXByZXNzaW9uID09IEk5MTVfQ09NUFJFU1NJT05fUkVOREVSKSB7Ci0JCQlk YXRhLT5yZW5kZXJfY29weShkYXRhLT5pYmIsCisJCQlkYXRhLT5yZW5kZXJfY29weShpYmIsCiAJ CQkJCSAgJnNyY190aWxlZCwgMCwgMCwgV0lEVEgsIEhFSUdIVCwKIAkJCQkJICAmc3JjX2NjcywK IAkJCQkJICAwLCAwKTsKQEAgLTQ4Niw3ICs0ODgsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFf dCAqZGF0YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkJCQkJ CSAgICAgICAicmVuZGVyLXNyY19jY3MuYmluIik7CiAJCQl9CiAJCX0gZWxzZSBpZiAoc3JjX2Nv bXByZXNzaW9uID09IEk5MTVfQ09NUFJFU1NJT05fTUVESUEpIHsKLQkJCWRhdGEtPnZlYm94X2Nv cHkoZGF0YS0+aWJiLAorCQkJZGF0YS0+dmVib3hfY29weShpYmIsCiAJCQkJCSAmc3JjX3RpbGVk LCBXSURUSCwgSEVJR0hULAogCQkJCQkgJnNyY19jY3MpOwogCQkJaWYgKGR1bXBfY29tcHJlc3Nl ZF9zcmNfYnVmKSB7CkBAIC00OTgsMzQgKzUwMCwzNCBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFf dCAqZGF0YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkJfQog CiAJCWlmIChkc3RfY29tcHJlc3Npb24gPT0gSTkxNV9DT01QUkVTU0lPTl9SRU5ERVIpIHsKLQkJ CWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwK IAkJCQkJICBzcmNfY29tcHJlc3NlZCA/ICZzcmNfY2NzIDogJnNyY190aWxlZCwKIAkJCQkJICAw LCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZkc3RfY2NzLAogCQkJCQkgIDAsIDApOwogCi0J CQlkYXRhLT5yZW5kZXJfY29weShkYXRhLT5pYmIsCisJCQlkYXRhLT5yZW5kZXJfY29weShpYmIs CiAJCQkJCSAgJmRzdF9jY3MsCiAJCQkJCSAgMCwgMCwgV0lEVEgsIEhFSUdIVCwKIAkJCQkJICAm ZHN0LAogCQkJCQkgIDAsIDApOwogCQl9IGVsc2UgaWYgKGRzdF9jb21wcmVzc2lvbiA9PSBJOTE1 X0NPTVBSRVNTSU9OX01FRElBKSB7Ci0JCQlkYXRhLT52ZWJveF9jb3B5KGRhdGEtPmliYiwKKwkJ CWRhdGEtPnZlYm94X2NvcHkoaWJiLAogCQkJCQkgc3JjX2NvbXByZXNzZWQgPyAmc3JjX2NjcyA6 ICZzcmNfdGlsZWQsCiAJCQkJCSBXSURUSCwgSEVJR0hULAogCQkJCQkgJmRzdF9jY3MpOwogCi0J CQlkYXRhLT52ZWJveF9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnZlYm94X2NvcHkoaWJiLAog CQkJCQkgJmRzdF9jY3MsCiAJCQkJCSBXSURUSCwgSEVJR0hULAogCQkJCQkgJmRzdCk7CiAJCX0g ZWxzZSBpZiAoZm9yY2VfdmVib3hfZHN0X2NvcHkpIHsKLQkJCWRhdGEtPnZlYm94X2NvcHkoZGF0 YS0+aWJiLAorCQkJZGF0YS0+dmVib3hfY29weShpYmIsCiAJCQkJCSBzcmNfY29tcHJlc3NlZCA/ ICZzcmNfY2NzIDogJnNyY190aWxlZCwKIAkJCQkJIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmZHN0 KTsKIAkJfSBlbHNlIHsKLQkJCWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEt PnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICBzcmNfY29tcHJlc3NlZCA/ICZzcmNfY2NzIDogJnNy Y190aWxlZCwKIAkJCQkJICAwLCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZkc3QsCkBAIC01 NzIsOCArNTc0LDcgQEAgc3RhdGljIHZvaWQgdGVzdChkYXRhX3QgKmRhdGEsIHVpbnQzMl90IHNy Y190aWxpbmcsIHVpbnQzMl90IGRzdF90aWxpbmcsCiAJZm9yIChpbnQgaSA9IDA7IGkgPCBudW1f c3JjOyBpKyspCiAJCXNjcmF0Y2hfYnVmX2ZpbmkoJnNyY1tpXS5idWYpOwogCi0JLyogaGFuZGxl cyBnb25lLCBuZWVkIHRvIGNsZWFuIHRoZSBvYmplY3RzIGNhY2hlIHdpdGhpbiBpbnRlbF9iYiAq LwotCWludGVsX2JiX3Jlc2V0KGRhdGEtPmliYiwgdHJ1ZSk7CisJaW50ZWxfYmJfZGVzdHJveShp YmIpOwogfQogCiBzdGF0aWMgaW50IG9wdF9oYW5kbGVyKGludCBvcHQsIGludCBvcHRfaW5kZXgs IHZvaWQgKmRhdGEpCkBAIC03OTYsNyArNzk3LDYgQEAgaWd0X21haW5fYXJncygiZGFjIiwgTlVM TCwgaGVscF9zdHIsIG9wdF9oYW5kbGVyLCBOVUxMKQogCQlkYXRhLnZlYm94X2NvcHkgPSBpZ3Rf Z2V0X3ZlYm94X2NvcHlmdW5jKGRhdGEuZGV2aWQpOwogCiAJCWRhdGEuYm9wcyA9IGJ1Zl9vcHNf Y3JlYXRlKGRhdGEuZHJtX2ZkKTsKLQkJZGF0YS5pYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5k cm1fZmQsIDQwOTYpOwogCiAJCWlndF9mb3JrX2hhbmdfZGV0ZWN0b3IoZGF0YS5kcm1fZmQpOwog CX0KQEAgLTg0OSw3ICs4NDksNiBAQCBpZ3RfbWFpbl9hcmdzKCJkYWMiLCBOVUxMLCBoZWxwX3N0 ciwgb3B0X2hhbmRsZXIsIE5VTEwpCiAKIAlpZ3RfZml4dHVyZSB7CiAJCWlndF9zdG9wX2hhbmdf ZGV0ZWN0b3IoKTsKLQkJaW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJCWJ1Zl9vcHNfZGVz dHJveShkYXRhLmJvcHMpOwogCX0KIH0KZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19iaWdfZmIuYyBi L3Rlc3RzL2ttc19iaWdfZmIuYwppbmRleCA1MjYwMTc2ZTEuLmI2NzA3YTVhNCAxMDA2NDQKLS0t IGEvdGVzdHMva21zX2JpZ19mYi5jCisrKyBiL3Rlc3RzL2ttc19iaWdfZmIuYwpAQCAtNjY0LDcg KzY2NCw2IEBAIGlndF9tYWluCiAJCQlkYXRhLnJlbmRlcl9jb3B5ID0gaWd0X2dldF9yZW5kZXJf Y29weWZ1bmMoZGF0YS5kZXZpZCk7CiAKIAkJZGF0YS5ib3BzID0gYnVmX29wc19jcmVhdGUoZGF0 YS5kcm1fZmQpOwotCQlkYXRhLmliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmRybV9mZCwgNDA5 Nik7CiAJfQogCiAJLyoKQEAgLTY3Nyw3ICs2NzYsOSBAQCBpZ3RfbWFpbgogCQlpZ3Rfc3VidGVz dF9mKCIlcy1hZGRmYi1zaXplLW92ZXJmbG93IiwKIAkJCSAgICAgIG1vZGlmaWVyc1tpXS5uYW1l KSB7CiAJCQlkYXRhLm1vZGlmaWVyID0gbW9kaWZpZXJzW2ldLm1vZGlmaWVyOworCQkJZGF0YS5p YmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJdGVzdF9zaXplX292 ZXJmbG93KCZkYXRhKTsKKwkJCWludGVsX2JiX2Rlc3Ryb3koZGF0YS5pYmIpOwogCQl9CiAJfQog CkBAIC02ODUsMTUgKzY4NiwxOCBAQCBpZ3RfbWFpbgogCQlpZ3Rfc3VidGVzdF9mKCIlcy1hZGRm Yi1zaXplLW9mZnNldC1vdmVyZmxvdyIsCiAJCQkgICAgICBtb2RpZmllcnNbaV0ubmFtZSkgewog CQkJZGF0YS5tb2RpZmllciA9IG1vZGlmaWVyc1tpXS5tb2RpZmllcjsKKwkJCWRhdGEuaWJiID0g aW50ZWxfYmJfY3JlYXRlKGRhdGEuZHJtX2ZkLCA0MDk2KTsKIAkJCXRlc3Rfc2l6ZV9vZmZzZXRf b3ZlcmZsb3coJmRhdGEpOworCQkJaW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJCX0KIAl9 CiAKIAlmb3IgKGludCBpID0gMDsgaSA8IEFSUkFZX1NJWkUobW9kaWZpZXJzKTsgaSsrKSB7CiAJ CWlndF9zdWJ0ZXN0X2YoIiVzLWFkZGZiIiwgbW9kaWZpZXJzW2ldLm5hbWUpIHsKIAkJCWRhdGEu bW9kaWZpZXIgPSBtb2RpZmllcnNbaV0ubW9kaWZpZXI7Ci0KKwkJCWRhdGEuaWJiID0gaW50ZWxf YmJfY3JlYXRlKGRhdGEuZHJtX2ZkLCA0MDk2KTsKIAkJCXRlc3RfYWRkZmIoJmRhdGEpOworCQkJ aW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJCX0KIAl9CiAKQEAgLTcxMSw3ICs3MTUsOSBA QCBpZ3RfbWFpbgogCQkJCQlpZ3RfcmVxdWlyZShkYXRhLmZvcm1hdCA9PSBEUk1fRk9STUFUX0M4 IHx8CiAJCQkJCQkgICAgaWd0X2ZiX3N1cHBvcnRlZF9mb3JtYXQoZGF0YS5mb3JtYXQpKTsKIAkJ CQkJaWd0X3JlcXVpcmUoaWd0X2Rpc3BsYXlfaGFzX2Zvcm1hdF9tb2QoJmRhdGEuZGlzcGxheSwg ZGF0YS5mb3JtYXQsIGRhdGEubW9kaWZpZXIpKTsKKwkJCQkJZGF0YS5pYmIgPSBpbnRlbF9iYl9j cmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJCQl0ZXN0X3NjYW5vdXQoJmRhdGEpOworCQkJ CQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsKIAkJCQl9CiAJCQl9CiAKQEAgLTcyMiw4ICs3 MjgsNiBAQCBpZ3RfbWFpbgogCiAJaWd0X2ZpeHR1cmUgewogCQlpZ3RfZGlzcGxheV9maW5pKCZk YXRhLmRpc3BsYXkpOwotCi0JCWludGVsX2JiX2Rlc3Ryb3koZGF0YS5pYmIpOwogCQlidWZfb3Bz X2Rlc3Ryb3koZGF0YS5ib3BzKTsKIAl9CiB9Ci0tIAoyLjI2LjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1k ZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaWd0LWRldgo=