From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 23F6F6F888 for ; Fri, 23 Oct 2020 12:42:53 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Fri, 23 Oct 2020 14:42:07 +0200 Message-Id: <20201023124212.26428-19-zbigniew.kempczynski@intel.com> In-Reply-To: <20201023124212.26428-1-zbigniew.kempczynski@intel.com> References: <20201023124212.26428-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v3 18/23] 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 Cc: Chris Wilson List-ID: QXMgaW50ZWxfYmIgIm9wZW5zIiBjb25uZWN0aW9uIHRvIGFsbG9jYXRvciB3aGVuIHRlc3QgY29t cGxldGVzIGl0IGNhbgpsZWF2ZSBhbGxvY2F0b3IgaW4gdW5rbm93biBzdGF0ZSAobW9zdGx5IGlu IGZhaWxlZCB0ZXN0cykuIEFzIGlndF9jb3JlCndhcyBhcm1lZCBpbiByZXNldHRpbmcgYWxsb2Nh dG9yIGluZnJhc3RydWN0dXJlIGNvbm5lY3Rpb24gdG8gaXQgaW5zaWRlCmludGVsX2JiIGlzIG5v dCB2YWxpZCBhbnltb3JlLiBUcnlpbmcgdG8gdXNlIGl0IGxlYWRzIHRvIGNhdGFzdHJvZmljCmVy cm9ycy4KCk1pZ3JhdGUgaW50ZWxfYmIgb3V0IG9mIGZpeHR1cmUgYW5kIGNyZWF0ZSBpdCBpbnNp ZGUgdGVzdHMgaW5kaXZpZHVhbGx5LgoKU2lnbmVkLW9mZi1ieTogWmJpZ25pZXcgS2VtcGN6ecWE c2tpIDx6Ymlnbmlldy5rZW1wY3p5bnNraUBpbnRlbC5jb20+CkNjOiBEb21pbmlrIEdyemVnb3J6 ZWsgPGRvbWluaWsuZ3J6ZWdvcnpla0BpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiB0ZXN0cy9pOTE1L2dlbV9jYWNoaW5nLmMgICAgICAg ICAgICAgIHwgMTQgKysrKysrKystLQogdGVzdHMvaTkxNS9nZW1fcGFydGlhbF9wd3JpdGVfcHJl YWQuYyB8IDQwICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogdGVzdHMvaTkxNS9nZW1fcmVu ZGVyX2NvcHkuYyAgICAgICAgICB8IDMxICsrKysrKysrKystLS0tLS0tLS0tLQogdGVzdHMva21z X2JpZ19mYi5jICAgICAgICAgICAgICAgICAgICB8IDEyICsrKysrLS0tCiA0IGZpbGVzIGNoYW5n ZWQsIDYxIGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3Rz L2k5MTUvZ2VtX2NhY2hpbmcuYyBiL3Rlc3RzL2k5MTUvZ2VtX2NhY2hpbmcuYwppbmRleCBiZGFm ZjY4YS4uNGU4NDQ5NTIgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX2NhY2hpbmcuYworKysg Yi90ZXN0cy9pOTE1L2dlbV9jYWNoaW5nLmMKQEAgLTE1OCw3ICsxNTgsNiBAQCBpZ3RfbWFpbgog CQkJZmxhZ3MgPSAwOwogCQl9CiAJCWRhdGEuYm9wcyA9IGJ1Zl9vcHNfY3JlYXRlKGRhdGEuZmQp OwotCQlpYmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5mZCwgUEFHRV9TSVpFKTsKIAogCQlzY3Jh dGNoX2J1ZiA9IGludGVsX2J1Zl9jcmVhdGUoZGF0YS5ib3BzLCBCT19TSVpFLzQsIDEsCiAJCQkJ CSAgICAgICAzMiwgMCwgSTkxNV9USUxJTkdfTk9ORSwgMCk7CkBAIC0xNzQsNiArMTczLDggQEAg aWd0X21haW4KIAogCQlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCByZWFkc1xuIik7CiAKKwkJ aWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEuZmQsIFBBR0VfU0laRSk7CisKIAkJZm9yIChpID0g MDsgaSA8IFJPVU5EUzsgaSsrKSB7CiAJCQl1aW50OF90IHZhbDAgPSBpOwogCQkJaW50IHN0YXJ0 LCBsZW47CkBAIC0xOTUsMTEgKzE5NiwxNSBAQCBpZ3RfbWFpbgogCiAJCQlpZ3RfcHJvZ3Jlc3Mo InBhcnRpYWwgcmVhZHMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAkJfQorCisJCWludGVsX2JiX2Rl c3Ryb3koaWJiKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdCgid3JpdGVzIikgewogCQlpZ3RfcmVxdWly ZShmbGFncyAmIFRFU1RfV1JJVEUpOwogCisJCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmZk LCBQQUdFX1NJWkUpOworCiAJCWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHdyaXRlc1xuIik7 CiAKIAkJZm9yIChpID0gMDsgaSA8IFJPVU5EUzsgaSsrKSB7CkBAIC0yNDAsMTEgKzI0NSwxNSBA QCBpZ3RfbWFpbgogCiAJCQlpZ3RfcHJvZ3Jlc3MoInBhcnRpYWwgd3JpdGVzIHRlc3Q6ICIsIGks IFJPVU5EUyk7CiAJCX0KKworCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJfQogCiAJaWd0X3N1 YnRlc3QoInJlYWQtd3JpdGVzIikgewogCQlpZ3RfcmVxdWlyZSgoZmxhZ3MgJiBURVNUX0JPVEgp ID09IFRFU1RfQk9USCk7CiAKKwkJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEuZmQsIFBBR0Vf U0laRSk7CisKIAkJaWd0X2luZm8oImNoZWNraW5nIHBhcnRpYWwgd3JpdGVzIGFmdGVyIHBhcnRp YWwgcmVhZHNcbiIpOwogCiAJCWZvciAoaSA9IDA7IGkgPCBST1VORFM7IGkrKykgewpAQCAtMzA3 LDEwICszMTYsMTEgQEAgaWd0X21haW4KIAogCQkJaWd0X3Byb2dyZXNzKCJwYXJ0aWFsIHJlYWQv d3JpdGVzIHRlc3Q6ICIsIGksIFJPVU5EUyk7CiAJCX0KKworCQlpbnRlbF9iYl9kZXN0cm95KGli Yik7CiAJfQogCiAJaWd0X2ZpeHR1cmUgewotCQlpbnRlbF9iYl9kZXN0cm95KGliYik7CiAJCWlu dGVsX2J1Zl9kZXN0cm95KHNjcmF0Y2hfYnVmKTsKIAkJaW50ZWxfYnVmX2Rlc3Ryb3koc3RhZ2lu Z19idWYpOwogCQlidWZfb3BzX2Rlc3Ryb3koZGF0YS5ib3BzKTsKZGlmZiAtLWdpdCBhL3Rlc3Rz L2k5MTUvZ2VtX3BhcnRpYWxfcHdyaXRlX3ByZWFkLmMgYi90ZXN0cy9pOTE1L2dlbV9wYXJ0aWFs X3B3cml0ZV9wcmVhZC5jCmluZGV4IDcyYzMzNTM5Li5jMmNhNTYxZSAxMDA2NDQKLS0tIGEvdGVz dHMvaTkxNS9nZW1fcGFydGlhbF9wd3JpdGVfcHJlYWQuYworKysgYi90ZXN0cy9pOTE1L2dlbV9w YXJ0aWFsX3B3cml0ZV9wcmVhZC5jCkBAIC01Myw3ICs1Myw2IEBAIElHVF9URVNUX0RFU0NSSVBU SU9OKCJUZXN0IHB3cml0ZS9wcmVhZCBjb25zaXN0ZW5jeSB3aGVuIHRvdWNoaW5nIHBhcnRpYWwi CiAjZGVmaW5lIFBBR0VfU0laRSA0MDk2CiAjZGVmaW5lIEJPX1NJWkUgKDQqNDA5NikKIAotc3Ry dWN0IGludGVsX2JiICppYmI7CiBzdHJ1Y3QgaW50ZWxfYnVmICpzY3JhdGNoX2J1ZjsKIHN0cnVj dCBpbnRlbF9idWYgKnN0YWdpbmdfYnVmOwogCkBAIC03Nyw3ICs3Niw4IEBAIHN0YXRpYyB2b2lk ICpfX3RyeV9ndHRfbWFwX2ZpcnN0KGRhdGFfdCAqZGF0YSwgc3RydWN0IGludGVsX2J1ZiAqYnVm LAogCXJldHVybiBwdHI7CiB9CiAKLXN0YXRpYyB2b2lkIGNvcHlfYm8oc3RydWN0IGludGVsX2J1 ZiAqc3JjLCBzdHJ1Y3QgaW50ZWxfYnVmICpkc3QpCitzdGF0aWMgdm9pZCBjb3B5X2JvKHN0cnVj dCBpbnRlbF9iYiAqaWJiLAorCQkgICAgc3RydWN0IGludGVsX2J1ZiAqc3JjLCBzdHJ1Y3QgaW50 ZWxfYnVmICpkc3QpCiB7CiAJYm9vbCBoYXNfNjRiX3JlbG9jOwogCkBAIC0xMDksOCArMTA5LDgg QEAgc3RhdGljIHZvaWQgY29weV9ibyhzdHJ1Y3QgaW50ZWxfYnVmICpzcmMsIHN0cnVjdCBpbnRl bF9idWYgKmRzdCkKIH0KIAogc3RhdGljIHZvaWQKLWJsdF9ib19maWxsKGRhdGFfdCAqZGF0YSwg c3RydWN0IGludGVsX2J1ZiAqdG1wX2JvLAotCQlzdHJ1Y3QgaW50ZWxfYnVmICpibywgdWludDhf dCB2YWwpCitibHRfYm9fZmlsbChkYXRhX3QgKmRhdGEsIHN0cnVjdCBpbnRlbF9iYiAqaWJiLAor CSAgICBzdHJ1Y3QgaW50ZWxfYnVmICp0bXBfYm8sIHN0cnVjdCBpbnRlbF9idWYgKmJvLCB1aW50 OF90IHZhbCkKIHsKIAl1aW50OF90ICpndHRfcHRyOwogCWludCBpOwpAQCAtMTI0LDcgKzEyNCw3 IEBAIGJsdF9ib19maWxsKGRhdGFfdCAqZGF0YSwgc3RydWN0IGludGVsX2J1ZiAqdG1wX2JvLAog CiAJaWd0X2Ryb3BfY2FjaGVzX3NldChkYXRhLT5kcm1fZmQsIERST1BfQk9VTkQpOwogCi0JY29w eV9ibyh0bXBfYm8sIGJvKTsKKwljb3B5X2JvKGliYiwgdG1wX2JvLCBibyk7CiB9CiAKICNkZWZp bmUgTUFYX0JMVF9TSVpFIDEyOApAQCAtMTM5LDE0ICsxMzksMTcgQEAgc3RhdGljIHZvaWQgZ2V0 X3JhbmdlKGludCAqc3RhcnQsIGludCAqbGVuKQogCiBzdGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxf cmVhZHMoZGF0YV90ICpkYXRhKQogeworCXN0cnVjdCBpbnRlbF9iYiAqaWJiOwogCWludCBpLCBq OwogCisJaWJiID0gaW50ZWxfYmJfY3JlYXRlKGRhdGEtPmRybV9mZCwgUEFHRV9TSVpFKTsKKwog CWlndF9pbmZvKCJjaGVja2luZyBwYXJ0aWFsIHJlYWRzXG4iKTsKIAlmb3IgKGkgPSAwOyBpIDwg Uk9VTkRTOyBpKyspIHsKIAkJdWludDhfdCB2YWwgPSBpOwogCQlpbnQgc3RhcnQsIGxlbjsKIAot CQlibHRfYm9fZmlsbChkYXRhLCBzdGFnaW5nX2J1Ziwgc2NyYXRjaF9idWYsIHZhbCk7CisJCWJs dF9ib19maWxsKGRhdGEsIGliYiwgc3RhZ2luZ19idWYsIHNjcmF0Y2hfYnVmLCB2YWwpOwogCiAJ CWdldF9yYW5nZSgmc3RhcnQsICZsZW4pOwogCQlnZW1fcmVhZChkYXRhLT5kcm1fZmQsIHNjcmF0 Y2hfYnVmLT5oYW5kbGUsIHN0YXJ0LCB0bXAsIGxlbik7CkBAIC0xNTksMjYgKzE2MiwzMSBAQCBz dGF0aWMgdm9pZCB0ZXN0X3BhcnRpYWxfcmVhZHMoZGF0YV90ICpkYXRhKQogCiAJCWlndF9wcm9n cmVzcygicGFydGlhbCByZWFkcyB0ZXN0OiAiLCBpLCBST1VORFMpOwogCX0KKworCWludGVsX2Ji X2Rlc3Ryb3koaWJiKTsKIH0KIAogc3RhdGljIHZvaWQgdGVzdF9wYXJ0aWFsX3dyaXRlcyhkYXRh X3QgKmRhdGEpCiB7CisJc3RydWN0IGludGVsX2JiICppYmI7CiAJaW50IGksIGo7CiAJdWludDhf dCAqZ3R0X3B0cjsKIAorCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLT5kcm1fZmQsIFBBR0Vf U0laRSk7CisKIAlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCB3cml0ZXNcbiIpOwogCWZvciAo aSA9IDA7IGkgPCBST1VORFM7IGkrKykgewogCQl1aW50OF90IHZhbCA9IGk7CiAJCWludCBzdGFy dCwgbGVuOwogCi0JCWJsdF9ib19maWxsKGRhdGEsIHN0YWdpbmdfYnVmLCBzY3JhdGNoX2J1Ziwg dmFsKTsKKwkJYmx0X2JvX2ZpbGwoZGF0YSwgaWJiLCBzdGFnaW5nX2J1Ziwgc2NyYXRjaF9idWYs IHZhbCk7CiAKIAkJbWVtc2V0KHRtcCwgaSArIDYzLCBCT19TSVpFKTsKIAogCQlnZXRfcmFuZ2Uo JnN0YXJ0LCAmbGVuKTsKIAkJZ2VtX3dyaXRlKGRhdGEtPmRybV9mZCwgc2NyYXRjaF9idWYtPmhh bmRsZSwgc3RhcnQsIHRtcCwgbGVuKTsKIAotCQljb3B5X2JvKHNjcmF0Y2hfYnVmLCBzdGFnaW5n X2J1Zik7CisJCWNvcHlfYm8oaWJiLCBzY3JhdGNoX2J1Ziwgc3RhZ2luZ19idWYpOwogCQlndHRf cHRyID0gX190cnlfZ3R0X21hcF9maXJzdChkYXRhLCBzdGFnaW5nX2J1ZiwgMCk7CiAKIAkJZm9y IChqID0gMDsgaiA8IHN0YXJ0OyBqKyspIHsKQEAgLTIwMCwxOSArMjA4LDI0IEBAIHN0YXRpYyB2 b2lkIHRlc3RfcGFydGlhbF93cml0ZXMoZGF0YV90ICpkYXRhKQogCiAJCWlndF9wcm9ncmVzcygi cGFydGlhbCB3cml0ZXMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAl9CisKKwlpbnRlbF9iYl9kZXN0 cm95KGliYik7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RfcGFydGlhbF9yZWFkX3dyaXRlcyhkYXRh X3QgKmRhdGEpCiB7CisJc3RydWN0IGludGVsX2JiICppYmI7CiAJaW50IGksIGo7CiAJdWludDhf dCAqZ3R0X3B0cjsKIAorCWliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLT5kcm1fZmQsIFBBR0Vf U0laRSk7CisKIAlpZ3RfaW5mbygiY2hlY2tpbmcgcGFydGlhbCB3cml0ZXMgYWZ0ZXIgcGFydGlh bCByZWFkc1xuIik7CiAJZm9yIChpID0gMDsgaSA8IFJPVU5EUzsgaSsrKSB7CiAJCXVpbnQ4X3Qg dmFsID0gaTsKIAkJaW50IHN0YXJ0LCBsZW47CiAKLQkJYmx0X2JvX2ZpbGwoZGF0YSwgc3RhZ2lu Z19idWYsIHNjcmF0Y2hfYnVmLCB2YWwpOworCQlibHRfYm9fZmlsbChkYXRhLCBpYmIsIHN0YWdp bmdfYnVmLCBzY3JhdGNoX2J1ZiwgdmFsKTsKIAogCQkvKiBwYXJ0aWFsIHJlYWQgKi8KIAkJZ2V0 X3JhbmdlKCZzdGFydCwgJmxlbik7CkBAIC0yMjYsNyArMjM5LDcgQEAgc3RhdGljIHZvaWQgdGVz dF9wYXJ0aWFsX3JlYWRfd3JpdGVzKGRhdGFfdCAqZGF0YSkKIAkJLyogQ2hhbmdlIGNvbnRlbnRz IHRocm91Z2ggZ3R0IHRvIG1ha2UgdGhlIHByZWFkIGNhY2hlbGluZXMKIAkJICogc3RhbGUuICov CiAJCXZhbCArPSAxNzsKLQkJYmx0X2JvX2ZpbGwoZGF0YSwgc3RhZ2luZ19idWYsIHNjcmF0Y2hf YnVmLCB2YWwpOworCQlibHRfYm9fZmlsbChkYXRhLCBpYmIsIHN0YWdpbmdfYnVmLCBzY3JhdGNo X2J1ZiwgdmFsKTsKIAogCQkvKiBwYXJ0aWFsIHdyaXRlICovCiAJCW1lbXNldCh0bXAsIGkgKyA2 MywgQk9fU0laRSk7CkBAIC0yMzQsNyArMjQ3LDcgQEAgc3RhdGljIHZvaWQgdGVzdF9wYXJ0aWFs X3JlYWRfd3JpdGVzKGRhdGFfdCAqZGF0YSkKIAkJZ2V0X3JhbmdlKCZzdGFydCwgJmxlbik7CiAJ CWdlbV93cml0ZShkYXRhLT5kcm1fZmQsIHNjcmF0Y2hfYnVmLT5oYW5kbGUsIHN0YXJ0LCB0bXAs IGxlbik7CiAKLQkJY29weV9ibyhzY3JhdGNoX2J1Ziwgc3RhZ2luZ19idWYpOworCQljb3B5X2Jv KGliYiwgc2NyYXRjaF9idWYsIHN0YWdpbmdfYnVmKTsKIAkJZ3R0X3B0ciA9IF9fdHJ5X2d0dF9t YXBfZmlyc3QoZGF0YSwgc3RhZ2luZ19idWYsIDApOwogCiAJCWZvciAoaiA9IDA7IGogPCBzdGFy dDsgaisrKSB7CkBAIC0yNTYsNiArMjY5LDggQEAgc3RhdGljIHZvaWQgdGVzdF9wYXJ0aWFsX3Jl YWRfd3JpdGVzKGRhdGFfdCAqZGF0YSkKIAogCQlpZ3RfcHJvZ3Jlc3MoInBhcnRpYWwgcmVhZC93 cml0ZXMgdGVzdDogIiwgaSwgUk9VTkRTKTsKIAl9CisKKwlpbnRlbF9iYl9kZXN0cm95KGliYik7 CiB9CiAKIHN0YXRpYyB2b2lkIGRvX3Rlc3RzKGRhdGFfdCAqZGF0YSwgaW50IGNhY2hlX2xldmVs LCBjb25zdCBjaGFyICpzdWZmaXgpCkBAIC0yODgsOCArMzAzLDYgQEAgaWd0X21haW4KIAkJZGF0 YS5kZXZpZCA9IGludGVsX2dldF9kcm1fZGV2aWQoZGF0YS5kcm1fZmQpOwogCQlkYXRhLmJvcHMg PSBidWZfb3BzX2NyZWF0ZShkYXRhLmRybV9mZCk7CiAKLQkJaWJiID0gaW50ZWxfYmJfY3JlYXRl KGRhdGEuZHJtX2ZkLCBQQUdFX1NJWkUpOwotCiAJCS8qIG92ZXJhbGxvY2F0ZSB0aGUgYnVmZmVy cyB3ZSdyZSBhY3R1YWxseSB1c2luZyBiZWNhdXNlICovCQogCQlzY3JhdGNoX2J1ZiA9IGludGVs X2J1Zl9jcmVhdGUoZGF0YS5ib3BzLCBCT19TSVpFLzQsIDEsIDMyLCAwLCBJOTE1X1RJTElOR19O T05FLCAwKTsKIAkJc3RhZ2luZ19idWYgPSBpbnRlbF9idWZfY3JlYXRlKGRhdGEuYm9wcywgQk9f U0laRS80LCAxLCAzMiwgMCwgSTkxNV9USUxJTkdfTk9ORSwgMCk7CkBAIC0zMDMsNyArMzE2LDYg QEAgaWd0X21haW4KIAlkb190ZXN0cygmZGF0YSwgMiwgIi1kaXNwbGF5Iik7CiAKIAlpZ3RfZml4 dHVyZSB7Ci0JCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKIAkJaW50ZWxfYnVmX2Rlc3Ryb3koc2Ny YXRjaF9idWYpOwogCQlpbnRlbF9idWZfZGVzdHJveShzdGFnaW5nX2J1Zik7CiAJCWJ1Zl9vcHNf ZGVzdHJveShkYXRhLmJvcHMpOwpkaWZmIC0tZ2l0IGEvdGVzdHMvaTkxNS9nZW1fcmVuZGVyX2Nv cHkuYyBiL3Rlc3RzL2k5MTUvZ2VtX3JlbmRlcl9jb3B5LmMKaW5kZXggYWZjNDkwZjEuLmU0OGI1 Yjk5IDEwMDY0NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9yZW5kZXJfY29weS5jCisrKyBiL3Rlc3Rz L2k5MTUvZ2VtX3JlbmRlcl9jb3B5LmMKQEAgLTU4LDcgKzU4LDYgQEAgdHlwZWRlZiBzdHJ1Y3Qg ewogCWludCBkcm1fZmQ7CiAJdWludDMyX3QgZGV2aWQ7CiAJc3RydWN0IGJ1Zl9vcHMgKmJvcHM7 Ci0Jc3RydWN0IGludGVsX2JiICppYmI7CiAJaWd0X3JlbmRlcl9jb3B5ZnVuY190IHJlbmRlcl9j b3B5OwogCWlndF92ZWJveF9jb3B5ZnVuY190IHZlYm94X2NvcHk7CiB9IGRhdGFfdDsKQEAgLTM0 MSw2ICszNDAsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMyX3Qgc3Jj X3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkJIGVudW0gaTkxNV9jb21wcmVzc2lvbiBk c3RfY29tcHJlc3Npb24sCiAJCSBpbnQgZmxhZ3MpCiB7CisJc3RydWN0IGludGVsX2JiICppYmI7 CiAJc3RydWN0IGludGVsX2J1ZiByZWYsIHNyY190aWxlZCwgc3JjX2NjcywgZHN0X2NjcywgZHN0 OwogCXN0cnVjdCB7CiAJCXN0cnVjdCBpbnRlbF9idWYgYnVmOwpAQCAtMzk3LDYgKzM5Nyw4IEBA IHN0YXRpYyB2b2lkIHRlc3QoZGF0YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5nLCB1aW50 MzJfdCBkc3RfdGlsaW5nLAogCSAgICBzcmNfY29tcHJlc3NlZCB8fCBkc3RfY29tcHJlc3NlZCkK IAkJaWd0X3JlcXVpcmUoaW50ZWxfZ2VuKGRhdGEtPmRldmlkKSA+PSA5KTsKIAorCWliYiA9IGlu dGVsX2JiX2NyZWF0ZShkYXRhLT5kcm1fZmQsIDQwOTYpOworCiAJZm9yIChpbnQgaSA9IDA7IGkg PCBudW1fc3JjOyBpKyspCiAJCXNjcmF0Y2hfYnVmX2luaXQoZGF0YSwgJnNyY1tpXS5idWYsIFdJ RFRILCBIRUlHSFQsIHNyY1tpXS50aWxpbmcsCiAJCQkJIEk5MTVfQ09NUFJFU1NJT05fTk9ORSk7 CkBAIC00NTYsMTIgKzQ1OCwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWlu dDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAkgKi8KIAlpZiAoc3JjX21p eGVkX3RpbGVkKSB7CiAJCWlmIChkc3RfY29tcHJlc3NlZCkKLQkJCWRhdGEtPnJlbmRlcl9jb3B5 KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICAmZHN0LCAwLCAw LCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZkc3RfY2NzLCAwLCAwKTsKIAogCQlmb3IgKGludCBp ID0gMDsgaSA8IG51bV9zcmM7IGkrKykgewotCQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0YS0+aWJi LAorCQkJZGF0YS0+cmVuZGVyX2NvcHkoaWJiLAogCQkJCQkgICZzcmNbaV0uYnVmLAogCQkJCQkg IFdJRFRILzQsIEhFSUdIVC80LCBXSURUSC8yLTIsIEhFSUdIVC8yLTIsCiAJCQkJCSAgZHN0X2Nv bXByZXNzZWQgPyAmZHN0X2NjcyA6ICZkc3QsCkBAIC00NjksMTMgKzQ3MSwxMyBAQCBzdGF0aWMg dm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMyX3Qgc3JjX3RpbGluZywgdWludDMyX3QgZHN0 X3RpbGluZywKIAkJfQogCiAJCWlmIChkc3RfY29tcHJlc3NlZCkKLQkJCWRhdGEtPnJlbmRlcl9j b3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwKIAkJCQkJICAmZHN0X2Nj cywgMCwgMCwgV0lEVEgsIEhFSUdIVCwKIAkJCQkJICAmZHN0LCAwLCAwKTsKIAogCX0gZWxzZSB7 CiAJCWlmIChzcmNfY29tcHJlc3Npb24gPT0gSTkxNV9DT01QUkVTU0lPTl9SRU5ERVIpIHsKLQkJ CWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGliYiwK IAkJCQkJICAmc3JjX3RpbGVkLCAwLCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkgICZzcmNfY2Nz LAogCQkJCQkgIDAsIDApOwpAQCAtNDg2LDcgKzQ4OCw3IEBAIHN0YXRpYyB2b2lkIHRlc3QoZGF0 YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5nLCB1aW50MzJfdCBkc3RfdGlsaW5nLAogCQkJ CQkJICAgICAgICJyZW5kZXItc3JjX2Njcy5iaW4iKTsKIAkJCX0KIAkJfSBlbHNlIGlmIChzcmNf Y29tcHJlc3Npb24gPT0gSTkxNV9DT01QUkVTU0lPTl9NRURJQSkgewotCQkJZGF0YS0+dmVib3hf Y29weShkYXRhLT5pYmIsCisJCQlkYXRhLT52ZWJveF9jb3B5KGliYiwKIAkJCQkJICZzcmNfdGls ZWQsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmc3JjX2Njcyk7CiAJCQlpZiAoZHVtcF9jb21wcmVz c2VkX3NyY19idWYpIHsKQEAgLTQ5OCwzNCArNTAwLDM0IEBAIHN0YXRpYyB2b2lkIHRlc3QoZGF0 YV90ICpkYXRhLCB1aW50MzJfdCBzcmNfdGlsaW5nLCB1aW50MzJfdCBkc3RfdGlsaW5nLAogCQl9 CiAKIAkJaWYgKGRzdF9jb21wcmVzc2lvbiA9PSBJOTE1X0NPTVBSRVNTSU9OX1JFTkRFUikgewot CQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0YS0+aWJiLAorCQkJZGF0YS0+cmVuZGVyX2NvcHkoaWJi LAogCQkJCQkgIHNyY19jb21wcmVzc2VkID8gJnNyY19jY3MgOiAmc3JjX3RpbGVkLAogCQkJCQkg IDAsIDAsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAgJmRzdF9jY3MsCiAJCQkJCSAgMCwgMCk7CiAK LQkJCWRhdGEtPnJlbmRlcl9jb3B5KGRhdGEtPmliYiwKKwkJCWRhdGEtPnJlbmRlcl9jb3B5KGli YiwKIAkJCQkJICAmZHN0X2NjcywKIAkJCQkJICAwLCAwLCBXSURUSCwgSEVJR0hULAogCQkJCQkg ICZkc3QsCiAJCQkJCSAgMCwgMCk7CiAJCX0gZWxzZSBpZiAoZHN0X2NvbXByZXNzaW9uID09IEk5 MTVfQ09NUFJFU1NJT05fTUVESUEpIHsKLQkJCWRhdGEtPnZlYm94X2NvcHkoZGF0YS0+aWJiLAor CQkJZGF0YS0+dmVib3hfY29weShpYmIsCiAJCQkJCSBzcmNfY29tcHJlc3NlZCA/ICZzcmNfY2Nz IDogJnNyY190aWxlZCwKIAkJCQkJIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmZHN0X2Njcyk7CiAK LQkJCWRhdGEtPnZlYm94X2NvcHkoZGF0YS0+aWJiLAorCQkJZGF0YS0+dmVib3hfY29weShpYmIs CiAJCQkJCSAmZHN0X2NjcywKIAkJCQkJIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAmZHN0KTsKIAkJ fSBlbHNlIGlmIChmb3JjZV92ZWJveF9kc3RfY29weSkgewotCQkJZGF0YS0+dmVib3hfY29weShk YXRhLT5pYmIsCisJCQlkYXRhLT52ZWJveF9jb3B5KGliYiwKIAkJCQkJIHNyY19jb21wcmVzc2Vk ID8gJnNyY19jY3MgOiAmc3JjX3RpbGVkLAogCQkJCQkgV0lEVEgsIEhFSUdIVCwKIAkJCQkJICZk c3QpOwogCQl9IGVsc2UgewotCQkJZGF0YS0+cmVuZGVyX2NvcHkoZGF0YS0+aWJiLAorCQkJZGF0 YS0+cmVuZGVyX2NvcHkoaWJiLAogCQkJCQkgIHNyY19jb21wcmVzc2VkID8gJnNyY19jY3MgOiAm c3JjX3RpbGVkLAogCQkJCQkgIDAsIDAsIFdJRFRILCBIRUlHSFQsCiAJCQkJCSAgJmRzdCwKQEAg LTU3Miw4ICs1NzQsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0KGRhdGFfdCAqZGF0YSwgdWludDMyX3Qg c3JjX3RpbGluZywgdWludDMyX3QgZHN0X3RpbGluZywKIAlmb3IgKGludCBpID0gMDsgaSA8IG51 bV9zcmM7IGkrKykKIAkJc2NyYXRjaF9idWZfZmluaSgmc3JjW2ldLmJ1Zik7CiAKLQkvKiBoYW5k bGVzIGdvbmUsIG5lZWQgdG8gY2xlYW4gdGhlIG9iamVjdHMgY2FjaGUgd2l0aGluIGludGVsX2Ji ICovCi0JaW50ZWxfYmJfcmVzZXQoZGF0YS0+aWJiLCB0cnVlKTsKKwlpbnRlbF9iYl9kZXN0cm95 KGliYik7CiB9CiAKIHN0YXRpYyBpbnQgb3B0X2hhbmRsZXIoaW50IG9wdCwgaW50IG9wdF9pbmRl eCwgdm9pZCAqZGF0YSkKQEAgLTc5Niw3ICs3OTcsNiBAQCBpZ3RfbWFpbl9hcmdzKCJkYWMiLCBO VUxMLCBoZWxwX3N0ciwgb3B0X2hhbmRsZXIsIE5VTEwpCiAJCWRhdGEudmVib3hfY29weSA9IGln dF9nZXRfdmVib3hfY29weWZ1bmMoZGF0YS5kZXZpZCk7CiAKIAkJZGF0YS5ib3BzID0gYnVmX29w c19jcmVhdGUoZGF0YS5kcm1fZmQpOwotCQlkYXRhLmliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRh LmRybV9mZCwgNDA5Nik7CiAKIAkJaWd0X2ZvcmtfaGFuZ19kZXRlY3RvcihkYXRhLmRybV9mZCk7 CiAJfQpAQCAtODQ5LDcgKzg0OSw2IEBAIGlndF9tYWluX2FyZ3MoImRhYyIsIE5VTEwsIGhlbHBf c3RyLCBvcHRfaGFuZGxlciwgTlVMTCkKIAogCWlndF9maXh0dXJlIHsKIAkJaWd0X3N0b3BfaGFu Z19kZXRlY3RvcigpOwotCQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsKIAkJYnVmX29wc19k ZXN0cm95KGRhdGEuYm9wcyk7CiAJfQogfQpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2JpZ19mYi5j IGIvdGVzdHMva21zX2JpZ19mYi5jCmluZGV4IDAyZTk5MTViLi40NDVkN2JiMCAxMDA2NDQKLS0t IGEvdGVzdHMva21zX2JpZ19mYi5jCisrKyBiL3Rlc3RzL2ttc19iaWdfZmIuYwpAQCAtNjYyLDcg KzY2Miw2IEBAIGlndF9tYWluCiAJCQlkYXRhLnJlbmRlcl9jb3B5ID0gaWd0X2dldF9yZW5kZXJf Y29weWZ1bmMoZGF0YS5kZXZpZCk7CiAKIAkJZGF0YS5ib3BzID0gYnVmX29wc19jcmVhdGUoZGF0 YS5kcm1fZmQpOwotCQlkYXRhLmliYiA9IGludGVsX2JiX2NyZWF0ZShkYXRhLmRybV9mZCwgNDA5 Nik7CiAJfQogCiAJLyoKQEAgLTY3NSw3ICs2NzQsOSBAQCBpZ3RfbWFpbgogCQlpZ3Rfc3VidGVz dF9mKCIlcy1hZGRmYi1zaXplLW92ZXJmbG93IiwKIAkJCSAgICAgIG1vZGlmaWVyc1tpXS5uYW1l KSB7CiAJCQlkYXRhLm1vZGlmaWVyID0gbW9kaWZpZXJzW2ldLm1vZGlmaWVyOworCQkJZGF0YS5p YmIgPSBpbnRlbF9iYl9jcmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJdGVzdF9zaXplX292 ZXJmbG93KCZkYXRhKTsKKwkJCWludGVsX2JiX2Rlc3Ryb3koZGF0YS5pYmIpOwogCQl9CiAJfQog CkBAIC02ODMsMTUgKzY4NCwxOCBAQCBpZ3RfbWFpbgogCQlpZ3Rfc3VidGVzdF9mKCIlcy1hZGRm Yi1zaXplLW9mZnNldC1vdmVyZmxvdyIsCiAJCQkgICAgICBtb2RpZmllcnNbaV0ubmFtZSkgewog CQkJZGF0YS5tb2RpZmllciA9IG1vZGlmaWVyc1tpXS5tb2RpZmllcjsKKwkJCWRhdGEuaWJiID0g aW50ZWxfYmJfY3JlYXRlKGRhdGEuZHJtX2ZkLCA0MDk2KTsKIAkJCXRlc3Rfc2l6ZV9vZmZzZXRf b3ZlcmZsb3coJmRhdGEpOworCQkJaW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJCX0KIAl9 CiAKIAlmb3IgKGludCBpID0gMDsgaSA8IEFSUkFZX1NJWkUobW9kaWZpZXJzKTsgaSsrKSB7CiAJ CWlndF9zdWJ0ZXN0X2YoIiVzLWFkZGZiIiwgbW9kaWZpZXJzW2ldLm5hbWUpIHsKIAkJCWRhdGEu bW9kaWZpZXIgPSBtb2RpZmllcnNbaV0ubW9kaWZpZXI7Ci0KKwkJCWRhdGEuaWJiID0gaW50ZWxf YmJfY3JlYXRlKGRhdGEuZHJtX2ZkLCA0MDk2KTsKIAkJCXRlc3RfYWRkZmIoJmRhdGEpOworCQkJ aW50ZWxfYmJfZGVzdHJveShkYXRhLmliYik7CiAJCX0KIAl9CiAKQEAgLTcwOSw3ICs3MTMsOSBA QCBpZ3RfbWFpbgogCQkJCQlpZ3RfcmVxdWlyZShkYXRhLmZvcm1hdCA9PSBEUk1fRk9STUFUX0M4 IHx8CiAJCQkJCQkgICAgaWd0X2ZiX3N1cHBvcnRlZF9mb3JtYXQoZGF0YS5mb3JtYXQpKTsKIAkJ CQkJaWd0X3JlcXVpcmUoaWd0X2Rpc3BsYXlfaGFzX2Zvcm1hdF9tb2QoJmRhdGEuZGlzcGxheSwg ZGF0YS5mb3JtYXQsIGRhdGEubW9kaWZpZXIpKTsKKwkJCQkJZGF0YS5pYmIgPSBpbnRlbF9iYl9j cmVhdGUoZGF0YS5kcm1fZmQsIDQwOTYpOwogCQkJCQl0ZXN0X3NjYW5vdXQoJmRhdGEpOworCQkJ CQlpbnRlbF9iYl9kZXN0cm95KGRhdGEuaWJiKTsKIAkJCQl9CiAJCQl9CiAKQEAgLTcyMCw4ICs3 MjYsNiBAQCBpZ3RfbWFpbgogCiAJaWd0X2ZpeHR1cmUgewogCQlpZ3RfZGlzcGxheV9maW5pKCZk YXRhLmRpc3BsYXkpOwotCi0JCWludGVsX2JiX2Rlc3Ryb3koZGF0YS5pYmIpOwogCQlidWZfb3Bz X2Rlc3Ryb3koZGF0YS5ib3BzKTsKIAl9CiB9Ci0tIAoyLjI2LjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1k ZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaWd0LWRldgo=