From: Thomas Wood Subject: [PATCH i-g-t 2/4] tests/kms_force_connect: split into subtests Date: Fri, 28 Nov 2014 16:22:22 +0000 Message-ID: <1417191744-5767-2-git-send-email-thomas.wood@intel.com> References: <1417191744-5767-1-git-send-email-thomas.wood@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 9175A6EF08 for ; Fri, 28 Nov 2014 08:22:28 -0800 (PST) Received: by mail-wg0-f42.google.com with SMTP id z12so9294295wgg.15 for ; Fri, 28 Nov 2014 08:22:28 -0800 (PST) In-Reply-To: <1417191744-5767-1-git-send-email-thomas.wood@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogVGhvbWFzIFdvb2QgPHRob21hcy53b29kQGludGVsLmNvbT4KLS0tCiB0 ZXN0cy9rbXNfZm9yY2VfY29ubmVjdG9yLmMgfCAxNjcgKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4OSBpbnNlcnRpb25zKCspLCA3 OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfZm9yY2VfY29ubmVjdG9yLmMg Yi90ZXN0cy9rbXNfZm9yY2VfY29ubmVjdG9yLmMKaW5kZXggMzRjMzNiMC4uZDQ0NmVhYSAxMDA2 NDQKLS0tIGEvdGVzdHMva21zX2ZvcmNlX2Nvbm5lY3Rvci5jCisrKyBiL3Rlc3RzL2ttc19mb3Jj ZV9jb25uZWN0b3IuYwpAQCAtMjcsOTggKzI3LDEwOSBAQAogI2luY2x1ZGUgImRybXRlc3QuaCIK ICNpbmNsdWRlICJpZ3RfZWRpZC5oIgogCi1pbnQKLW1haW4gKGludCBhcmdjLCBjaGFyICoqYXJn dikKK2lndF9tYWluCiB7CiAJLyogZm9yY2UgdGhlIFZHQSBvdXRwdXQgYW5kIHRlc3QgdGhhdCBp dCB3b3JrZWQgKi8KLQlpbnQgZHJtX2ZkOworCWludCBkcm1fZmQgPSAwOwogCWRybU1vZGVSZXMg KnJlczsKLQlkcm1Nb2RlQ29ubmVjdG9yICp2Z2FfY29ubmVjdG9yLCAqdGVtcDsKKwlkcm1Nb2Rl Q29ubmVjdG9yICp2Z2FfY29ubmVjdG9yID0gTlVMTCwgKnRlbXA7CiAJaWd0X2Rpc3BsYXlfdCBk aXNwbGF5OwogCWludCBzdGFydF9uX21vZGVzOwogCi0JaWd0X3NpbXBsZV9pbml0KGFyZ2MsIGFy Z3YpOworCWlndF9maXh0dXJlIHsKKwkJZHJtX2ZkID0gZHJtX29wZW5fYW55X21hc3RlcigpOwor CQlyZXMgPSBkcm1Nb2RlR2V0UmVzb3VyY2VzKGRybV9mZCk7CiAKLQlkcm1fZmQgPSBkcm1fb3Bl bl9hbnlfbWFzdGVyKCk7Ci0JcmVzID0gZHJtTW9kZUdldFJlc291cmNlcyhkcm1fZmQpOworCQkv KiBmaW5kIHRoZSB2Z2EgY29ubmVjdG9yICovCisJCWZvciAoaW50IGkgPSAwOyBpIDwgcmVzLT5j b3VudF9jb25uZWN0b3JzOyBpKyspIHsKIAotCS8qIGZpbmQgdGhlIHZnYSBjb25uZWN0b3IgKi8K LQlmb3IgKGludCBpID0gMDsgaSA8IHJlcy0+Y291bnRfY29ubmVjdG9yczsgaSsrKSB7CisJCQl2 Z2FfY29ubmVjdG9yID0gZHJtTW9kZUdldENvbm5lY3Rvcihkcm1fZmQsIHJlcy0+Y29ubmVjdG9y c1tpXSk7CiAKLQkJdmdhX2Nvbm5lY3RvciA9IGRybU1vZGVHZXRDb25uZWN0b3IoZHJtX2ZkLCBy ZXMtPmNvbm5lY3RvcnNbaV0pOworCQkJaWYgKHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBl ID09IERSTV9NT0RFX0NPTk5FQ1RPUl9WR0EpCisJCQkJYnJlYWs7CiAKLQkJaWYgKHZnYV9jb25u ZWN0b3ItPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9WR0EpCi0JCQlicmVh azsKKwkJCWRybU1vZGVGcmVlQ29ubmVjdG9yKHZnYV9jb25uZWN0b3IpOwogCi0JCWRybU1vZGVG cmVlQ29ubmVjdG9yKHZnYV9jb25uZWN0b3IpOworCQkJdmdhX2Nvbm5lY3RvciA9IE5VTEw7CisJ CX0KKworCQlpZ3RfcmVxdWlyZSh2Z2FfY29ubmVjdG9yKTsKKwl9CiAKLQkJdmdhX2Nvbm5lY3Rv ciA9IE5VTEw7CisJaWd0X3N1YnRlc3QoImZvcmNlLWNvbm5lY3Rvci1zdGF0ZSIpIHsKKwkJLyog Zm9yY2UgdGhlIGNvbm5lY3RvciBvbiBhbmQgY2hlY2sgdGhlIHJlcG9ydGVkIHZhbHVlcyAqLwor CQlrbXN0ZXN0X2ZvcmNlX2Nvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0b3IsIEZPUkNFX0NP Tk5FQ1RPUl9PTik7CisJCXRlbXAgPSBkcm1Nb2RlR2V0Q29ubmVjdG9yKGRybV9mZCwgdmdhX2Nv bm5lY3Rvci0+Y29ubmVjdG9yX2lkKTsKKwkJaWd0X2Fzc2VydCh0ZW1wLT5jb25uZWN0aW9uID09 IERSTV9NT0RFX0NPTk5FQ1RFRCk7CisJCWlndF9hc3NlcnQodGVtcC0+Y291bnRfbW9kZXMgPiAw KTsKKwkJc3RhcnRfbl9tb2RlcyA9IHRlbXAtPmNvdW50X21vZGVzOworCQlkcm1Nb2RlRnJlZUNv bm5lY3Rvcih0ZW1wKTsKKworCQkvKiBhdHRlbXB0IHRvIHVzZSB0aGUgZGlzcGxheSAqLworCQlr bXN0ZXN0X3NldF92dF9ncmFwaGljc19tb2RlKCk7CisJCWlndF9kaXNwbGF5X2luaXQoJmRpc3Bs YXksIGRybV9mZCk7CisJCWlndF9kaXNwbGF5X2NvbW1pdCgmZGlzcGxheSk7CisKKworCQkvKiBm b3JjZSB0aGUgY29ubmVjdG9yIG9mZiAqLworCQlrbXN0ZXN0X2ZvcmNlX2Nvbm5lY3Rvcihkcm1f ZmQsIHZnYV9jb25uZWN0b3IsCisJCQkJCUZPUkNFX0NPTk5FQ1RPUl9PRkYpOworCQl0ZW1wID0g ZHJtTW9kZUdldENvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rvcl9pZCk7 CisJCWlndF9hc3NlcnQodGVtcC0+Y29ubmVjdGlvbiA9PSBEUk1fTU9ERV9ESVNDT05ORUNURUQp OworCQlpZ3RfYXNzZXJ0KHRlbXAtPmNvdW50X21vZGVzID09IDApOworCQlkcm1Nb2RlRnJlZUNv bm5lY3Rvcih0ZW1wKTsKKworCQkvKiBjaGVjayB0aGF0IHRoZSBwcmV2aW91cyBzdGF0ZSBpcyBy ZXN0b3JlZCAqLworCQlrbXN0ZXN0X2ZvcmNlX2Nvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0 b3IsCisJCQkJCUZPUkNFX0NPTk5FQ1RPUl9VTlNQRUNJRklFRCk7CisJCXRlbXAgPSBkcm1Nb2Rl R2V0Q29ubmVjdG9yKGRybV9mZCwgdmdhX2Nvbm5lY3Rvci0+Y29ubmVjdG9yX2lkKTsKKwkJaWd0 X2Fzc2VydCh0ZW1wLT5jb25uZWN0aW9uID09IHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rpb24pOwor CQlkcm1Nb2RlRnJlZUNvbm5lY3Rvcih0ZW1wKTsKIAl9CiAKLQlpZ3RfcmVxdWlyZSh2Z2FfY29u bmVjdG9yKTsKLQotCS8qIGZvcmNlIHRoZSBjb25uZWN0b3Igb24gYW5kIGNoZWNrIHRoZSByZXBv cnRlZCB2YWx1ZXMgKi8KLQlrbXN0ZXN0X2ZvcmNlX2Nvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25u ZWN0b3IsIEZPUkNFX0NPTk5FQ1RPUl9PTik7Ci0JdGVtcCA9IGRybU1vZGVHZXRDb25uZWN0b3Io ZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLT5jb25uZWN0b3JfaWQpOwotCWlndF9hc3NlcnQodGVtcC0+ Y29ubmVjdGlvbiA9PSBEUk1fTU9ERV9DT05ORUNURUQpOwotCWlndF9hc3NlcnQodGVtcC0+Y291 bnRfbW9kZXMgPiAwKTsKLQlzdGFydF9uX21vZGVzID0gdGVtcC0+Y291bnRfbW9kZXM7Ci0JZHJt TW9kZUZyZWVDb25uZWN0b3IodGVtcCk7Ci0KLQkvKiBhdHRlbXB0IHRvIHVzZSB0aGUgZGlzcGxh eSAqLwotCWttc3Rlc3Rfc2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsKLQotCWlndF9kaXNwbGF5X2lu aXQoJmRpc3BsYXksIGRybV9mZCk7Ci0JaWd0X2Rpc3BsYXlfY29tbWl0KCZkaXNwbGF5KTsKLQot CS8qIHRlc3QgZWRpZCBmb3JjaW5nICovCi0Ja21zdGVzdF9mb3JjZV9lZGlkKGRybV9mZCwgdmdh X2Nvbm5lY3RvciwgZ2VuZXJpY19lZGlkW0VESURfRkhEXSwKLQkJCSAgIEVESURfTEVOR1RIKTsK LQl0ZW1wID0gZHJtTW9kZUdldENvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0b3ItPmNvbm5l Y3Rvcl9pZCk7Ci0KLQlpZ3RfYXNzZXJ0KHRlbXAtPmNvdW50X21vZGVzID09IDEpOwotCWlndF9h c3NlcnQodGVtcC0+bW9kZXNbMF0udnJlZnJlc2ggPT0gNjAKLQkJICAgJiYgdGVtcC0+bW9kZXNb MF0uaGRpc3BsYXkgPT0gMTkyMAotCQkgICAmJiB0ZW1wLT5tb2Rlc1swXS52ZGlzcGxheSA9PSAx MDgwKTsKLQotCWRybU1vZGVGcmVlQ29ubmVjdG9yKHRlbXApOwotCi0JLyogY3VzdG9tIGVkaWQg Ki8KLQlrbXN0ZXN0X2ZvcmNlX2VkaWQoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLCBnZW5lcmljX2Vk aWRbRURJRF9XU1hHQV0sCi0JCQkgICBFRElEX0xFTkdUSCk7Ci0JdGVtcCA9IGRybU1vZGVHZXRD b25uZWN0b3IoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLT5jb25uZWN0b3JfaWQpOwotCi0JaWd0X2Fz c2VydCh0ZW1wLT5jb3VudF9tb2RlcyA9PSAxKTsKLQlpZ3RfYXNzZXJ0KHRlbXAtPm1vZGVzWzBd LnZyZWZyZXNoID09IDYwCi0JCSAgICYmIHRlbXAtPm1vZGVzWzBdLmhkaXNwbGF5ID09IDE2ODAK LQkJICAgJiYgdGVtcC0+bW9kZXNbMF0udmRpc3BsYXkgPT0gMTA1MCk7Ci0KLQlkcm1Nb2RlRnJl ZUNvbm5lY3Rvcih0ZW1wKTsKLQotCS8qIHJlbW92ZSBlZGlkICovCi0Ja21zdGVzdF9mb3JjZV9l ZGlkKGRybV9mZCwgdmdhX2Nvbm5lY3RvciwgTlVMTCwgMCk7Ci0JdGVtcCA9IGRybU1vZGVHZXRD b25uZWN0b3IoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLT5jb25uZWN0b3JfaWQpOwotCS8qIHRoZSBj b25uZWN0b3Igc2hvdWxkIG5vdyBoYXZlIHRoZSBzYW1lIG51bWJlciBvZiBtb2RlcyB0aGF0IGl0 Ci0JICogc3RhcnRlZCB3aXRoICovCi0JaWd0X2Fzc2VydCh0ZW1wLT5jb3VudF9tb2RlcyA9PSBz dGFydF9uX21vZGVzKTsKLQlkcm1Nb2RlRnJlZUNvbm5lY3Rvcih0ZW1wKTsKLQotCS8qIGZvcmNl IHRoZSBjb25uZWN0b3Igb2ZmICovCi0Ja21zdGVzdF9mb3JjZV9jb25uZWN0b3IoZHJtX2ZkLCB2 Z2FfY29ubmVjdG9yLCBGT1JDRV9DT05ORUNUT1JfT0ZGKTsKLQl0ZW1wID0gZHJtTW9kZUdldENv bm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rvcl9pZCk7Ci0JaWd0X2Fzc2Vy dCh0ZW1wLT5jb25uZWN0aW9uID09IERSTV9NT0RFX0RJU0NPTk5FQ1RFRCk7Ci0JaWd0X2Fzc2Vy dCh0ZW1wLT5jb3VudF9tb2RlcyA9PSAwKTsKLQlkcm1Nb2RlRnJlZUNvbm5lY3Rvcih0ZW1wKTsK LQotCi0JLyogY2hlY2sgdGhhdCB0aGUgcHJldmlvdXMgc3RhdGUgaXMgcmVzdG9yZWQgKi8KLQlr bXN0ZXN0X2ZvcmNlX2Nvbm5lY3Rvcihkcm1fZmQsIHZnYV9jb25uZWN0b3IsCi0JCQkJRk9SQ0Vf Q09OTkVDVE9SX1VOU1BFQ0lGSUVEKTsKLQl0ZW1wID0gZHJtTW9kZUdldENvbm5lY3Rvcihkcm1f ZmQsIHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rvcl9pZCk7Ci0JaWd0X2Fzc2VydCh0ZW1wLT5jb25u ZWN0aW9uID09IHZnYV9jb25uZWN0b3ItPmNvbm5lY3Rpb24pOwotCWRybU1vZGVGcmVlQ29ubmVj dG9yKHRlbXApOwotCi0JZHJtTW9kZUZyZWVDb25uZWN0b3IodmdhX2Nvbm5lY3Rvcik7CisJaWd0 X3N1YnRlc3QoImZvcmNlLWVkaWQiKSB7CisJCWttc3Rlc3RfZm9yY2VfY29ubmVjdG9yKGRybV9m ZCwgdmdhX2Nvbm5lY3RvciwKKwkJCQkJRk9SQ0VfQ09OTkVDVE9SX09OKTsKKworCQkvKiB0ZXN0 IGVkaWQgZm9yY2luZyAqLworCQlrbXN0ZXN0X2ZvcmNlX2VkaWQoZHJtX2ZkLCB2Z2FfY29ubmVj dG9yLAorCQkJCSAgIGdlbmVyaWNfZWRpZFtFRElEX0ZIRF0sIEVESURfTEVOR1RIKTsKKwkJdGVt cCA9IGRybU1vZGVHZXRDb25uZWN0b3IoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLT5jb25uZWN0b3Jf aWQpOworCisJCWlndF9hc3NlcnQodGVtcC0+Y291bnRfbW9kZXMgPT0gMSk7CisJCWlndF9hc3Nl cnQodGVtcC0+bW9kZXNbMF0udnJlZnJlc2ggPT0gNjAKKwkJCSAgICYmIHRlbXAtPm1vZGVzWzBd LmhkaXNwbGF5ID09IDE5MjAKKwkJCSAgICYmIHRlbXAtPm1vZGVzWzBdLnZkaXNwbGF5ID09IDEw ODApOworCisJCWRybU1vZGVGcmVlQ29ubmVjdG9yKHRlbXApOworCisJCS8qIGN1c3RvbSBlZGlk ICovCisJCWttc3Rlc3RfZm9yY2VfZWRpZChkcm1fZmQsIHZnYV9jb25uZWN0b3IsCisJCQkJICAg Z2VuZXJpY19lZGlkW0VESURfV1NYR0FdLCBFRElEX0xFTkdUSCk7CisJCXRlbXAgPSBkcm1Nb2Rl R2V0Q29ubmVjdG9yKGRybV9mZCwgdmdhX2Nvbm5lY3Rvci0+Y29ubmVjdG9yX2lkKTsKKworCQlp Z3RfYXNzZXJ0KHRlbXAtPmNvdW50X21vZGVzID09IDEpOworCQlpZ3RfYXNzZXJ0KHRlbXAtPm1v ZGVzWzBdLnZyZWZyZXNoID09IDYwCisJCQkgICAmJiB0ZW1wLT5tb2Rlc1swXS5oZGlzcGxheSA9 PSAxNjgwCisJCQkgICAmJiB0ZW1wLT5tb2Rlc1swXS52ZGlzcGxheSA9PSAxMDUwKTsKKworCQlk cm1Nb2RlRnJlZUNvbm5lY3Rvcih0ZW1wKTsKKworCQkvKiByZW1vdmUgZWRpZCAqLworCQlrbXN0 ZXN0X2ZvcmNlX2VkaWQoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLCBOVUxMLCAwKTsKKwkJdGVtcCA9 IGRybU1vZGVHZXRDb25uZWN0b3IoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLT5jb25uZWN0b3JfaWQp OworCQkvKiB0aGUgY29ubmVjdG9yIHNob3VsZCBub3cgaGF2ZSB0aGUgc2FtZSBudW1iZXIgb2Yg bW9kZXMgdGhhdAorCQkgKiBpdCBzdGFydGVkIHdpdGggKi8KKwkJaWd0X2Fzc2VydCh0ZW1wLT5j b3VudF9tb2RlcyA9PSBzdGFydF9uX21vZGVzKTsKKwkJZHJtTW9kZUZyZWVDb25uZWN0b3IodGVt cCk7CisKKwkJa21zdGVzdF9mb3JjZV9jb25uZWN0b3IoZHJtX2ZkLCB2Z2FfY29ubmVjdG9yLAor CQkJCQlGT1JDRV9DT05ORUNUT1JfVU5TUEVDSUZJRUQpOworCX0KKworCWlndF9maXh0dXJlIHsK KwkJZHJtTW9kZUZyZWVDb25uZWN0b3IodmdhX2Nvbm5lY3Rvcik7CisJfQogCiAJaWd0X2V4aXQo KTsKIH0KLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=