From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
Subject: [PATCH i-g-t 1/2] lib/igt_core: Move all config-related
	parsing to common_init_config
Date: Thu, 20 Jul 2017 17:11:26 +0300
Message-ID: <20170720141127.14974-1-paul.kocialkowski@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 448DF6E167
 for <intel-gfx@lists.freedesktop.org>; Thu, 20 Jul 2017 14:12:20 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBtb3ZlcyBhbGwgdGhlIHBpZWNlcyByZWxhdGVkIHRvIGNvbmZpZyBwYXJzaW5nIHRvIHRo
ZSBkZWRpY2F0ZWQKZnVuY3Rpb24gZm9yIHRoaXMgcHVycG9zZSwgcmVuYW1lZCBjb21tb25faW5p
dF9jb25maWcgZm9yIGNvbnNpc3RlbmN5LgoKSXQgYWxsb3dzIG1ha2luZyB0aGUgY29tbW9uX2lu
aXQgZnVuY3Rpb24gbGVzcyBiaWcgYW5kIG1vcmUgcmVhZGFibGUuCgpTaWduZWQtb2ZmLWJ5OiBQ
YXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lAbGludXguaW50ZWwuY29tPgotLS0K
IGxpYi9pZ3RfY29yZS5jIHwgNzcgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyks
IDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfY29yZS5jIGIvbGliL2lndF9j
b3JlLmMKaW5kZXggMDNkOWE1YmYuLmUyNTI3NmZjIDEwMDY0NAotLS0gYS9saWIvaWd0X2NvcmUu
YworKysgYi9saWIvaWd0X2NvcmUuYwpAQCAtNjIyLDEzICs2MjIsMzUgQEAgc3RhdGljIHZvaWQg
b29tX2FkanVzdF9mb3JfZG9vbSh2b2lkKQogfQogCiAjaWZkZWYgSEFWRV9HTElCCi1zdGF0aWMg
aW50IGNvbmZpZ19wYXJzZSh2b2lkKQorc3RhdGljIHZvaWQgY29tbW9uX2luaXRfY29uZmlnKHZv
aWQpCiB7CisJY2hhciAqa2V5X2ZpbGVfZW52ID0gTlVMTDsKKwljaGFyICprZXlfZmlsZV9sb2Mg
PSBOVUxMOwogCUdFcnJvciAqZXJyb3IgPSBOVUxMOwotCWludCByYzsKKwlpbnQgcmV0OwogCi0J
aWYgKCFpZ3Rfa2V5X2ZpbGUpCi0JCXJldHVybiAwOworCS8qIERldGVybWluZSBpZ3QgY29uZmln
IHBhdGggKi8KKwlrZXlfZmlsZV9lbnYgPSBnZXRlbnYoIklHVF9DT05GSUdfUEFUSCIpOworCWlm
IChrZXlfZmlsZV9lbnYpIHsKKwkJa2V5X2ZpbGVfbG9jID0ga2V5X2ZpbGVfZW52OworCX0gZWxz
ZSB7CisJCWtleV9maWxlX2xvYyA9IG1hbGxvYygxMDApOworCQlzbnByaW50ZihrZXlfZmlsZV9s
b2MsIDEwMCwgIiVzLy5pZ3RyYyIsIGdfZ2V0X2hvbWVfZGlyKCkpOworCX0KKworCS8qIExvYWQg
aWd0IGNvbmZpZyBmaWxlICovCisJaWd0X2tleV9maWxlID0gZ19rZXlfZmlsZV9uZXcoKTsKKwly
ZXQgPSBnX2tleV9maWxlX2xvYWRfZnJvbV9maWxlKGlndF9rZXlfZmlsZSwga2V5X2ZpbGVfbG9j
LAorCQkJCQlHX0tFWV9GSUxFX05PTkUsICZlcnJvcik7CisJaWYgKGVycm9yICYmIGVycm9yLT5j
b2RlID09IEdfS0VZX0ZJTEVfRVJST1IpIHsKKwkJZ19lcnJvcl9mcmVlKGVycm9yKTsKKwkJZ19r
ZXlfZmlsZV9mcmVlKGlndF9rZXlfZmlsZSk7CisJCWlndF9rZXlfZmlsZSA9IE5VTEw7CisKKwkJ
Z290byBvdXQ7CisJfQorCisJZ19jbGVhcl9lcnJvcigmZXJyb3IpOwogCiAJZnJhbWVfZHVtcF9w
YXRoID0gZ2V0ZW52KCJJR1RfRlJBTUVfRFVNUF9QQVRIIik7CiAKQEAgLTYzOSwxOSArNjYxLDE4
IEBAIHN0YXRpYyBpbnQgY29uZmlnX3BhcnNlKHZvaWQpCiAKIAlnX2NsZWFyX2Vycm9yKCZlcnJv
cik7CiAKLQlyYyA9IGdfa2V5X2ZpbGVfZ2V0X2ludGVnZXIoaWd0X2tleV9maWxlLCAiRFVUIiwg
IlN1c3BlbmRSZXN1bWVEZWxheSIsCi0JCQkJICAgICZlcnJvcik7Ci0JaWYgKGVycm9yICYmIGVy
cm9yLT5jb2RlID09IEdfS0VZX0ZJTEVfRVJST1JfSU5WQUxJRF9WQUxVRSkgewotCQlnX2Vycm9y
X2ZyZWUoZXJyb3IpOwotCQlyZXR1cm4gLTI7Ci0JfQorCXJldCA9IGdfa2V5X2ZpbGVfZ2V0X2lu
dGVnZXIoaWd0X2tleV9maWxlLCAiRFVUIiwgIlN1c3BlbmRSZXN1bWVEZWxheSIsCisJCQkJICAg
ICAmZXJyb3IpOworCWFzc2VydCghZXJyb3IgfHwgZXJyb3ItPmNvZGUgIT0gR19LRVlfRklMRV9F
UlJPUl9JTlZBTElEX1ZBTFVFKTsKIAogCWdfY2xlYXJfZXJyb3IoJmVycm9yKTsKIAotCWlmIChy
YyAhPSAwKQotCQlpZ3Rfc2V0X2F1dG9yZXN1bWVfZGVsYXkocmMpOworCWlmIChyZXQgIT0gMCkK
KwkJaWd0X3NldF9hdXRvcmVzdW1lX2RlbGF5KHJldCk7CiAKLQlyZXR1cm4gMDsKK291dDoKKwlp
ZiAoIWtleV9maWxlX2VudiAmJiBrZXlfZmlsZV9sb2MpCisJCWZyZWUoa2V5X2ZpbGVfbG9jKTsK
IH0KICNlbmRpZgogCkBAIC02NzgsOSArNjk5LDYgQEAgc3RhdGljIGludCBjb21tb25faW5pdChp
bnQgKmFyZ2MsIGNoYXIgKiphcmd2LAogCWludCBleHRyYV9vcHRfY291bnQ7CiAJaW50IGFsbF9v
cHRfY291bnQ7CiAJaW50IHJldCA9IDA7Ci0JY2hhciAqa2V5X2ZpbGVfbG9jID0gTlVMTDsKLQlj
aGFyICprZXlfZmlsZV9lbnYgPSBOVUxMOwotCUdFcnJvciAqZXJyb3IgPSBOVUxMOwogCWNvbnN0
IGNoYXIgKmVudjsKIAogCWlmICghaXNhdHR5KFNURE9VVF9GSUxFTk8pIHx8IGdldGVudigiSUdU
X1BMQUlOX09VVFBVVCIpKQpAQCAtODAyLDM2ICs4MjAsMTEgQEAgc3RhdGljIGludCBjb21tb25f
aW5pdChpbnQgKmFyZ2MsIGNoYXIgKiphcmd2LAogCQl9CiAJfQogCi0Ja2V5X2ZpbGVfZW52ID0g
Z2V0ZW52KCJJR1RfQ09ORklHX1BBVEgiKTsKLQlpZiAoa2V5X2ZpbGVfZW52KSB7Ci0JCWtleV9m
aWxlX2xvYyA9IGtleV9maWxlX2VudjsKLQl9IGVsc2UgewotCQlrZXlfZmlsZV9sb2MgPSBtYWxs
b2MoMTAwKTsKLQkJc25wcmludGYoa2V5X2ZpbGVfbG9jLCAxMDAsICIlcy8uaWd0cmMiLCBnX2dl
dF9ob21lX2RpcigpKTsKLQl9Ci0KICNpZmRlZiBIQVZFX0dMSUIKLQlpZ3Rfa2V5X2ZpbGUgPSBn
X2tleV9maWxlX25ldygpOwotCXJldCA9IGdfa2V5X2ZpbGVfbG9hZF9mcm9tX2ZpbGUoaWd0X2tl
eV9maWxlLCBrZXlfZmlsZV9sb2MsCi0JCQkJCUdfS0VZX0ZJTEVfTk9ORSwgJmVycm9yKTsKLQlp
ZiAoZXJyb3IgJiYgZXJyb3ItPmNvZGUgPT0gR19LRVlfRklMRV9FUlJPUikgewotCQlnX2Vycm9y
X2ZyZWUoZXJyb3IpOwotCQlnX2tleV9maWxlX2ZyZWUoaWd0X2tleV9maWxlKTsKLQkJaWd0X2tl
eV9maWxlID0gTlVMTDsKLQkJcmV0ID0gLTI7Ci0KLQkJZ290byBvdXQ7Ci0JfQotCi0JZ19jbGVh
cl9lcnJvcigmZXJyb3IpOwotCi0JcmV0ID0gY29uZmlnX3BhcnNlKCk7CisJY29tbW9uX2luaXRf
Y29uZmlnKCk7CiAjZW5kaWYKIAogb3V0OgotCWlmICgha2V5X2ZpbGVfZW52ICYmIGtleV9maWxl
X2xvYykKLQkJZnJlZShrZXlfZmlsZV9sb2MpOwotCiAJZnJlZShzaG9ydF9vcHRzKTsKIAlmcmVl
KGNvbWJpbmVkX29wdHMpOwogCi0tIAoyLjEzLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2ludGVsLWdmeAo=