From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 211ED89B0B for ; Tue, 4 Dec 2018 10:08:48 +0000 (UTC) From: Maxime Ripard Date: Tue, 4 Dec 2018 11:08:17 +0100 Message-Id: <20181204100826.15522-4-maxime.ripard@bootlin.com> In-Reply-To: References: MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 4/8] igt: tests: chamelium: Convert VGA tests to do_test_display 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@raspberrypi.org, Thomas Petazzoni List-ID: VGhlIFZHQSB0ZXN0cyB3ZXJlIHJ1biBzbyBmYXIgYXMgcGFydCBvZiBhIHNlcGFyYXRlIGZ1bmN0 aW9uLiBIb3dldmVyLAp0aGUgb25seSBkaWZmZXJlbmNlIGJldHdlZW4gdGhhdCBmdW5jdGlvbiBh bmQgdGhlIGRvX3Rlc3RfZGlzcGxheQpmdW5jdGlvbiB3YXMgdGhlIGtpbmQgb2YgY29tcGFyaXNv biB3ZSB3YW50ZWQgdG8gdXNlLiBJbmRlZWQsIFZHQQpiZWluZyBhbiBhbmFsb2cgb3V0cHV0LCB3 ZSBjYW4ndCByZWx5IG9uIGEgcGl4ZWwgcGVyZmVjdCBpbWFnZSwgYW5kCnRodXMgb25seSBjb21w YXJlIHRoZSBDUkNzLCBidXQgd2UgbmVlZCB0byBtYWtlIHNvbWUgbW9yZSBhZHZhbmNlZApjb21w YXJpc29uLgoKTGV0J3MgYWRkIGEgbmV3IGNoZWNrIG1ldGhvZCwgYWRkIHN1cHBvcnQgZm9yIHRo ZSBhbmFsb2cgY2hlY2sgdG8KZG9fdGVzdF9kaXNwbGF5IGFuZCByZW1vdmUgdGhlIG9sZCB2ZXJz aW9uLgoKU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBib290bGlu LmNvbT4KLS0tCiB0ZXN0cy9rbXNfY2hhbWVsaXVtLmMgfCA5MiArKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygr KSwgNTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2NoYW1lbGl1bS5jIGIv dGVzdHMva21zX2NoYW1lbGl1bS5jCmluZGV4IDhiOTg3MmExNzA0NC4uODBiMjc5YzRmMWMyIDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfY2hhbWVsaXVtLmMKKysrIGIvdGVzdHMva21zX2NoYW1lbGl1 bS5jCkBAIC01MjcsNiArNTI3LDcgQEAgc3RhdGljIGludCBjaGFtZWxpdW1fZ2V0X3BhdHRlcm5f ZmIoZGF0YV90ICpkYXRhLCBkcm1Nb2RlTW9kZUluZm8gKm1vZGUsCiB9CiAKIGVudW0gY2hhbWVs aXVtX2NoZWNrIHsKKwlDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLAogCUNIQU1FTElVTV9DSEVDS19D UkMsCiB9OwogCkBAIC01NzgsNiArNTc5LDE4IEBAIHN0YXRpYyB2b2lkIGRvX3Rlc3RfZGlzcGxh eShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwKIAogCQlmcmVlKGV4 cGVjdGVkX2NyYyk7CiAJCWZyZWUoY3JjKTsKKwl9IGVsc2UgaWYgKGNoZWNrID09IENIQU1FTElV TV9DSEVDS19BTkFMT0cpIHsKKwkJc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpkdW1wOwor CisJCWlndF9hc3NlcnQoY291bnQgPT0gMSk7CisKKwkJZHVtcCA9IGNoYW1lbGl1bV9wb3J0X2R1 bXBfcGl4ZWxzKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwgMCwgMCwKKwkJCQkJCSAgMCwgMCk7CisJ CWNoYW1lbGl1bV9jcm9wX2FuYWxvZ19mcmFtZShkdW1wLCBtb2RlLT5oZGlzcGxheSwKKwkJCQkJ ICAgIG1vZGUtPnZkaXNwbGF5KTsKKwkJY2hhbWVsaXVtX2Fzc2VydF9hbmFsb2dfZnJhbWVfbWF0 Y2hfb3JfZHVtcChkYXRhLT5jaGFtZWxpdW0sCisJCQkJCQkJICAgIHBvcnQsIGR1bXAsICZmYik7 CisJCWNoYW1lbGl1bV9kZXN0cm95X2ZyYW1lX2R1bXAoZHVtcCk7CiAJfQogCiAJaWd0X3JlbW92 ZV9mYihkYXRhLT5kcm1fZmQsICZmcmFtZV9mYik7CkBAIC01ODgsOCArNjAxLDkgQEAgc3RhdGlj IHZvaWQgdGVzdF9kaXNwbGF5X29uZV9tb2RlKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1 bV9wb3J0ICpwb3J0LAogCQkJCSAgdWludDMyX3QgZm91cmNjLCBlbnVtIGNoYW1lbGl1bV9jaGVj ayBjaGVjaywKIAkJCQkgIGludCBjb3VudCkKIHsKLQlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKIAlk cm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3I7CisJZHJtTW9kZU1vZGVJbmZvICptb2RlOworCWln dF9vdXRwdXRfdCAqb3V0cHV0OwogCWlndF9wbGFuZV90ICpwcmltYXJ5OwogCiAJcmVzZXRfc3Rh dGUoZGF0YSwgcG9ydCk7CkBAIC01OTksOCArNjEzLDE0IEBAIHN0YXRpYyB2b2lkIHRlc3RfZGlz cGxheV9vbmVfbW9kZShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwK IAlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9U WVBFX1BSSU1BUlkpOwogCWlndF9hc3NlcnQocHJpbWFyeSk7CiAKLQlkb190ZXN0X2Rpc3BsYXko ZGF0YSwgcG9ydCwgb3V0cHV0LCAmY29ubmVjdG9yLT5tb2Rlc1swXSwgZm91cmNjLAotCQkJY2hl Y2ssIGNvdW50KTsKKwltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbMF07CisJaWYgKGNoZWNrID09 IENIQU1FTElVTV9DSEVDS19BTkFMT0cpIHsKKwkJYm9vbCBicmlkZ2UgPSBjaGVja19hbmFsb2df YnJpZGdlKGRhdGEsIHBvcnQpOworCisJCWlndF9hc3NlcnQoIShicmlkZ2UgJiYgcHJ1bmVfdmdh X21vZGUoZGF0YSwgbW9kZSkpKTsKKwl9CisKKwlkb190ZXN0X2Rpc3BsYXkoZGF0YSwgcG9ydCwg b3V0cHV0LCBtb2RlLCBmb3VyY2MsIGNoZWNrLCBjb3VudCk7CiAKIAlkcm1Nb2RlRnJlZUNvbm5l Y3Rvcihjb25uZWN0b3IpOwogfQpAQCAtNjEyLDYgKzYzMiw3IEBAIHN0YXRpYyB2b2lkIHRlc3Rf ZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBv cnQsCiAJaWd0X291dHB1dF90ICpvdXRwdXQ7CiAJaWd0X3BsYW5lX3QgKnByaW1hcnk7CiAJZHJt TW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOworCWJvb2wgYnJpZGdlOwogCWludCBpOwogCiAJcmVz ZXRfc3RhdGUoZGF0YSwgcG9ydCk7CkBAIC02MjEsOSArNjQyLDE2IEBAIHN0YXRpYyB2b2lkIHRl c3RfZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQg KnBvcnQsCiAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUob3V0cHV0LCBEUk1f UExBTkVfVFlQRV9QUklNQVJZKTsKIAlpZ3RfYXNzZXJ0KHByaW1hcnkpOwogCisJaWYgKGNoZWNr ID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpCisJCWJyaWRnZSA9IGNoZWNrX2FuYWxvZ19icmlk Z2UoZGF0YSwgcG9ydCk7CisKIAlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9yLT5jb3VudF9tb2Rl czsgaSsrKSB7CiAJCWRybU1vZGVNb2RlSW5mbyAqbW9kZSA9ICZjb25uZWN0b3ItPm1vZGVzW2ld OwogCisJCWlmIChjaGVjayA9PSBDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HICYmIGJyaWRnZSAmJgor CQkgICAgcHJ1bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpCisJCQljb250aW51ZTsKKwogCQlkb190 ZXN0X2Rpc3BsYXkoZGF0YSwgcG9ydCwgb3V0cHV0LCBtb2RlLCBmb3VyY2MsIGNoZWNrLCBjb3Vu dCk7CiAJfQogCkBAIC02NzQsNjEgKzcwMiw2IEBAIHRlc3RfZGlzcGxheV9mcmFtZV9kdW1wKGRh dGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogCWRybU1vZGVGcmVlQ29u bmVjdG9yKGNvbm5lY3Rvcik7CiB9CiAKLXN0YXRpYyB2b2lkCi10ZXN0X2FuYWxvZ19mcmFtZV9k dW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQotewotCWlndF9v dXRwdXRfdCAqb3V0cHV0OwotCWlndF9wbGFuZV90ICpwcmltYXJ5OwotCXN0cnVjdCBpZ3RfZmIg ZmI7Ci0Jc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpmcmFtZTsKLQlkcm1Nb2RlTW9kZUlu Zm8gKm1vZGU7Ci0JZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOwotCWludCBmYl9pZCwgaTsK LQlib29sIGJyaWRnZTsKLQotCXJlc2V0X3N0YXRlKGRhdGEsIHBvcnQpOwotCi0Jb3V0cHV0ID0g cHJlcGFyZV9vdXRwdXQoZGF0YSwgcG9ydCk7Ci0JY29ubmVjdG9yID0gY2hhbWVsaXVtX3BvcnRf Z2V0X2Nvbm5lY3RvcihkYXRhLT5jaGFtZWxpdW0sIHBvcnQsIGZhbHNlKTsKLQlwcmltYXJ5ID0g aWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkp OwotCWlndF9hc3NlcnQocHJpbWFyeSk7Ci0KLQlicmlkZ2UgPSBjaGVja19hbmFsb2dfYnJpZGdl KGRhdGEsIHBvcnQpOwotCi0JZm9yIChpID0gMDsgaSA8IGNvbm5lY3Rvci0+Y291bnRfbW9kZXM7 IGkrKykgewotCQltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbaV07Ci0KLQkJaWYgKGJyaWRnZSAm JiBwcnVuZV92Z2FfbW9kZShkYXRhLCBtb2RlKSkKLQkJCWNvbnRpbnVlOwotCi0JCWZiX2lkID0g aWd0X2NyZWF0ZV9jb2xvcl9wYXR0ZXJuX2ZiKGRhdGEtPmRybV9mZCwKLQkJCQkJCSAgICBtb2Rl LT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCi0JCQkJCQkgICAgRFJNX0ZPUk1BVF9YUkdCODg4 OCwKLQkJCQkJCSAgICBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FLAotCQkJCQkJICAgIDAsIDAs IDAsICZmYik7Ci0JCWlndF9hc3NlcnQoZmJfaWQgPiAwKTsKLQotCQllbmFibGVfb3V0cHV0KGRh dGEsIHBvcnQsIG91dHB1dCwgbW9kZSwgJmZiKTsKLQotCQlpZ3RfZGVidWcoIlJlYWRpbmcgZnJh bWUgZHVtcHMgZnJvbSBDaGFtZWxpdW0uLi5cbiIpOwotCi0JCWZyYW1lID0gY2hhbWVsaXVtX3Bv cnRfZHVtcF9waXhlbHMoZGF0YS0+Y2hhbWVsaXVtLCBwb3J0LCAwLCAwLAotCQkJCQkJICAgMCwg MCk7Ci0KLQkJY2hhbWVsaXVtX2Nyb3BfYW5hbG9nX2ZyYW1lKGZyYW1lLCBtb2RlLT5oZGlzcGxh eSwKLQkJCQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKLQotCQljaGFtZWxpdW1fYXNzZXJ0X2FuYWxv Z19mcmFtZV9tYXRjaF9vcl9kdW1wKGRhdGEtPmNoYW1lbGl1bSwKLQkJCQkJCQkgICAgcG9ydCwg ZnJhbWUsICZmYik7Ci0KLQkJY2hhbWVsaXVtX2Rlc3Ryb3lfZnJhbWVfZHVtcChmcmFtZSk7Ci0K LQkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmYik7Ci0JfQotCi0JZHJtTW9kZUZyZWVD b25uZWN0b3IoY29ubmVjdG9yKTsKLX0KLQogc3RhdGljIHZvaWQKIHRlc3RfaHBkX3dpdGhvdXRf ZGRjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogewpAQCAtMTA0 MCw3ICsxMDEzLDggQEAgaWd0X21haW4KIAkJCXRlc3RfaHBkX3dpdGhvdXRfZGRjKCZkYXRhLCBw b3J0KTsKIAogCQljb25uZWN0b3Jfc3VidGVzdCgidmdhLWZyYW1lLWR1bXAiLCBWR0EpCi0JCQl0 ZXN0X2FuYWxvZ19mcmFtZV9kdW1wKCZkYXRhLCBwb3J0KTsKKwkJCXRlc3RfZGlzcGxheV9hbGxf bW9kZXMoJmRhdGEsIHBvcnQsIERSTV9GT1JNQVRfWFJHQjg4ODgsCisJCQkJCSAgICAgICBDSEFN RUxJVU1fQ0hFQ0tfQU5BTE9HLCAxKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdF9ncm91cCB7Ci0tIAoy LjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmln dC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=