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 3A37C6EF94 for ; Tue, 8 Jan 2019 15:20:07 +0000 (UTC) From: Maxime Ripard Date: Tue, 8 Jan 2019 16:19:58 +0100 Message-Id: <20190108152001.5367-12-maxime.ripard@bootlin.com> In-Reply-To: References: MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v2 12/13] 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 dGVzdHMva21zX2NoYW1lbGl1bS5jCmluZGV4IDgyMzBjYjg1MmNmYi4uZWFlYTljMTg4MzJhIDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfY2hhbWVsaXVtLmMKKysrIGIvdGVzdHMva21zX2NoYW1lbGl1 bS5jCkBAIC01MjgsNiArNTI4LDcgQEAgc3RhdGljIGludCBjaGFtZWxpdW1fZ2V0X3BhdHRlcm5f ZmIoZGF0YV90ICpkYXRhLCBzaXplX3Qgd2lkdGgsIHNpemVfdCBoZWlnaHQsCiB9CiAKIGVudW0g Y2hhbWVsaXVtX2NoZWNrIHsKKwlDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLAogCUNIQU1FTElVTV9D SEVDS19DUkMsCiB9OwogCkBAIC01NzksNiArNTgwLDE4IEBAIHN0YXRpYyB2b2lkIGRvX3Rlc3Rf ZGlzcGxheShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwKIAogCQlm cmVlKGV4cGVjdGVkX2NyYyk7CiAJCWZyZWUoY3JjKTsKKwl9IGVsc2UgaWYgKGNoZWNrID09IENI QU1FTElVTV9DSEVDS19BTkFMT0cpIHsKKwkJc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpk dW1wOworCisJCWlndF9hc3NlcnQoY291bnQgPT0gMSk7CisKKwkJZHVtcCA9IGNoYW1lbGl1bV9w b3J0X2R1bXBfcGl4ZWxzKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwgMCwgMCwKKwkJCQkJCSAgMCwg MCk7CisJCWNoYW1lbGl1bV9jcm9wX2FuYWxvZ19mcmFtZShkdW1wLCBtb2RlLT5oZGlzcGxheSwK KwkJCQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKKwkJY2hhbWVsaXVtX2Fzc2VydF9hbmFsb2dfZnJh bWVfbWF0Y2hfb3JfZHVtcChkYXRhLT5jaGFtZWxpdW0sCisJCQkJCQkJICAgIHBvcnQsIGR1bXAs ICZmYik7CisJCWNoYW1lbGl1bV9kZXN0cm95X2ZyYW1lX2R1bXAoZHVtcCk7CiAJfQogCiAJaWd0 X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmcmFtZV9mYik7CkBAIC01ODksOCArNjAyLDkgQEAg c3RhdGljIHZvaWQgdGVzdF9kaXNwbGF5X29uZV9tb2RlKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNo YW1lbGl1bV9wb3J0ICpwb3J0LAogCQkJCSAgdWludDMyX3QgZm91cmNjLCBlbnVtIGNoYW1lbGl1 bV9jaGVjayBjaGVjaywKIAkJCQkgIGludCBjb3VudCkKIHsKLQlpZ3Rfb3V0cHV0X3QgKm91dHB1 dDsKIAlkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3I7CisJZHJtTW9kZU1vZGVJbmZvICptb2Rl OworCWlndF9vdXRwdXRfdCAqb3V0cHV0OwogCWlndF9wbGFuZV90ICpwcmltYXJ5OwogCiAJcmVz ZXRfc3RhdGUoZGF0YSwgcG9ydCk7CkBAIC02MDAsOCArNjE0LDE0IEBAIHN0YXRpYyB2b2lkIHRl c3RfZGlzcGxheV9vbmVfbW9kZShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAq cG9ydCwKIAlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9Q TEFORV9UWVBFX1BSSU1BUlkpOwogCWlndF9hc3NlcnQocHJpbWFyeSk7CiAKLQlkb190ZXN0X2Rp c3BsYXkoZGF0YSwgcG9ydCwgb3V0cHV0LCAmY29ubmVjdG9yLT5tb2Rlc1swXSwgZm91cmNjLAot CQkJY2hlY2ssIGNvdW50KTsKKwltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbMF07CisJaWYgKGNo ZWNrID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpIHsKKwkJYm9vbCBicmlkZ2UgPSBjaGVja19h bmFsb2dfYnJpZGdlKGRhdGEsIHBvcnQpOworCisJCWlndF9hc3NlcnQoIShicmlkZ2UgJiYgcHJ1 bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpKTsKKwl9CisKKwlkb190ZXN0X2Rpc3BsYXkoZGF0YSwg cG9ydCwgb3V0cHV0LCBtb2RlLCBmb3VyY2MsIGNoZWNrLCBjb3VudCk7CiAKIAlkcm1Nb2RlRnJl ZUNvbm5lY3Rvcihjb25uZWN0b3IpOwogfQpAQCAtNjEzLDYgKzYzMyw3IEBAIHN0YXRpYyB2b2lk IHRlc3RfZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3Bv cnQgKnBvcnQsCiAJaWd0X291dHB1dF90ICpvdXRwdXQ7CiAJaWd0X3BsYW5lX3QgKnByaW1hcnk7 CiAJZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOworCWJvb2wgYnJpZGdlOwogCWludCBpOwog CiAJcmVzZXRfc3RhdGUoZGF0YSwgcG9ydCk7CkBAIC02MjIsOSArNjQzLDE2IEBAIHN0YXRpYyB2 b2lkIHRlc3RfZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVt X3BvcnQgKnBvcnQsCiAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUob3V0cHV0 LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKIAlpZ3RfYXNzZXJ0KHByaW1hcnkpOwogCisJaWYg KGNoZWNrID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpCisJCWJyaWRnZSA9IGNoZWNrX2FuYWxv Z19icmlkZ2UoZGF0YSwgcG9ydCk7CisKIAlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9yLT5jb3Vu dF9tb2RlczsgaSsrKSB7CiAJCWRybU1vZGVNb2RlSW5mbyAqbW9kZSA9ICZjb25uZWN0b3ItPm1v ZGVzW2ldOwogCisJCWlmIChjaGVjayA9PSBDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HICYmIGJyaWRn ZSAmJgorCQkgICAgcHJ1bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpCisJCQljb250aW51ZTsKKwog CQlkb190ZXN0X2Rpc3BsYXkoZGF0YSwgcG9ydCwgb3V0cHV0LCBtb2RlLCBmb3VyY2MsIGNoZWNr LCBjb3VudCk7CiAJfQogCkBAIC02NzUsNjEgKzcwMyw2IEBAIHRlc3RfZGlzcGxheV9mcmFtZV9k dW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogCWRybU1vZGVG cmVlQ29ubmVjdG9yKGNvbm5lY3Rvcik7CiB9CiAKLXN0YXRpYyB2b2lkCi10ZXN0X2FuYWxvZ19m cmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQotewot CWlndF9vdXRwdXRfdCAqb3V0cHV0OwotCWlndF9wbGFuZV90ICpwcmltYXJ5OwotCXN0cnVjdCBp Z3RfZmIgZmI7Ci0Jc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpmcmFtZTsKLQlkcm1Nb2Rl TW9kZUluZm8gKm1vZGU7Ci0JZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOwotCWludCBmYl9p ZCwgaTsKLQlib29sIGJyaWRnZTsKLQotCXJlc2V0X3N0YXRlKGRhdGEsIHBvcnQpOwotCi0Jb3V0 cHV0ID0gcHJlcGFyZV9vdXRwdXQoZGF0YSwgcG9ydCk7Ci0JY29ubmVjdG9yID0gY2hhbWVsaXVt X3BvcnRfZ2V0X2Nvbm5lY3RvcihkYXRhLT5jaGFtZWxpdW0sIHBvcnQsIGZhbHNlKTsKLQlwcmlt YXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BS SU1BUlkpOwotCWlndF9hc3NlcnQocHJpbWFyeSk7Ci0KLQlicmlkZ2UgPSBjaGVja19hbmFsb2df YnJpZGdlKGRhdGEsIHBvcnQpOwotCi0JZm9yIChpID0gMDsgaSA8IGNvbm5lY3Rvci0+Y291bnRf bW9kZXM7IGkrKykgewotCQltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbaV07Ci0KLQkJaWYgKGJy aWRnZSAmJiBwcnVuZV92Z2FfbW9kZShkYXRhLCBtb2RlKSkKLQkJCWNvbnRpbnVlOwotCi0JCWZi X2lkID0gaWd0X2NyZWF0ZV9jb2xvcl9wYXR0ZXJuX2ZiKGRhdGEtPmRybV9mZCwKLQkJCQkJCSAg ICBtb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCi0JCQkJCQkgICAgRFJNX0ZPUk1BVF9Y UkdCODg4OCwKLQkJCQkJCSAgICBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FLAotCQkJCQkJICAg IDAsIDAsIDAsICZmYik7Ci0JCWlndF9hc3NlcnQoZmJfaWQgPiAwKTsKLQotCQllbmFibGVfb3V0 cHV0KGRhdGEsIHBvcnQsIG91dHB1dCwgbW9kZSwgJmZiKTsKLQotCQlpZ3RfZGVidWcoIlJlYWRp bmcgZnJhbWUgZHVtcHMgZnJvbSBDaGFtZWxpdW0uLi5cbiIpOwotCi0JCWZyYW1lID0gY2hhbWVs aXVtX3BvcnRfZHVtcF9waXhlbHMoZGF0YS0+Y2hhbWVsaXVtLCBwb3J0LCAwLCAwLAotCQkJCQkJ ICAgMCwgMCk7Ci0KLQkJY2hhbWVsaXVtX2Nyb3BfYW5hbG9nX2ZyYW1lKGZyYW1lLCBtb2RlLT5o ZGlzcGxheSwKLQkJCQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKLQotCQljaGFtZWxpdW1fYXNzZXJ0 X2FuYWxvZ19mcmFtZV9tYXRjaF9vcl9kdW1wKGRhdGEtPmNoYW1lbGl1bSwKLQkJCQkJCQkgICAg cG9ydCwgZnJhbWUsICZmYik7Ci0KLQkJY2hhbWVsaXVtX2Rlc3Ryb3lfZnJhbWVfZHVtcChmcmFt ZSk7Ci0KLQkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmYik7Ci0JfQotCi0JZHJtTW9k ZUZyZWVDb25uZWN0b3IoY29ubmVjdG9yKTsKLX0KLQogc3RhdGljIHZvaWQKIHRlc3RfaHBkX3dp dGhvdXRfZGRjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogewpA QCAtMTA0MSw3ICsxMDE0LDggQEAgaWd0X21haW4KIAkJCXRlc3RfaHBkX3dpdGhvdXRfZGRjKCZk YXRhLCBwb3J0KTsKIAogCQljb25uZWN0b3Jfc3VidGVzdCgidmdhLWZyYW1lLWR1bXAiLCBWR0Ep Ci0JCQl0ZXN0X2FuYWxvZ19mcmFtZV9kdW1wKCZkYXRhLCBwb3J0KTsKKwkJCXRlc3RfZGlzcGxh eV9hbGxfbW9kZXMoJmRhdGEsIHBvcnQsIERSTV9GT1JNQVRfWFJHQjg4ODgsCisJCQkJCSAgICAg ICBDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLCAxKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdF9ncm91cCB7 Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=