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 B47BF6E027 for ; Fri, 25 Jan 2019 14:59:05 +0000 (UTC) From: Maxime Ripard Date: Fri, 25 Jan 2019 15:58:41 +0100 Message-Id: <20190125145842.15738-13-maxime.ripard@bootlin.com> In-Reply-To: <20190125145842.15738-1-maxime.ripard@bootlin.com> References: <20190125145842.15738-1-maxime.ripard@bootlin.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v5 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 aW9uLgoKUmV2aWV3ZWQtYnk6IFBhdWwgS29jaWFsa293c2tpIDxwYXVsLmtvY2lhbGtvd3NraUBi b290bGluLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF4aW1lIFJpcGFyZCA8bWF4aW1lLnJpcGFyZEBi b290bGluLmNvbT4KLS0tCiB0ZXN0cy9rbXNfY2hhbWVsaXVtLmMgfCA5MiArKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0 aW9ucygrKSwgNTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2NoYW1lbGl1 bS5jIGIvdGVzdHMva21zX2NoYW1lbGl1bS5jCmluZGV4IDgyMzBjYjg1MmNmYi4uZWFlYTljMTg4 MzJhIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfY2hhbWVsaXVtLmMKKysrIGIvdGVzdHMva21zX2No YW1lbGl1bS5jCkBAIC01MjgsNiArNTI4LDcgQEAgc3RhdGljIGludCBjaGFtZWxpdW1fZ2V0X3Bh dHRlcm5fZmIoZGF0YV90ICpkYXRhLCBzaXplX3Qgd2lkdGgsIHNpemVfdCBoZWlnaHQsCiB9CiAK IGVudW0gY2hhbWVsaXVtX2NoZWNrIHsKKwlDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLAogCUNIQU1F TElVTV9DSEVDS19DUkMsCiB9OwogCkBAIC01NzksNiArNTgwLDE4IEBAIHN0YXRpYyB2b2lkIGRv X3Rlc3RfZGlzcGxheShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwK IAogCQlmcmVlKGV4cGVjdGVkX2NyYyk7CiAJCWZyZWUoY3JjKTsKKwl9IGVsc2UgaWYgKGNoZWNr ID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpIHsKKwkJc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9k dW1wICpkdW1wOworCisJCWlndF9hc3NlcnQoY291bnQgPT0gMSk7CisKKwkJZHVtcCA9IGNoYW1l bGl1bV9wb3J0X2R1bXBfcGl4ZWxzKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwgMCwgMCwKKwkJCQkJ CSAgMCwgMCk7CisJCWNoYW1lbGl1bV9jcm9wX2FuYWxvZ19mcmFtZShkdW1wLCBtb2RlLT5oZGlz cGxheSwKKwkJCQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKKwkJY2hhbWVsaXVtX2Fzc2VydF9hbmFs b2dfZnJhbWVfbWF0Y2hfb3JfZHVtcChkYXRhLT5jaGFtZWxpdW0sCisJCQkJCQkJICAgIHBvcnQs IGR1bXAsICZmYik7CisJCWNoYW1lbGl1bV9kZXN0cm95X2ZyYW1lX2R1bXAoZHVtcCk7CiAJfQog CiAJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmcmFtZV9mYik7CkBAIC01ODksOCArNjAy LDkgQEAgc3RhdGljIHZvaWQgdGVzdF9kaXNwbGF5X29uZV9tb2RlKGRhdGFfdCAqZGF0YSwgc3Ry dWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0LAogCQkJCSAgdWludDMyX3QgZm91cmNjLCBlbnVtIGNo YW1lbGl1bV9jaGVjayBjaGVjaywKIAkJCQkgIGludCBjb3VudCkKIHsKLQlpZ3Rfb3V0cHV0X3Qg Km91dHB1dDsKIAlkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3I7CisJZHJtTW9kZU1vZGVJbmZv ICptb2RlOworCWlndF9vdXRwdXRfdCAqb3V0cHV0OwogCWlndF9wbGFuZV90ICpwcmltYXJ5Owog CiAJcmVzZXRfc3RhdGUoZGF0YSwgcG9ydCk7CkBAIC02MDAsOCArNjE0LDE0IEBAIHN0YXRpYyB2 b2lkIHRlc3RfZGlzcGxheV9vbmVfbW9kZShkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1f cG9ydCAqcG9ydCwKIAlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQs IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwogCWlndF9hc3NlcnQocHJpbWFyeSk7CiAKLQlkb190 ZXN0X2Rpc3BsYXkoZGF0YSwgcG9ydCwgb3V0cHV0LCAmY29ubmVjdG9yLT5tb2Rlc1swXSwgZm91 cmNjLAotCQkJY2hlY2ssIGNvdW50KTsKKwltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbMF07CisJ aWYgKGNoZWNrID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpIHsKKwkJYm9vbCBicmlkZ2UgPSBj aGVja19hbmFsb2dfYnJpZGdlKGRhdGEsIHBvcnQpOworCisJCWlndF9hc3NlcnQoIShicmlkZ2Ug JiYgcHJ1bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpKTsKKwl9CisKKwlkb190ZXN0X2Rpc3BsYXko ZGF0YSwgcG9ydCwgb3V0cHV0LCBtb2RlLCBmb3VyY2MsIGNoZWNrLCBjb3VudCk7CiAKIAlkcm1N b2RlRnJlZUNvbm5lY3Rvcihjb25uZWN0b3IpOwogfQpAQCAtNjEzLDYgKzYzMyw3IEBAIHN0YXRp YyB2b2lkIHRlc3RfZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVs aXVtX3BvcnQgKnBvcnQsCiAJaWd0X291dHB1dF90ICpvdXRwdXQ7CiAJaWd0X3BsYW5lX3QgKnBy aW1hcnk7CiAJZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOworCWJvb2wgYnJpZGdlOwogCWlu dCBpOwogCiAJcmVzZXRfc3RhdGUoZGF0YSwgcG9ydCk7CkBAIC02MjIsOSArNjQzLDE2IEBAIHN0 YXRpYyB2b2lkIHRlc3RfZGlzcGxheV9hbGxfbW9kZXMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hh bWVsaXVtX3BvcnQgKnBvcnQsCiAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUo b3V0cHV0LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKIAlpZ3RfYXNzZXJ0KHByaW1hcnkpOwog CisJaWYgKGNoZWNrID09IENIQU1FTElVTV9DSEVDS19BTkFMT0cpCisJCWJyaWRnZSA9IGNoZWNr X2FuYWxvZ19icmlkZ2UoZGF0YSwgcG9ydCk7CisKIAlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9y LT5jb3VudF9tb2RlczsgaSsrKSB7CiAJCWRybU1vZGVNb2RlSW5mbyAqbW9kZSA9ICZjb25uZWN0 b3ItPm1vZGVzW2ldOwogCisJCWlmIChjaGVjayA9PSBDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HICYm IGJyaWRnZSAmJgorCQkgICAgcHJ1bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpCisJCQljb250aW51 ZTsKKwogCQlkb190ZXN0X2Rpc3BsYXkoZGF0YSwgcG9ydCwgb3V0cHV0LCBtb2RlLCBmb3VyY2Ms IGNoZWNrLCBjb3VudCk7CiAJfQogCkBAIC02NzUsNjEgKzcwMyw2IEBAIHRlc3RfZGlzcGxheV9m cmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogCWRy bU1vZGVGcmVlQ29ubmVjdG9yKGNvbm5lY3Rvcik7CiB9CiAKLXN0YXRpYyB2b2lkCi10ZXN0X2Fu YWxvZ19mcmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0 KQotewotCWlndF9vdXRwdXRfdCAqb3V0cHV0OwotCWlndF9wbGFuZV90ICpwcmltYXJ5OwotCXN0 cnVjdCBpZ3RfZmIgZmI7Ci0Jc3RydWN0IGNoYW1lbGl1bV9mcmFtZV9kdW1wICpmcmFtZTsKLQlk cm1Nb2RlTW9kZUluZm8gKm1vZGU7Ci0JZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOwotCWlu dCBmYl9pZCwgaTsKLQlib29sIGJyaWRnZTsKLQotCXJlc2V0X3N0YXRlKGRhdGEsIHBvcnQpOwot Ci0Jb3V0cHV0ID0gcHJlcGFyZV9vdXRwdXQoZGF0YSwgcG9ydCk7Ci0JY29ubmVjdG9yID0gY2hh bWVsaXVtX3BvcnRfZ2V0X2Nvbm5lY3RvcihkYXRhLT5jaGFtZWxpdW0sIHBvcnQsIGZhbHNlKTsK LQlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9U WVBFX1BSSU1BUlkpOwotCWlndF9hc3NlcnQocHJpbWFyeSk7Ci0KLQlicmlkZ2UgPSBjaGVja19h bmFsb2dfYnJpZGdlKGRhdGEsIHBvcnQpOwotCi0JZm9yIChpID0gMDsgaSA8IGNvbm5lY3Rvci0+ Y291bnRfbW9kZXM7IGkrKykgewotCQltb2RlID0gJmNvbm5lY3Rvci0+bW9kZXNbaV07Ci0KLQkJ aWYgKGJyaWRnZSAmJiBwcnVuZV92Z2FfbW9kZShkYXRhLCBtb2RlKSkKLQkJCWNvbnRpbnVlOwot Ci0JCWZiX2lkID0gaWd0X2NyZWF0ZV9jb2xvcl9wYXR0ZXJuX2ZiKGRhdGEtPmRybV9mZCwKLQkJ CQkJCSAgICBtb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCi0JCQkJCQkgICAgRFJNX0ZP Uk1BVF9YUkdCODg4OCwKLQkJCQkJCSAgICBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FLAotCQkJ CQkJICAgIDAsIDAsIDAsICZmYik7Ci0JCWlndF9hc3NlcnQoZmJfaWQgPiAwKTsKLQotCQllbmFi bGVfb3V0cHV0KGRhdGEsIHBvcnQsIG91dHB1dCwgbW9kZSwgJmZiKTsKLQotCQlpZ3RfZGVidWco IlJlYWRpbmcgZnJhbWUgZHVtcHMgZnJvbSBDaGFtZWxpdW0uLi5cbiIpOwotCi0JCWZyYW1lID0g Y2hhbWVsaXVtX3BvcnRfZHVtcF9waXhlbHMoZGF0YS0+Y2hhbWVsaXVtLCBwb3J0LCAwLCAwLAot CQkJCQkJICAgMCwgMCk7Ci0KLQkJY2hhbWVsaXVtX2Nyb3BfYW5hbG9nX2ZyYW1lKGZyYW1lLCBt b2RlLT5oZGlzcGxheSwKLQkJCQkJICAgIG1vZGUtPnZkaXNwbGF5KTsKLQotCQljaGFtZWxpdW1f YXNzZXJ0X2FuYWxvZ19mcmFtZV9tYXRjaF9vcl9kdW1wKGRhdGEtPmNoYW1lbGl1bSwKLQkJCQkJ CQkgICAgcG9ydCwgZnJhbWUsICZmYik7Ci0KLQkJY2hhbWVsaXVtX2Rlc3Ryb3lfZnJhbWVfZHVt cChmcmFtZSk7Ci0KLQkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmYik7Ci0JfQotCi0J ZHJtTW9kZUZyZWVDb25uZWN0b3IoY29ubmVjdG9yKTsKLX0KLQogc3RhdGljIHZvaWQKIHRlc3Rf aHBkX3dpdGhvdXRfZGRjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0 KQogewpAQCAtMTA0MSw3ICsxMDE0LDggQEAgaWd0X21haW4KIAkJCXRlc3RfaHBkX3dpdGhvdXRf ZGRjKCZkYXRhLCBwb3J0KTsKIAogCQljb25uZWN0b3Jfc3VidGVzdCgidmdhLWZyYW1lLWR1bXAi LCBWR0EpCi0JCQl0ZXN0X2FuYWxvZ19mcmFtZV9kdW1wKCZkYXRhLCBwb3J0KTsKKwkJCXRlc3Rf ZGlzcGxheV9hbGxfbW9kZXMoJmRhdGEsIHBvcnQsIERSTV9GT1JNQVRfWFJHQjg4ODgsCisJCQkJ CSAgICAgICBDSEFNRUxJVU1fQ0hFQ0tfQU5BTE9HLCAxKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdF9n cm91cCB7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dgo=