From: Petri Latvala Subject: [PATCH i-g-t 2/2] igt_core: Rework igt_system() Date: Thu, 21 Sep 2017 15:52:28 +0300 Message-ID: <1505998348-3444-2-git-send-email-petri.latvala@intel.com> References: <1505998348-3444-1-git-send-email-petri.latvala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from johanna4.inet.fi (mta-out1.inet.fi [62.71.2.233]) by gabe.freedesktop.org (Postfix) with ESMTP id E0F0E6E21A for ; Thu, 21 Sep 2017 12:55:16 +0000 (UTC) In-Reply-To: <1505998348-3444-1-git-send-email-petri.latvala@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 SW5zdGVhZCBvZiByZWRpcmVjdGluZyBvdXRwdXQgdG8gcGlwZXMgYW5kIGZvcmtpbmcsIHJlZGly ZWN0IGFmdGVyCmZvcmtpbmcgdG8gYXZvaWQgaGF2aW5nIHRvIGNhcmVmdWxseSB1bnJlZGlyZWN0 IGJlZm9yZSBsb2dnaW5nCmFueXRoaW5nLgoKaWd0QHRvb2xzX3Rlc3RAc3lzZnNfbDNfcGFyaXR5 IGhhZCBhIHJhY3kgY29uZGl0aW9uIHdoZXJlIGl0IHByaW50cwp0aGUgb3V0cHV0IG9mIGludGVs X2wzX3Bhcml0eSBwcmVwZW5kZWQgYnkgW2NtZF0sIGJ1dCB0aGF0IGVuZGVkIHVwCmJlaW5nIHBy aW50ZWQgYWdhaW4gcHJlcGVuZGVkIGJ5IFtjbWRdIGJlY2F1c2Ugb3V0cHV0IHdhcyByZWRpcmVj dGVkLApjYXVzaW5nIG91dHB1dHMgdG8gYXBwZWFyIG11bHRpcGxlIHRpbWVzLiBUaGlzIHBhdGNo IGZpeGVzIHRoYXQuCgpDQzogQWJkaWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxndWVAbGludXgu aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBQZXRyaSBMYXR2YWxhIDxwZXRyaS5sYXR2YWxhQGlu dGVsLmNvbT4KLS0tCiBsaWIvaWd0X2NvcmUuYyB8IDExNSArKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MCBp bnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2NvcmUu YyBiL2xpYi9pZ3RfY29yZS5jCmluZGV4IDlmNGVlNjhiLi40N2I0NjgyZCAxMDA2NDQKLS0tIGEv bGliL2lndF9jb3JlLmMKKysrIGIvbGliL2lndF9jb3JlLmMKQEAgLTIyMzcsNTggKzIyMzcsMjMg QEAgRklMRSAqX19pZ3RfZm9wZW5fZGF0YShjb25zdCBjaGFyKiBpZ3Rfc3JjZGlyLCBjb25zdCBj aGFyKiBpZ3RfZGF0YWRpciwKIAlyZXR1cm4gZnA7CiB9CiAKLXN0cnVjdCBvdXRwdXRfcGlwZSB7 Ci0JaW50IG91dHB1dF9mZDsKLQlpbnQgc2F2ZV9mZDsKLQlpbnQgcmVhZF9mZDsKLQlpbnQgd3Jp dGVfZmQ7Ci0JYm9vbCByZWRpcmVjdGVkOwotCWVudW0gaWd0X2xvZ19sZXZlbCBsb2dfbGV2ZWw7 Ci19OwotCi1zdGF0aWMgYm9vbCByZWRpcmVjdF9vdXRwdXQoc3RydWN0IG91dHB1dF9waXBlICpw LCBpbnQgb3V0cHV0X2ZkLAotCQkJICAgIGVudW0gaWd0X2xvZ19sZXZlbCBsZXZlbCkKK3N0YXRp YyB2b2lkIGxvZ19vdXRwdXQoaW50ICpmZCwgZW51bSBpZ3RfbG9nX2xldmVsIGxldmVsKQogewot CWludCBmZHNbMl07Ci0KLQlpZiAocGlwZShmZHMpID09IC0xKQotCQlnb3RvIGVycjsKLQotCS8q IHNhdmUgb3V0cHV0ICovCi0JaWYgKChwLT5zYXZlX2ZkID0gZHVwKG91dHB1dF9mZCkpID09IC0x KQotCQlnb3RvIGVycjsKLQotCS8qIFJlZGlyZWN0IG91dHB1dCB0byBvdXIgYnVmZmVyICovCi0J aWYgKGR1cDIoZmRzWzFdLCBvdXRwdXRfZmQpID09IC0xKQotCQlnb3RvIGVycjsKLQotCXAtPm91 dHB1dF9mZCA9IG91dHB1dF9mZDsKLQlwLT5yZWFkX2ZkID0gZmRzWzBdOwotCXAtPndyaXRlX2Zk ID0gZmRzWzFdOwotCXAtPnJlZGlyZWN0ZWQgPSB0cnVlOwotCXAtPmxvZ19sZXZlbCA9IGxldmVs OwotCi0JcmV0dXJuIHRydWU7Ci1lcnI6Ci0JY2xvc2UoZmRzWzBdKTsKLQljbG9zZShmZHNbMV0p OwotCWNsb3NlKHAtPnNhdmVfZmQpOworCXNzaXplX3QgbGVuOworCWNoYXIgYnVmW1BJUEVfQlVG XTsKIAotCXJldHVybiBmYWxzZTsKLX0KKwlpZiAoKmZkIDwgMCkKKwkJcmV0dXJuOwogCi1zdGF0 aWMgdm9pZCB1bnJlZGlyZWN0X291dHB1dChzdHJ1Y3Qgb3V0cHV0X3BpcGUgKnApCi17Ci0JaWYg KCFwLT5yZWRpcmVjdGVkKQorCW1lbXNldChidWYsIDAsIHNpemVvZihidWYpKTsKKwlsZW4gPSBy ZWFkKCpmZCwgYnVmLCBzaXplb2YoYnVmKSk7CisJaWYgKGxlbiA8PSAwKSB7CisJCWNsb3NlKCpm ZCk7CisJCSpmZCA9IC0xOwogCQlyZXR1cm47CisJfQogCi0JLyogcmVhZF9mZCBpcyBjbG9zZWQg c2VwYXJhdGVseS4gV2Ugc3RpbGwgbmVlZCB0byByZWFkIGl0cwotCSAqIGJ1ZmZlcmVkIGNvbnRl bnRzIGFmdGVyIHVuLXJlZGlyZWN0aW5nIHRoZSBzdHJlYW0uCi0JICovCi0JY2xvc2UocC0+d3Jp dGVfZmQpOwotCWR1cDIocC0+c2F2ZV9mZCwgcC0+b3V0cHV0X2ZkKTsKLQljbG9zZShwLT5zYXZl X2ZkKTsKLQlwLT5yZWRpcmVjdGVkID0gZmFsc2U7CisJaWd0X2xvZyhJR1RfTE9HX0RPTUFJTiwg bGV2ZWwsICJbY21kXSAlcyIsIGJ1Zik7CiB9CiAKIC8qKgpAQCAtMjMwNCw0OCArMjI2OSw0OCBA QCBzdGF0aWMgdm9pZCB1bnJlZGlyZWN0X291dHB1dChzdHJ1Y3Qgb3V0cHV0X3BpcGUgKnApCiAg Ki8KIGludCBpZ3Rfc3lzdGVtKGNvbnN0IGNoYXIgKmNvbW1hbmQpCiB7Ci0jZGVmaW5lIE9VVCAw Ci0jZGVmaW5lIEVSUiAxCi0Jc3RydWN0IG91dHB1dF9waXBlIG9wWzJdOwotCWludCBpLCBzdGF0 dXM7CisJaW50IG91dHBpcGVbMl0gPSB7IC0xLCAtMSB9OworCWludCBlcnJwaXBlWzJdID0geyAt MSwgLTEgfTsKKwlpbnQgc3RhdHVzOwogCXN0cnVjdCBpZ3RfaGVscGVyX3Byb2Nlc3MgcHJvY2Vz cyA9IHt9OwotCWNoYXIgYnVmW1BJUEVfQlVGXTsKIAotCWlmICghcmVkaXJlY3Rfb3V0cHV0KCZv cFtPVVRdLCBTVERPVVRfRklMRU5PLCBJR1RfTE9HX0lORk8pKQorCWlmIChwaXBlKG91dHBpcGUp IDwgMCkKIAkJZ290byBlcnI7Ci0JaWYgKCFyZWRpcmVjdF9vdXRwdXQoJm9wW0VSUl0sIFNUREVS Ul9GSUxFTk8sIElHVF9MT0dfV0FSTikpCisJaWYgKHBpcGUoZXJycGlwZSkgPCAwKQogCQlnb3Rv IGVycjsKIAogCWlndF9mb3JrX2hlbHBlcigmcHJvY2VzcykgewotCQlpZ3RfYXNzZXJ0KGV4ZWNs KCIvYmluL3NoIiwgInNoIiwgIi1jIiwgY29tbWFuZCwKLQkJCQkgKGNoYXIgKikgTlVMTCkgIT0g LTEpOworCQljbG9zZShvdXRwaXBlWzBdKTsKKwkJY2xvc2UoZXJycGlwZVswXSk7CisKKwkJaWYg KGR1cDIob3V0cGlwZVsxXSwgU1RET1VUX0ZJTEVOTykgPCAwKQorCQkJZ290byBjaGlsZF9lcnI7 CisJCWlmIChkdXAyKGVycnBpcGVbMV0sIFNUREVSUl9GSUxFTk8pIDwgMCkKKwkJCWdvdG8gY2hp bGRfZXJyOworCisJCWV4ZWNsKCIvYmluL3NoIiwgInNoIiwgIi1jIiwgY29tbWFuZCwKKwkJICAg ICAgKGNoYXIgKikgTlVMTCk7CisKKwljaGlsZF9lcnI6CisJCWV4aXQoRVhJVF9GQUlMVVJFKTsK IAl9CiAKLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShvcCk7IGkrKykgewotCQlzdHJ1Y3Qg b3V0cHV0X3BpcGUgKmN1cnJlbnQgPSAmb3BbaV07CisJY2xvc2Uob3V0cGlwZVsxXSk7CisJY2xv c2UoZXJycGlwZVsxXSk7CiAKLQkJLyogVW5yZWRpcmVjdCBzbyBpZ3RfbG9nKCkgd29ya3MgKi8K LQkJdW5yZWRpcmVjdF9vdXRwdXQoY3VycmVudCk7Ci0JCW1lbXNldChidWYsIDAsIHNpemVvZihi dWYpKTsKLQkJd2hpbGUgKHJlYWQoY3VycmVudC0+cmVhZF9mZCwgYnVmLCBzaXplb2YoYnVmKSkg PiAwKSB7Ci0JCQlpZ3RfbG9nKElHVF9MT0dfRE9NQUlOLCBjdXJyZW50LT5sb2dfbGV2ZWwsCi0J CQkJIltjbWRdICVzIiwgYnVmKTsKLQkJCW1lbXNldChidWYsIDAsIHNpemVvZihidWYpKTsKLQkJ fQotCQljbG9zZShjdXJyZW50LT5yZWFkX2ZkKTsKKwl3aGlsZSAob3V0cGlwZVswXSA+PSAwIHx8 IGVycnBpcGVbMF0gPj0gMCkgeworCQlsb2dfb3V0cHV0KCZvdXRwaXBlWzBdLCBJR1RfTE9HX0lO Rk8pOworCQlsb2dfb3V0cHV0KCZlcnJwaXBlWzBdLCBJR1RfTE9HX1dBUk4pOwogCX0KKwogCXN0 YXR1cyA9IGlndF93YWl0X2hlbHBlcigmcHJvY2Vzcyk7CiAKIAlyZXR1cm4gV0VYSVRTVEFUVVMo c3RhdHVzKTsKIGVycjoKLQkvKiBGYWlsZWQgdG8gcmVkaXJlY3Qgb25lIG9yIGJvdGggc3RyZWFt cy4gUm9sbCBiYWNrIGNoYW5nZXMuICovCi0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUob3Ap OyBpKyspIHsKLQkJaWYgKCFvcFtpXS5yZWRpcmVjdGVkKQotCQkJY29udGludWU7Ci0JCWNsb3Nl KG9wW2ldLnJlYWRfZmQpOwotCQl1bnJlZGlyZWN0X291dHB1dCgmb3BbaV0pOwotCX0KLQorCWNs b3NlKG91dHBpcGVbMF0pOworCWNsb3NlKG91dHBpcGVbMV0pOworCWNsb3NlKGVycnBpcGVbMF0p OworCWNsb3NlKGVycnBpcGVbMV0pOwogCXJldHVybiAtMTsKIH0KIAotLSAKMi4xNC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK