From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by gabe.freedesktop.org (Postfix) with ESMTPS id 99ACC89182 for ; Fri, 22 Feb 2019 11:26:20 +0000 (UTC) From: Paul Kocialkowski Date: Fri, 22 Feb 2019 12:25:38 +0100 Message-Id: <20190222112543.6885-18-paul.kocialkowski@bootlin.com> In-Reply-To: <20190222112543.6885-1-paul.kocialkowski@bootlin.com> References: <20190222112543.6885-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH RESEND i-g-t v6 17/22] lib/igt_chamelium: Split frames dump logic and rework surroundings 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: VGhlIGZyYW1lIGR1bXAgbG9naWMgaXMgdGhlIHNhbWUgZm9yIGFsbCBjb21wYXJpc29uIGhlbHBl cnMsIHNvIHNwbGl0Cml0IHRvIGEgZGVkaWNhdGVkIGZ1bmN0aW9uIGFuZCBhZGFwdCBoZWxwZXJz IHVzaW5nIGl0IHRvIGF2b2lkCmR1cGxpY2F0aW5nIG9wZXJhdGlvbnMuCgpTaWduZWQtb2ZmLWJ5 OiBQYXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lAYm9vdGxpbi5jb20+ClJldmll d2VkLWJ5OiBMeXVkZSBQYXVsIDxseXVkZUByZWRoYXQuY29tPgpSZXZpZXdlZC1ieTogTWF4aW1l IFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290bGluLmNvbT4KLS0tCiBsaWIvaWd0X2NoYW1lbGl1 bS5jIHwgODcgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNTIgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGliL2lndF9jaGFtZWxpdW0uYyBiL2xpYi9pZ3RfY2hhbWVsaXVtLmMKaW5kZXggMGI2 YWMzN2EzZDg5Li5kY2Y4ZTJmMTUxYWIgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY2hhbWVsaXVtLmMK KysrIGIvbGliL2lndF9jaGFtZWxpdW0uYwpAQCAtMTI0LDYgKzEyNCw5IEBAIHN0cnVjdCBjaGFt ZWxpdW0gewogCiBzdGF0aWMgc3RydWN0IGNoYW1lbGl1bSAqY2xlYW51cF9pbnN0YW5jZTsKIAor c3RhdGljIHZvaWQgY2hhbWVsaXVtX2RvX2NhbGN1bGF0ZV9mYl9jcmMoY2Fpcm9fc3VyZmFjZV90 ICpmYl9zdXJmYWNlLAorCQkJCQkgIGlndF9jcmNfdCAqb3V0KTsKKwogLyoqCiAgKiBjaGFtZWxp dW1fZ2V0X3BvcnRzOgogICogQGNoYW1lbGl1bTogVGhlIENoYW1lbGl1bSBpbnN0YW5jZSB0byB1 c2UKQEAgLTk2Nyw2ICs5NzAsMzkgQEAgc3RhdGljIGNhaXJvX3N1cmZhY2VfdCAqY29udmVydF9m cmFtZV9kdW1wX2FyZ2IzMihjb25zdCBzdHJ1Y3QgY2hhbWVsaXVtX2ZyYW1lX2QKIAlyZXR1cm4g ZHVtcF9zdXJmYWNlOwogfQogCitzdGF0aWMgdm9pZCBjb21wYXJlZF9mcmFtZXNfZHVtcChjYWly b19zdXJmYWNlX3QgKnJlZmVyZW5jZSwKKwkJCQkgY2Fpcm9fc3VyZmFjZV90ICpjYXB0dXJlLAor CQkJCSBpZ3RfY3JjX3QgKnJlZmVyZW5jZV9jcmMsCisJCQkJIGlndF9jcmNfdCAqY2FwdHVyZV9j cmMpCit7CisJY2hhciAqcmVmZXJlbmNlX3N1ZmZpeDsKKwljaGFyICpjYXB0dXJlX3N1ZmZpeDsK KwlpZ3RfY3JjX3QgbG9jYWxfcmVmZXJlbmNlX2NyYzsKKwlpZ3RfY3JjX3QgbG9jYWxfY2FwdHVy ZV9jcmM7CisKKwlpZ3RfYXNzZXJ0KHJlZmVyZW5jZSAmJiBjYXB0dXJlKTsKKworCWlmICghcmVm ZXJlbmNlX2NyYykgeworCQljaGFtZWxpdW1fZG9fY2FsY3VsYXRlX2ZiX2NyYyhyZWZlcmVuY2Us ICZsb2NhbF9yZWZlcmVuY2VfY3JjKTsKKwkJcmVmZXJlbmNlX2NyYyA9ICZsb2NhbF9yZWZlcmVu Y2VfY3JjOworCX0KKworCWlmICghY2FwdHVyZV9jcmMpIHsKKwkJY2hhbWVsaXVtX2RvX2NhbGN1 bGF0ZV9mYl9jcmMocmVmZXJlbmNlLCAmbG9jYWxfY2FwdHVyZV9jcmMpOworCQljYXB0dXJlX2Ny YyA9ICZsb2NhbF9jYXB0dXJlX2NyYzsKKwl9CisKKwlyZWZlcmVuY2Vfc3VmZml4ID0gaWd0X2Ny Y190b19zdHJpbmdfZXh0ZW5kZWQocmVmZXJlbmNlX2NyYywgJy0nLCAyKTsKKwljYXB0dXJlX3N1 ZmZpeCA9IGlndF9jcmNfdG9fc3RyaW5nX2V4dGVuZGVkKGNhcHR1cmVfY3JjLCAnLScsIDIpOwor CisJLyogV3JpdGUgcmVmZXJlbmNlIGFuZCBjYXB0dXJlIGZyYW1lcyB0byBwbmcuICovCisJaWd0 X3dyaXRlX2NvbXBhcmVkX2ZyYW1lc190b19wbmcocmVmZXJlbmNlLCBjYXB0dXJlLCByZWZlcmVu Y2Vfc3VmZml4LAorCQkJCQkgY2FwdHVyZV9zdWZmaXgpOworCisJZnJlZShyZWZlcmVuY2Vfc3Vm Zml4KTsKKwlmcmVlKGNhcHR1cmVfc3VmZml4KTsKK30KKwogLyoqCiAgKiBjaGFtZWxpdW1fYXNz ZXJ0X2ZyYW1lX2VxOgogICogQGNoYW1lbGl1bTogVGhlIGNoYW1lbGl1bSBpbnN0YW5jZSB0aGUg ZnJhbWUgZHVtcCBiZWxvbmdzIHRvCkBAIC0xMDI5LDggKzEwNjUsNiBAQCB2b2lkIGNoYW1lbGl1 bV9hc3NlcnRfY3JjX2VxX29yX2R1bXAoc3RydWN0IGNoYW1lbGl1bSAqY2hhbWVsaXVtLAogCXN0 cnVjdCBjaGFtZWxpdW1fZnJhbWVfZHVtcCAqZnJhbWU7CiAJY2Fpcm9fc3VyZmFjZV90ICpyZWZl cmVuY2U7CiAJY2Fpcm9fc3VyZmFjZV90ICpjYXB0dXJlOwotCWNoYXIgKnJlZmVyZW5jZV9zdWZm aXg7Ci0JY2hhciAqY2FwdHVyZV9zdWZmaXg7CiAJYm9vbCBlcTsKIAogCWlndF9kZWJ1ZygiUmVm ZXJlbmNlIENSQzogJXNcbiIsIGlndF9jcmNfdG9fc3RyaW5nKHJlZmVyZW5jZV9jcmMpKTsKQEAg LTEwMzgsMjcgKzEwNzIsMTkgQEAgdm9pZCBjaGFtZWxpdW1fYXNzZXJ0X2NyY19lcV9vcl9kdW1w KHN0cnVjdCBjaGFtZWxpdW0gKmNoYW1lbGl1bSwKIAogCWVxID0gaWd0X2NoZWNrX2NyY19lcXVh bChyZWZlcmVuY2VfY3JjLCBjYXB0dXJlX2NyYyk7CiAJaWYgKCFlcSAmJiBpZ3RfZnJhbWVfZHVt cF9pc19lbmFibGVkKCkpIHsKLQkJLyogR3JhYiB0aGUgcmVmZXJlbmNlIGZyYW1lIGZyb20gZnJh bWVidWZmZXIgKi8KKwkJLyogQ29udmVydCB0aGUgcmVmZXJlbmNlIGZyYW1lYnVmZmVyIHRvIGNh aXJvLiAqLwogCQlyZWZlcmVuY2UgPSBpZ3RfZ2V0X2NhaXJvX3N1cmZhY2UoY2hhbWVsaXVtLT5k cm1fZmQsIGZiKTsKIAotCQkvKiBHcmFiIHRoZSBjYXB0dXJlZCBmcmFtZSBmcm9tIGNoYW1lbGl1 bSAqLworCQkvKiBHcmFiIHRoZSBjYXB0dXJlZCBmcmFtZSBmcm9tIHRoZSBDaGFtZWxpdW0uICov CiAJCWZyYW1lID0gY2hhbWVsaXVtX3JlYWRfY2FwdHVyZWRfZnJhbWUoY2hhbWVsaXVtLCBpbmRl eCk7CiAJCWlndF9hc3NlcnQoZnJhbWUpOwogCisJCS8qIENvbnZlcnQgdGhlIGNhcHR1cmVkIGZy YW1lIHRvIGNhaXJvLiAqLwogCQljYXB0dXJlID0gY29udmVydF9mcmFtZV9kdW1wX2FyZ2IzMihm cmFtZSk7CisJCWlndF9hc3NlcnQoY2FwdHVyZSk7CiAKLQkJcmVmZXJlbmNlX3N1ZmZpeCA9IGln dF9jcmNfdG9fc3RyaW5nX2V4dGVuZGVkKHJlZmVyZW5jZV9jcmMsCi0JCQkJCQkJICAgICAgJy0n LCAyKTsKLQkJY2FwdHVyZV9zdWZmaXggPSBpZ3RfY3JjX3RvX3N0cmluZ19leHRlbmRlZChjYXB0 dXJlX2NyYywgJy0nLAotCQkJCQkJCSAgICAyKTsKLQotCQkvKiBXcml0ZSByZWZlcmVuY2UgYW5k IGNhcHR1cmUgZnJhbWVzIHRvIHBuZyAqLwotCQlpZ3Rfd3JpdGVfY29tcGFyZWRfZnJhbWVzX3Rv X3BuZyhyZWZlcmVuY2UsIGNhcHR1cmUsCi0JCQkJCQkgcmVmZXJlbmNlX3N1ZmZpeCwKLQkJCQkJ CSBjYXB0dXJlX3N1ZmZpeCk7Ci0KLQkJZnJlZShyZWZlcmVuY2Vfc3VmZml4KTsKLQkJZnJlZShj YXB0dXJlX3N1ZmZpeCk7CisJCWNvbXBhcmVkX2ZyYW1lc19kdW1wKHJlZmVyZW5jZSwgY2FwdHVy ZSwgcmVmZXJlbmNlX2NyYywKKwkJCQkgICAgIGNhcHR1cmVfY3JjKTsKIAogCQljYWlyb19zdXJm YWNlX2Rlc3Ryb3kocmVmZXJlbmNlKTsKIAkJY2Fpcm9fc3VyZmFjZV9kZXN0cm95KGNhcHR1cmUp OwpAQCAtMTA4Nyw4ICsxMTEzLDYgQEAgdm9pZCBjaGFtZWxpdW1fYXNzZXJ0X2FuYWxvZ19mcmFt ZV9tYXRjaF9vcl9kdW1wKHN0cnVjdCBjaGFtZWxpdW0gKmNoYW1lbGl1bSwKIAljYWlyb19zdXJm YWNlX3QgKmNhcHR1cmU7CiAJaWd0X2NyY190ICpyZWZlcmVuY2VfY3JjOwogCWlndF9jcmNfdCAq Y2FwdHVyZV9jcmM7Ci0JY2hhciAqcmVmZXJlbmNlX3N1ZmZpeDsKLQljaGFyICpjYXB0dXJlX3N1 ZmZpeDsKIAlib29sIG1hdGNoOwogCiAJLyogR3JhYiB0aGUgcmVmZXJlbmNlIGZyYW1lIGZyb20g ZnJhbWVidWZmZXIgKi8KQEAgLTEwOTksMjcgKzExMjMsMjAgQEAgdm9pZCBjaGFtZWxpdW1fYXNz ZXJ0X2FuYWxvZ19mcmFtZV9tYXRjaF9vcl9kdW1wKHN0cnVjdCBjaGFtZWxpdW0gKmNoYW1lbGl1 bSwKIAogCW1hdGNoID0gaWd0X2NoZWNrX2FuYWxvZ19mcmFtZV9tYXRjaChyZWZlcmVuY2UsIGNh cHR1cmUpOwogCWlmICghbWF0Y2ggJiYgaWd0X2ZyYW1lX2R1bXBfaXNfZW5hYmxlZCgpKSB7Ci0J CXJlZmVyZW5jZV9jcmMgPSBjaGFtZWxpdW1fY2FsY3VsYXRlX2ZiX2NyYyhjaGFtZWxpdW0tPmRy bV9mZCwKLQkJCQkJCQkgICBmYik7Ci0JCWNhcHR1cmVfY3JjID0gY2hhbWVsaXVtX2dldF9jcmNf Zm9yX2FyZWEoY2hhbWVsaXVtLCBwb3J0LCAwLCAwLAotCQkJCQkJCSAwLCAwKTsKKwkJcmVmZXJl bmNlX2NyYyA9IG1hbGxvYyhzaXplb2YoaWd0X2NyY190KSk7CisJCWlndF9hc3NlcnQocmVmZXJl bmNlX2NyYyk7CiAKLQkJaWd0X2RlYnVnKCJSZWZlcmVuY2UgQ1JDOiAlc1xuIiwKLQkJCSAgaWd0 X2NyY190b19zdHJpbmcocmVmZXJlbmNlX2NyYykpOwotCQlpZ3RfZGVidWcoIkNhcHR1cmVkIENS QzogJXNcbiIsIGlndF9jcmNfdG9fc3RyaW5nKGNhcHR1cmVfY3JjKSk7CisJCS8qIENhbGN1bGF0 ZSB0aGUgcmVmZXJlbmNlIGZyYW1lIENSQy4gKi8KKwkJY2hhbWVsaXVtX2RvX2NhbGN1bGF0ZV9m Yl9jcmMocmVmZXJlbmNlLCByZWZlcmVuY2VfY3JjKTsKIAotCQlyZWZlcmVuY2Vfc3VmZml4ID0g aWd0X2NyY190b19zdHJpbmdfZXh0ZW5kZWQocmVmZXJlbmNlX2NyYywKLQkJCQkJCQkgICAgICAn LScsIDIpOwotCQljYXB0dXJlX3N1ZmZpeCA9IGlndF9jcmNfdG9fc3RyaW5nX2V4dGVuZGVkKGNh cHR1cmVfY3JjLCAnLScsCi0JCQkJCQkJICAgIDIpOworCQkvKiBHZXQgdGhlIGNhcHR1cmVkIGZy YW1lIENSQyBmcm9tIHRoZSBDaGFtZWxpdW0uICovCisJCWNhcHR1cmVfY3JjID0gY2hhbWVsaXVt X2dldF9jcmNfZm9yX2FyZWEoY2hhbWVsaXVtLCBwb3J0LCAwLCAwLAorCQkJCQkJCSAwLCAwKTsK KwkJaWd0X2Fzc2VydChjYXB0dXJlX2NyYyk7CiAKLQkJLyogV3JpdGUgcmVmZXJlbmNlIGFuZCBj YXB0dXJlIGZyYW1lcyB0byBwbmcgKi8KLQkJaWd0X3dyaXRlX2NvbXBhcmVkX2ZyYW1lc190b19w bmcocmVmZXJlbmNlLCBjYXB0dXJlLAotCQkJCQkJIHJlZmVyZW5jZV9zdWZmaXgsCi0JCQkJCQkg Y2FwdHVyZV9zdWZmaXgpOworCQljb21wYXJlZF9mcmFtZXNfZHVtcChyZWZlcmVuY2UsIGNhcHR1 cmUsIHJlZmVyZW5jZV9jcmMsCisJCQkJICAgICBjYXB0dXJlX2NyYyk7CiAKLQkJZnJlZShyZWZl cmVuY2Vfc3VmZml4KTsKLQkJZnJlZShjYXB0dXJlX3N1ZmZpeCk7CiAJCWZyZWUocmVmZXJlbmNl X2NyYyk7CiAJCWZyZWUoY2FwdHVyZV9jcmMpOwogCX0KLS0gCjIuMjAuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QK aWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2