From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: Re: [PATCH i-g-t 1/2] lib/igt_core: Move all config-related parsing to common_init_config Date: Thu, 20 Jul 2017 13:24:43 -0400 Message-ID: <1500571483.4787.1.camel@redhat.com> References: <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: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8ABDB6E14E for ; Thu, 20 Jul 2017 17:24:45 +0000 (UTC) In-Reply-To: <20170720141127.14974-1-paul.kocialkowski@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paul Kocialkowski , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Rm9yIHRoZSB3aG9sZSBzZXJpZXM6CgpSZXZpZXdlZC1ieTogTHl1ZGUgPGx5dWRlQHJlZGhhdC5j b20+CgpBbmQgcHVzaGVkCgpPbiBUaHUsIDIwMTctMDctMjAgYXQgMTc6MTEgKzAzMDAsIFBhdWwg S29jaWFsa293c2tpIHdyb3RlOgo+IFRoaXMgbW92ZXMgYWxsIHRoZSBwaWVjZXMgcmVsYXRlZCB0 byBjb25maWcgcGFyc2luZyB0byB0aGUgZGVkaWNhdGVkCj4gZnVuY3Rpb24gZm9yIHRoaXMgcHVy cG9zZSwgcmVuYW1lZCBjb21tb25faW5pdF9jb25maWcgZm9yCj4gY29uc2lzdGVuY3kuCj4gCj4g SXQgYWxsb3dzIG1ha2luZyB0aGUgY29tbW9uX2luaXQgZnVuY3Rpb24gbGVzcyBiaWcgYW5kIG1v cmUgcmVhZGFibGUuCj4gCj4gU2lnbmVkLW9mZi1ieTogUGF1bCBLb2NpYWxrb3dza2kgPHBhdWwu a29jaWFsa293c2tpQGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgbGliL2lndF9jb3JlLmMgfCA3 NyArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gLS0tLS0t LS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMo LSkKPiAKPiBkaWZmIC0tZ2l0IGEvbGliL2lndF9jb3JlLmMgYi9saWIvaWd0X2NvcmUuYwo+IGlu ZGV4IDAzZDlhNWJmLi5lMjUyNzZmYyAxMDA2NDQKPiAtLS0gYS9saWIvaWd0X2NvcmUuYwo+ICsr KyBiL2xpYi9pZ3RfY29yZS5jCj4gQEAgLTYyMiwxMyArNjIyLDM1IEBAIHN0YXRpYyB2b2lkIG9v bV9hZGp1c3RfZm9yX2Rvb20odm9pZCkKPiAgfQo+ICAKPiAgI2lmZGVmIEhBVkVfR0xJQgo+IC1z dGF0aWMgaW50IGNvbmZpZ19wYXJzZSh2b2lkKQo+ICtzdGF0aWMgdm9pZCBjb21tb25faW5pdF9j b25maWcodm9pZCkKPiAgewo+ICsJY2hhciAqa2V5X2ZpbGVfZW52ID0gTlVMTDsKPiArCWNoYXIg KmtleV9maWxlX2xvYyA9IE5VTEw7Cj4gIAlHRXJyb3IgKmVycm9yID0gTlVMTDsKPiAtCWludCBy YzsKPiArCWludCByZXQ7Cj4gIAo+IC0JaWYgKCFpZ3Rfa2V5X2ZpbGUpCj4gLQkJcmV0dXJuIDA7 Cj4gKwkvKiBEZXRlcm1pbmUgaWd0IGNvbmZpZyBwYXRoICovCj4gKwlrZXlfZmlsZV9lbnYgPSBn ZXRlbnYoIklHVF9DT05GSUdfUEFUSCIpOwo+ICsJaWYgKGtleV9maWxlX2Vudikgewo+ICsJCWtl eV9maWxlX2xvYyA9IGtleV9maWxlX2VudjsKPiArCX0gZWxzZSB7Cj4gKwkJa2V5X2ZpbGVfbG9j ID0gbWFsbG9jKDEwMCk7Cj4gKwkJc25wcmludGYoa2V5X2ZpbGVfbG9jLCAxMDAsICIlcy8uaWd0 cmMiLAo+IGdfZ2V0X2hvbWVfZGlyKCkpOwo+ICsJfQo+ICsKPiArCS8qIExvYWQgaWd0IGNvbmZp ZyBmaWxlICovCj4gKwlpZ3Rfa2V5X2ZpbGUgPSBnX2tleV9maWxlX25ldygpOwo+ICsJcmV0ID0g Z19rZXlfZmlsZV9sb2FkX2Zyb21fZmlsZShpZ3Rfa2V5X2ZpbGUsIGtleV9maWxlX2xvYywKPiAr CQkJCQlHX0tFWV9GSUxFX05PTkUsICZlcnJvcik7Cj4gKwlpZiAoZXJyb3IgJiYgZXJyb3ItPmNv ZGUgPT0gR19LRVlfRklMRV9FUlJPUikgewo+ICsJCWdfZXJyb3JfZnJlZShlcnJvcik7Cj4gKwkJ Z19rZXlfZmlsZV9mcmVlKGlndF9rZXlfZmlsZSk7Cj4gKwkJaWd0X2tleV9maWxlID0gTlVMTDsK PiArCj4gKwkJZ290byBvdXQ7Cj4gKwl9Cj4gKwo+ICsJZ19jbGVhcl9lcnJvcigmZXJyb3IpOwo+ ICAKPiAgCWZyYW1lX2R1bXBfcGF0aCA9IGdldGVudigiSUdUX0ZSQU1FX0RVTVBfUEFUSCIpOwo+ ICAKPiBAQCAtNjM5LDE5ICs2NjEsMTggQEAgc3RhdGljIGludCBjb25maWdfcGFyc2Uodm9pZCkK PiAgCj4gIAlnX2NsZWFyX2Vycm9yKCZlcnJvcik7Cj4gIAo+IC0JcmMgPSBnX2tleV9maWxlX2dl dF9pbnRlZ2VyKGlndF9rZXlfZmlsZSwgIkRVVCIsCj4gIlN1c3BlbmRSZXN1bWVEZWxheSIsCj4g LQkJCQkgICAgJmVycm9yKTsKPiAtCWlmIChlcnJvciAmJiBlcnJvci0+Y29kZSA9PSBHX0tFWV9G SUxFX0VSUk9SX0lOVkFMSURfVkFMVUUpCj4gewo+IC0JCWdfZXJyb3JfZnJlZShlcnJvcik7Cj4g LQkJcmV0dXJuIC0yOwo+IC0JfQo+ICsJcmV0ID0gZ19rZXlfZmlsZV9nZXRfaW50ZWdlcihpZ3Rf a2V5X2ZpbGUsICJEVVQiLAo+ICJTdXNwZW5kUmVzdW1lRGVsYXkiLAo+ICsJCQkJICAgICAmZXJy b3IpOwo+ICsJYXNzZXJ0KCFlcnJvciB8fCBlcnJvci0+Y29kZSAhPQo+IEdfS0VZX0ZJTEVfRVJS T1JfSU5WQUxJRF9WQUxVRSk7Cj4gIAo+ICAJZ19jbGVhcl9lcnJvcigmZXJyb3IpOwo+ICAKPiAt CWlmIChyYyAhPSAwKQo+IC0JCWlndF9zZXRfYXV0b3Jlc3VtZV9kZWxheShyYyk7Cj4gKwlpZiAo cmV0ICE9IDApCj4gKwkJaWd0X3NldF9hdXRvcmVzdW1lX2RlbGF5KHJldCk7Cj4gIAo+IC0JcmV0 dXJuIDA7Cj4gK291dDoKPiArCWlmICgha2V5X2ZpbGVfZW52ICYmIGtleV9maWxlX2xvYykKPiAr CQlmcmVlKGtleV9maWxlX2xvYyk7Cj4gIH0KPiAgI2VuZGlmCj4gIAo+IEBAIC02NzgsOSArNjk5 LDYgQEAgc3RhdGljIGludCBjb21tb25faW5pdChpbnQgKmFyZ2MsIGNoYXIgKiphcmd2LAo+ICAJ aW50IGV4dHJhX29wdF9jb3VudDsKPiAgCWludCBhbGxfb3B0X2NvdW50Owo+ICAJaW50IHJldCA9 IDA7Cj4gLQljaGFyICprZXlfZmlsZV9sb2MgPSBOVUxMOwo+IC0JY2hhciAqa2V5X2ZpbGVfZW52 ID0gTlVMTDsKPiAtCUdFcnJvciAqZXJyb3IgPSBOVUxMOwo+ICAJY29uc3QgY2hhciAqZW52Owo+ ICAKPiAgCWlmICghaXNhdHR5KFNURE9VVF9GSUxFTk8pIHx8IGdldGVudigiSUdUX1BMQUlOX09V VFBVVCIpKQo+IEBAIC04MDIsMzYgKzgyMCwxMSBAQCBzdGF0aWMgaW50IGNvbW1vbl9pbml0KGlu dCAqYXJnYywgY2hhciAqKmFyZ3YsCj4gIAkJfQo+ICAJfQo+ICAKPiAtCWtleV9maWxlX2VudiA9 IGdldGVudigiSUdUX0NPTkZJR19QQVRIIik7Cj4gLQlpZiAoa2V5X2ZpbGVfZW52KSB7Cj4gLQkJ a2V5X2ZpbGVfbG9jID0ga2V5X2ZpbGVfZW52Owo+IC0JfSBlbHNlIHsKPiAtCQlrZXlfZmlsZV9s b2MgPSBtYWxsb2MoMTAwKTsKPiAtCQlzbnByaW50ZihrZXlfZmlsZV9sb2MsIDEwMCwgIiVzLy5p Z3RyYyIsCj4gZ19nZXRfaG9tZV9kaXIoKSk7Cj4gLQl9Cj4gLQo+ICAjaWZkZWYgSEFWRV9HTElC Cj4gLQlpZ3Rfa2V5X2ZpbGUgPSBnX2tleV9maWxlX25ldygpOwo+IC0JcmV0ID0gZ19rZXlfZmls ZV9sb2FkX2Zyb21fZmlsZShpZ3Rfa2V5X2ZpbGUsIGtleV9maWxlX2xvYywKPiAtCQkJCQlHX0tF WV9GSUxFX05PTkUsICZlcnJvcik7Cj4gLQlpZiAoZXJyb3IgJiYgZXJyb3ItPmNvZGUgPT0gR19L RVlfRklMRV9FUlJPUikgewo+IC0JCWdfZXJyb3JfZnJlZShlcnJvcik7Cj4gLQkJZ19rZXlfZmls ZV9mcmVlKGlndF9rZXlfZmlsZSk7Cj4gLQkJaWd0X2tleV9maWxlID0gTlVMTDsKPiAtCQlyZXQg PSAtMjsKPiAtCj4gLQkJZ290byBvdXQ7Cj4gLQl9Cj4gLQo+IC0JZ19jbGVhcl9lcnJvcigmZXJy b3IpOwo+IC0KPiAtCXJldCA9IGNvbmZpZ19wYXJzZSgpOwo+ICsJY29tbW9uX2luaXRfY29uZmln KCk7Cj4gICNlbmRpZgo+ICAKPiAgb3V0Ogo+IC0JaWYgKCFrZXlfZmlsZV9lbnYgJiYga2V5X2Zp bGVfbG9jKQo+IC0JCWZyZWUoa2V5X2ZpbGVfbG9jKTsKPiAtCj4gIAlmcmVlKHNob3J0X29wdHMp Owo+ICAJZnJlZShjb21iaW5lZF9vcHRzKTsKPiAgCi0tIApDaGVlcnMsCglMeXVkZQpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK