From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id C595C8933E for ; Wed, 20 Feb 2019 15:40:10 +0000 (UTC) From: Paul Kocialkowski Date: Wed, 20 Feb 2019 16:39:09 +0100 Message-Id: <20190220153913.10753-19-paul.kocialkowski@bootlin.com> In-Reply-To: <20190220153913.10753-1-paul.kocialkowski@bootlin.com> References: <20190220153913.10753-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v5 18/22] lib/igt_chamelium: Generalize the frame match helper with check type 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: Petri Latvala , Eben Upton , Thomas Petazzoni List-ID: SW4gcHJldmlzaW9uIG9mIGFkZGluZyBzdXBwb3J0IGZvciBhbm90aGVyIHR5cGUgb2YgZnJhbWUg bWF0Y2hpbmcsCnJlbmFtZSBjaGFtZWxpdW1fYXNzZXJ0X2FuYWxvZ19mcmFtZV9tYXRjaF9vcl9k dW1wIHRvIGRyb3AgdGhlCmFuYWxvZyBwYXJ0IGFuZCBmZWVkIGl0IHRoZSBjaGVjayB0eXBlLiBU aGlzIHdheSwgdGhlIGJ1bGsgb2YgdGhlCmhlbHBlciBjYW4gYXBwbHkgdG8gb3RoZXIgZnJhbWUg bWF0Y2hpbmcgdHlwZXMuCgpUaGlzIHJlcXVpcmVzIG1vdmluZyB0aGUgY2hhbWVsaXVtX2NoZWNr IGVudW0gZnJvbSB0aGUgdGVzdCB0byB0aGUKY29tbW9uIGNoYW1lbGl1bSBoZWFkZXIuCgpTaWdu ZWQtb2ZmLWJ5OiBQYXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lAYm9vdGxpbi5j b20+ClJldmlld2VkLWJ5OiBMeXVkZSBQYXVsIDxseXVkZUByZWRoYXQuY29tPgpSZXZpZXdlZC1i eTogTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290bGluLmNvbT4KLS0tCiBsaWIvaWd0 X2NoYW1lbGl1bS5jICAgfCAyMSArKysrKysrKysrKysrKystLS0tLS0KIGxpYi9pZ3RfY2hhbWVs aXVtLmggICB8IDIxICsrKysrKysrKysrKysrKysrLS0tLQogdGVzdHMva21zX2NoYW1lbGl1bS5j IHwgIDkgKystLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDE3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfY2hhbWVsaXVtLmMgYi9saWIvaWd0X2No YW1lbGl1bS5jCmluZGV4IGRjZjhlMmYxNTFhYi4uNjJmN2U0MGM0NDdkIDEwMDY0NAotLS0gYS9s aWIvaWd0X2NoYW1lbGl1bS5jCisrKyBiL2xpYi9pZ3RfY2hhbWVsaXVtLmMKQEAgLTEwOTUsMTkg KzEwOTUsMjEgQEAgdm9pZCBjaGFtZWxpdW1fYXNzZXJ0X2NyY19lcV9vcl9kdW1wKHN0cnVjdCBj aGFtZWxpdW0gKmNoYW1lbGl1bSwKIH0KIAogLyoqCi0gKiBjaGFtZWxpdW1fYXNzZXJ0X2FuYWxv Z19mcmFtZV9tYXRjaF9vcl9kdW1wOgorICogY2hhbWVsaXVtX2Fzc2VydF9mcmFtZV9tYXRjaF9v cl9kdW1wOgogICogQGNoYW1lbGl1bTogVGhlIGNoYW1lbGl1bSBpbnN0YW5jZSB0aGUgZnJhbWUg ZHVtcCBiZWxvbmdzIHRvCiAgKiBAZnJhbWU6IFRoZSBjaGFtZWxpdW0gZnJhbWUgZHVtcCB0byBt YXRjaAogICogQGZiOiBwb2ludGVyIHRvIGFuICNpZ3RfZmIgc3RydWN0dXJlCisgKiBAY2hlY2s6 IHRoZSB0eXBlIG9mIGZyYW1lIG1hdGNoaW5nIGNoZWNrIHRvIHVzZQogICoKICAqIEFzc2VydHMg dGhhdCB0aGUgcHJvdmlkZWQgY2FwdHVyZWQgZnJhbWUgbWF0Y2hlcyB0aGUgcmVmZXJlbmNlIGZy YW1lIGZyb20KICAqIHRoZSBmcmFtZWJ1ZmZlci4gSWYgdGhleSBkbyBub3QsIHRoaXMgc2F2ZXMg dGhlIHJlZmVyZW5jZSBhbmQgY2FwdHVyZWQgZnJhbWVzCiAgKiB0byBhIHBuZyBmaWxlLgogICov Ci12b2lkIGNoYW1lbGl1bV9hc3NlcnRfYW5hbG9nX2ZyYW1lX21hdGNoX29yX2R1bXAoc3RydWN0 IGNoYW1lbGl1bSAqY2hhbWVsaXVtLAotCQkJCQkJIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9y dCwKLQkJCQkJCSBjb25zdCBzdHJ1Y3QgY2hhbWVsaXVtX2ZyYW1lX2R1bXAgKmZyYW1lLAotCQkJ CQkJIHN0cnVjdCBpZ3RfZmIgKmZiKQordm9pZCBjaGFtZWxpdW1fYXNzZXJ0X2ZyYW1lX21hdGNo X29yX2R1bXAoc3RydWN0IGNoYW1lbGl1bSAqY2hhbWVsaXVtLAorCQkJCQkgIHN0cnVjdCBjaGFt ZWxpdW1fcG9ydCAqcG9ydCwKKwkJCQkJICBjb25zdCBzdHJ1Y3QgY2hhbWVsaXVtX2ZyYW1lX2R1 bXAgKmZyYW1lLAorCQkJCQkgIHN0cnVjdCBpZ3RfZmIgKmZiLAorCQkJCQkgIGVudW0gY2hhbWVs aXVtX2NoZWNrIGNoZWNrKQogewogCWNhaXJvX3N1cmZhY2VfdCAqcmVmZXJlbmNlOwogCWNhaXJv X3N1cmZhY2VfdCAqY2FwdHVyZTsKQEAgLTExMjEsNyArMTEyMywxNCBAQCB2b2lkIGNoYW1lbGl1 bV9hc3NlcnRfYW5hbG9nX2ZyYW1lX21hdGNoX29yX2R1bXAoc3RydWN0IGNoYW1lbGl1bSAqY2hh bWVsaXVtLAogCS8qIEdyYWIgdGhlIGNhcHR1cmVkIGZyYW1lIGZyb20gY2hhbWVsaXVtICovCiAJ Y2FwdHVyZSA9IGNvbnZlcnRfZnJhbWVfZHVtcF9hcmdiMzIoZnJhbWUpOwogCi0JbWF0Y2ggPSBp Z3RfY2hlY2tfYW5hbG9nX2ZyYW1lX21hdGNoKHJlZmVyZW5jZSwgY2FwdHVyZSk7CisJc3dpdGNo IChjaGVjaykgeworCWNhc2UgQ0hBTUVMSVVNX0NIRUNLX0FOQUxPRzoKKwkJbWF0Y2ggPSBpZ3Rf Y2hlY2tfYW5hbG9nX2ZyYW1lX21hdGNoKHJlZmVyZW5jZSwgY2FwdHVyZSk7CisJCWJyZWFrOwor CWRlZmF1bHQ6CisJCWlndF9hc3NlcnQoZmFsc2UpOworCX0KKwogCWlmICghbWF0Y2ggJiYgaWd0 X2ZyYW1lX2R1bXBfaXNfZW5hYmxlZCgpKSB7CiAJCXJlZmVyZW5jZV9jcmMgPSBtYWxsb2Moc2l6 ZW9mKGlndF9jcmNfdCkpOwogCQlpZ3RfYXNzZXJ0KHJlZmVyZW5jZV9jcmMpOwpkaWZmIC0tZ2l0 IGEvbGliL2lndF9jaGFtZWxpdW0uaCBiL2xpYi9pZ3RfY2hhbWVsaXVtLmgKaW5kZXggYWY5NjU1 YTBiMWNmLi4yZjhlMzFkYjYzOTMgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY2hhbWVsaXVtLmgKKysr IGIvbGliL2lndF9jaGFtZWxpdW0uaApAQCAtNDAsNiArNDAsMTggQEAgc3RydWN0IGNoYW1lbGl1 bV9wb3J0Owogc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wOwogc3RydWN0IGNoYW1lbGl1bV9m Yl9jcmNfYXN5bmNfZGF0YTsKIAorLyoqCisgKiBjaGFtZWxpdW1fY2hlY2s6CisgKiBAQ0hBTUVM SVVNX0NIRUNLX0FOQUxPRzogRnV6enkgY2hlY2tpbmcgbWV0aG9kIGZvciBhbmFsb2cgaW50ZXJm YWNlcworICogQENIQU1FTElVTV9DSEVDS19DUkM6IENSQy1iYXNlZCBjaGVja2luZyBtZXRob2Qg Zm9yIHBpeGVsLXBlcmZlY3QgaW50ZXJmYWNlcworICoKKyAqIENoZWNraW5nIG1ldGhvZCBmb3Ig Y29tcGFyaW5nIGJldHdlZW4gcmVmZXJlbmNlIGFuZCBjYXB0dXJlZCBmcmFtZXMuCisgKi8KK2Vu dW0gY2hhbWVsaXVtX2NoZWNrIHsKKwlDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLAorCUNIQU1FTElV TV9DSEVDS19DUkMsCit9OworCiBzdHJ1Y3QgY2hhbWVsaXVtICpjaGFtZWxpdW1faW5pdChpbnQg ZHJtX2ZkKTsKIHZvaWQgY2hhbWVsaXVtX2RlaW5pdChzdHJ1Y3QgY2hhbWVsaXVtICpjaGFtZWxp dW0pOwogdm9pZCBjaGFtZWxpdW1fcmVzZXQoc3RydWN0IGNoYW1lbGl1bSAqY2hhbWVsaXVtKTsK QEAgLTExMCwxMCArMTIyLDExIEBAIHZvaWQgY2hhbWVsaXVtX2Fzc2VydF9jcmNfZXFfb3JfZHVt cChzdHJ1Y3QgY2hhbWVsaXVtICpjaGFtZWxpdW0sCiAJCQkJICAgICBpZ3RfY3JjX3QgKnJlZmVy ZW5jZV9jcmMsCiAJCQkJICAgICBpZ3RfY3JjX3QgKmNhcHR1cmVfY3JjLCBzdHJ1Y3QgaWd0X2Zi ICpmYiwKIAkJCQkgICAgIGludCBpbmRleCk7Ci12b2lkIGNoYW1lbGl1bV9hc3NlcnRfYW5hbG9n X2ZyYW1lX21hdGNoX29yX2R1bXAoc3RydWN0IGNoYW1lbGl1bSAqY2hhbWVsaXVtLAotCQkJCQkJ IHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwKLQkJCQkJCSBjb25zdCBzdHJ1Y3QgY2hhbWVs aXVtX2ZyYW1lX2R1bXAgKmZyYW1lLAotCQkJCQkJIHN0cnVjdCBpZ3RfZmIgKmZiKTsKK3ZvaWQg Y2hhbWVsaXVtX2Fzc2VydF9mcmFtZV9tYXRjaF9vcl9kdW1wKHN0cnVjdCBjaGFtZWxpdW0gKmNo YW1lbGl1bSwKKwkJCQkJICBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQsCisJCQkJCSAgY29u c3Qgc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpmcmFtZSwKKwkJCQkJICBzdHJ1Y3QgaWd0 X2ZiICpmYiwKKwkJCQkJICBlbnVtIGNoYW1lbGl1bV9jaGVjayBjaGVjayk7CiB2b2lkIGNoYW1l bGl1bV9jcm9wX2FuYWxvZ19mcmFtZShzdHJ1Y3QgY2hhbWVsaXVtX2ZyYW1lX2R1bXAgKmR1bXAs IGludCB3aWR0aCwKIAkJCQkgaW50IGhlaWdodCk7CiB2b2lkIGNoYW1lbGl1bV9kZXN0cm95X2Zy YW1lX2R1bXAoc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpkdW1wKTsKZGlmZiAtLWdpdCBh L3Rlc3RzL2ttc19jaGFtZWxpdW0uYyBiL3Rlc3RzL2ttc19jaGFtZWxpdW0uYwppbmRleCBmZTU4 YWVhOThlODYuLjZiZjUzNThhM2RlOCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2NoYW1lbGl1bS5j CisrKyBiL3Rlc3RzL2ttc19jaGFtZWxpdW0uYwpAQCAtNTI3LDExICs1MjcsNiBAQCBzdGF0aWMg aW50IGNoYW1lbGl1bV9nZXRfcGF0dGVybl9mYihkYXRhX3QgKmRhdGEsIHNpemVfdCB3aWR0aCwg c2l6ZV90IGhlaWdodCwKIAlyZXR1cm4gZmJfaWQ7CiB9CiAKLWVudW0gY2hhbWVsaXVtX2NoZWNr IHsKLQlDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLAotCUNIQU1FTElVTV9DSEVDS19DUkMsCi19Owot CiBzdGF0aWMgdm9pZCBkb190ZXN0X2Rpc3BsYXkoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVs aXVtX3BvcnQgKnBvcnQsCiAJCQkgICAgaWd0X291dHB1dF90ICpvdXRwdXQsIGRybU1vZGVNb2Rl SW5mbyAqbW9kZSwKIAkJCSAgICB1aW50MzJfdCBmb3VyY2MsIGVudW0gY2hhbWVsaXVtX2NoZWNr IGNoZWNrLApAQCAtNTkwLDggKzU4NSw4IEBAIHN0YXRpYyB2b2lkIGRvX3Rlc3RfZGlzcGxheShk YXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwKIAkJCQkJCSAgMCwgMCk7 CiAJCWNoYW1lbGl1bV9jcm9wX2FuYWxvZ19mcmFtZShkdW1wLCBtb2RlLT5oZGlzcGxheSwKIAkJ CQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKLQkJY2hhbWVsaXVtX2Fzc2VydF9hbmFsb2dfZnJhbWVf bWF0Y2hfb3JfZHVtcChkYXRhLT5jaGFtZWxpdW0sCi0JCQkJCQkJICAgIHBvcnQsIGR1bXAsICZm Yik7CisJCWNoYW1lbGl1bV9hc3NlcnRfZnJhbWVfbWF0Y2hfb3JfZHVtcChkYXRhLT5jaGFtZWxp dW0sIHBvcnQsCisJCQkJCQkgICAgIGR1bXAsICZmYiwgY2hlY2spOwogCQljaGFtZWxpdW1fZGVz dHJveV9mcmFtZV9kdW1wKGR1bXApOwogCX0KIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3Qt ZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=