From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Tvrtko Ursulin Date: Thu, 23 May 2019 09:39:29 +0100 Message-Id: <20190523083929.6015-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] lib/i915: Fix test enumeration on legacy kernels 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: Intel-gfx@lists.freedesktop.org, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldoZXJlIGVu Z2luZSBkaXNjb3ZlcnkgYW5kIGNvbnRleHQgZW5naW5lIG1hcCBhcmUgbm90IHN1cHBvcnRlZCB3 ZSBtdXN0Cm5vdCBjYWxsIHRoZSBhc3NlcnRpbmcgZ2VtX2NsYXNzX2luc3RhbmNlX3RvX2ViX2Zs YWdzIGZyb20gdGhlIGVuZ2luZQpsaXN0IGluaXRhbGl6ZXIuIChTaW5jZSBub3QgYWxsIGVuZ2lu ZXMgY2FuIGJlIGFkZHJlc3NlZCB1c2luZyB0aGUgbGVnYWN5CmV4ZWNidWYgQVBJLikKCkluc3Rl YWQgZXh0cmFjdCB0aGUgY29kZSBpbnRvIGxvd2VyIGxldmVsIF9fZ2VtX2NsYXNzX2luc3RhbmNl X3RvX2ViX2ZsYWdzCmhlbHBlciB3aGljaCBjYW4gcmV0dXJuIGVycm9ycyB0aGUgY2FsbGVyIGNh biBtYW51YWxseSBoYW5kbGUgdGhlbi4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0 dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBBbmRpIFNoeXRpIDxhbmRpLnNoeXRpQGludGVs LmNvbT4KLS0tCiBsaWIvaTkxNS9nZW1fZW5naW5lX3RvcG9sb2d5LmMgfCAxNyArKysrKysrKysr KysrLS0tLQogbGliL2lndF9ndC5jICAgICAgICAgICAgICAgICAgIHwgMjggKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLQogbGliL2lndF9ndC5oICAgICAgICAgICAgICAgICAgIHwgIDUgKysr KysKIDMgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGliL2k5MTUvZ2VtX2VuZ2luZV90b3BvbG9neS5jIGIvbGliL2k5MTUvZ2Vt X2VuZ2luZV90b3BvbG9neS5jCmluZGV4IGQwYzhiZDVhYWVhYy4uMTc0ODIzMWExZGUwIDEwMDY0 NAotLS0gYS9saWIvaTkxNS9nZW1fZW5naW5lX3RvcG9sb2d5LmMKKysrIGIvbGliL2k5MTUvZ2Vt X2VuZ2luZV90b3BvbG9neS5jCkBAIC0yMjIsMTUgKzIyMiwyNCBAQCBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2RhdGEgaW50ZWxfaW5pdF9lbmdpbmVfbGlzdChpbnQgZmQsIHVpbnQzMl90IGN0eF9pZCkK IAkJX19mb3JfZWFjaF9zdGF0aWNfZW5naW5lKGUyKSB7CiAJCQlzdHJ1Y3QgaW50ZWxfZXhlY3V0 aW9uX2VuZ2luZTIgKl9fZTIgPQogCQkJCSZlbmdpbmVfZGF0YS5lbmdpbmVzW2VuZ2luZV9kYXRh Lm5lbmdpbmVzXTsKKwkJCWludCBmbGFnczsKKworCQkJZmxhZ3MgPSBfX2dlbV9jbGFzc19pbnN0 YW5jZV90b19lYl9mbGFncyhmZCwKKwkJCQkJCQkJIGUyLT5jbGFzcywKKwkJCQkJCQkJIGUyLT5p bnN0YW5jZSk7CisKKwkJCV9fZTItPmZsYWdzID0gZmxhZ3M7CiAKIAkJCWlmICghaWd0X29ubHlf bGlzdF9zdWJ0ZXN0cygpKSB7Ci0JCQkJX19lMi0+ZmxhZ3MgPSBnZW1fY2xhc3NfaW5zdGFuY2Vf dG9fZWJfZmxhZ3MoZmQsCi0JCQkJCQllMi0+Y2xhc3MsIGUyLT5pbnN0YW5jZSk7CisJCQkJLyoK KwkJCQkgKiBTa2lwIGVuZ2luZXMgbm90IHN1cG9ydGVkIHdpdGggbGVnYWN5CisJCQkJICogZXhl Y2J1Zi4KKwkJCQkgKi8KKwkJCQlpZiAoZmxhZ3MgPCAwKQorCQkJCQljb250aW51ZTsKIAogCQkJ CWlmICghZ2VtX2hhc19yaW5nKGZkLCBfX2UyLT5mbGFncykpCiAJCQkJCWNvbnRpbnVlOwotCQkJ fSBlbHNlIHsKLQkJCQlfX2UyLT5mbGFncyA9IC0xOyAvKiAweGZmZi4uLiAqLwogCQkJfQogCiAJ CQlfX2UyLT5uYW1lICAgICAgID0gZTItPm5hbWU7CmRpZmYgLS1naXQgYS9saWIvaWd0X2d0LmMg Yi9saWIvaWd0X2d0LmMKaW5kZXggNmI3YzAzN2U2ZDEwLi4xYTgxYTFmYjQwNWYgMTAwNjQ0Ci0t LSBhL2xpYi9pZ3RfZ3QuYworKysgYi9saWIvaWd0X2d0LmMKQEAgLTYxMSwxNSArNjExLDEzIEBA IGludCBnZW1fZXhlY2J1Zl9mbGFnc190b19lbmdpbmVfY2xhc3ModW5zaWduZWQgaW50IGZsYWdz KQogCX0KIH0KIAotdW5zaWduZWQgaW50Ci1nZW1fY2xhc3NfaW5zdGFuY2VfdG9fZWJfZmxhZ3Mo aW50IGdlbV9mZCwKLQkJCSAgICAgICBlbnVtIGRybV9pOTE1X2dlbV9lbmdpbmVfY2xhc3MgY2xh c3MsCi0JCQkgICAgICAgdW5zaWduZWQgaW50IGluc3RhbmNlKQoraW50CitfX2dlbV9jbGFzc19p bnN0YW5jZV90b19lYl9mbGFncyhpbnQgZ2VtX2ZkLAorCQkJCSBlbnVtIGRybV9pOTE1X2dlbV9l bmdpbmVfY2xhc3MgY2xhc3MsCisJCQkJIHVuc2lnbmVkIGludCBpbnN0YW5jZSkKIHsKLQlpZiAo Y2xhc3MgIT0gSTkxNV9FTkdJTkVfQ0xBU1NfVklERU8pCi0JCWlndF9hc3NlcnQoaW5zdGFuY2Ug PT0gMCk7Ci0JZWxzZQotCQlpZ3RfYXNzZXJ0KGluc3RhbmNlID49IDAgJiYgaW5zdGFuY2UgPD0g MSk7CisJaWYgKGluc3RhbmNlID4gMSB8fCAoY2xhc3MgIT0gSTkxNV9FTkdJTkVfQ0xBU1NfVklE RU8gJiYgaW5zdGFuY2UgPiAwKSkKKwkJcmV0dXJuIC0xOwogCiAJc3dpdGNoIChjbGFzcykgewog CWNhc2UgSTkxNV9FTkdJTkVfQ0xBU1NfUkVOREVSOgpAQCAtNjQwLDEwICs2MzgsMjIgQEAgZ2Vt X2NsYXNzX2luc3RhbmNlX3RvX2ViX2ZsYWdzKGludCBnZW1fZmQsCiAJCXJldHVybiBJOTE1X0VY RUNfVkVCT1g7CiAJY2FzZSBJOTE1X0VOR0lORV9DTEFTU19JTlZBTElEOgogCWRlZmF1bHQ6Ci0J CWlndF9hc3NlcnQoMCk7CisJCXJldHVybiAtMTsKIAl9OwogfQogCit1bnNpZ25lZCBpbnQKK2dl bV9jbGFzc19pbnN0YW5jZV90b19lYl9mbGFncyhpbnQgZ2VtX2ZkLAorCQkJICAgICAgIGVudW0g ZHJtX2k5MTVfZ2VtX2VuZ2luZV9jbGFzcyBjbGFzcywKKwkJCSAgICAgICB1bnNpZ25lZCBpbnQg aW5zdGFuY2UpCit7CisJaW50IGZsYWdzID0gX19nZW1fY2xhc3NfaW5zdGFuY2VfdG9fZWJfZmxh Z3MoZ2VtX2ZkLCBjbGFzcywgaW5zdGFuY2UpOworCisJaWd0X2Fzc2VydChmbGFncyA+PSAwKTsK KworCXJldHVybiBmbGFnczsKK30KKwogYm9vbCBnZW1faGFzX2VuZ2luZShpbnQgZ2VtX2ZkLAog CQkgICAgZW51bSBkcm1faTkxNV9nZW1fZW5naW5lX2NsYXNzIGNsYXNzLAogCQkgICAgdW5zaWdu ZWQgaW50IGluc3RhbmNlKQpkaWZmIC0tZ2l0IGEvbGliL2lndF9ndC5oIGIvbGliL2lndF9ndC5o CmluZGV4IDc3MzE4ZTJhODJiOC4uMTg5YjliZjcwYThiIDEwMDY0NAotLS0gYS9saWIvaWd0X2d0 LmgKKysrIGIvbGliL2lndF9ndC5oCkBAIC0xMDIsNiArMTAyLDExIEBAIGV4dGVybiBjb25zdCBz dHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZTIgewogCiBpbnQgZ2VtX2V4ZWNidWZfZmxhZ3Nf dG9fZW5naW5lX2NsYXNzKHVuc2lnbmVkIGludCBmbGFncyk7CiAKK2ludAorX19nZW1fY2xhc3Nf aW5zdGFuY2VfdG9fZWJfZmxhZ3MoaW50IGdlbV9mZCwKKwkJCQkgZW51bSBkcm1faTkxNV9nZW1f ZW5naW5lX2NsYXNzIGNsYXNzLAorCQkJCSB1bnNpZ25lZCBpbnQgaW5zdGFuY2UpOworCiB1bnNp Z25lZCBpbnQKIGdlbV9jbGFzc19pbnN0YW5jZV90b19lYl9mbGFncyhpbnQgZ2VtX2ZkLAogCQkJ ICAgICAgIGVudW0gZHJtX2k5MTVfZ2VtX2VuZ2luZV9jbGFzcyBjbGFzcywKLS0gCjIuMjAuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBt YWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2