From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8B80897CD for ; Thu, 23 May 2019 07:46:52 +0000 (UTC) Date: Thu, 23 May 2019 10:46:50 +0300 From: Petri Latvala Message-ID: <20190523074650.GP22949@platvala-desk.ger.corp.intel.com> References: <20190516130229.6956-1-arkadiusz.hiler@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190516130229.6956-1-arkadiusz.hiler@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t] lib/igt_core: Rework extra options conflicts handling 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: Arkadiusz Hiler Cc: igt-dev@lists.freedesktop.org List-ID: T24gVGh1LCBNYXkgMTYsIDIwMTkgYXQgMDQ6MDI6MjlQTSArMDMwMCwgQXJrYWRpdXN6IEhpbGVy IHdyb3RlOgo+IFRoaXMgc3RhcnRlZCBzaW1wbGUsIGFzIGEgZml4dXAgZm9yIGEgd2FybmluZzoK PiAgIEluIGZpbGUgaW5jbHVkZWQgZnJvbSAuLi9saWIvZHJtdGVzdC5oOjM5LAo+ICAgICAgICAg ICAgICAgICAgICBmcm9tIC4uL2xpYi9pZ3RfY29yZS5jOjYwOgo+ICAgLi4vbGliL2lndF9jb3Jl LmM6IEluIGZ1bmN0aW9uIOKAmGNvbW1vbl9pbml04oCZOgo+ICAgLi4vbGliL2lndF9jb3JlLmg6 ODkxOjI0OiB3YXJuaW5nOiDigJglc+KAmSBkaXJlY3RpdmUgYXJndW1lbnQgaXMgbnVsbCBbLVdm b3JtYXQtb3ZlcmZsb3c9XQo+ICAgICA4OTEgfCAjZGVmaW5lIGlndF93YXJuKGYuLi4pIGlndF9s b2coSUdUX0xPR19ET01BSU4sIElHVF9MT0dfV0FSTiwgZikKPiAgICAgICAgIHwgICAgICAgICAg ICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+Cj4g ICAuLi9saWIvaWd0X2NvcmUuYzo3MDQ6NDogbm90ZTogaW4gZXhwYW5zaW9uIG9mIG1hY3JvIOKA mGlndF93YXJu4oCZCj4gICAgIDcwNCB8ICAgIGlndF93YXJuKCJDb25mbGljdGluZyBsb25nIGFu ZCBzaG9ydCBvcHRpb24gdmFsdWVzIGJldHdlZW4gLS0lcyBhbmQgLSVzXG4iLAo+ICAgICAgICAg fCAgICBefn5+fn5+fgo+ICAgLi4vbGliL2lndF9jb3JlLmM6NzA0OjczOiBub3RlOiBmb3JtYXQg c3RyaW5nIGlzIGRlZmluZWQgaGVyZQo+ICAgICA3MDQgfCAgICBpZ3Rfd2FybigiQ29uZmxpY3Rp bmcgbG9uZyBhbmQgc2hvcnQgb3B0aW9uIHZhbHVlcyBiZXR3ZWVuIC0tJXMgYW5kIC0lc1xuIiwK PiAgICAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXn4KPiAKPiBCdXQgaXQgZW5kZWQgdXAgZG9pbmcg dGhlIGZvbGxvd2luZyB0aGluZ3M6Cj4gICAxLiBQcm9tb3RlIGFsbCBpZ3Rfd2FybnMgdG8gX2Ny aXRpY2FsIGFuZCBhc3NlcnQgYWZ0ZXJ3YXJkcy4KPiAgIDIuIFVzZSBmb3IgbG9vcCBpbnN0ZWFk IG9mIGEgd2hpbGUtZG9pbmctZm9yJ3Mtam9iLgo+ICAgMy4gU3RyZWFtbGluZSBjYWxjdWxhdGlv biBvZiB0aGUgb3B0aW9uIGxpc3Qgc2l6ZXMuCj4gICA0LiBBZGQgY2hlY2tzIGZvciBsb25nIG9w dGlvbiBuYW1lcy4KPiAgIDUuIExvZyBhYm91dCAiJ3ZhbCcgcmVwcmVzZW50YXRpb24iIGluc3Rl YWQgb2YgY29uZnVzaW5nICJ2YWx1ZSIuCj4gICA2LiBMb2cgY29ycmVjdCB0aGluZ3Mgc28gd2Ug d29uJ3QgJXMgb24gYSBOVUxMLgo+ICAgNy4gV3JpdGUgdGVzdHMgdG8gY29uZmlybSB0aGF0IGl0 IHdvcmtzLgo+IAo+IENjOiBQZXRyaSBMYXR2YWxhIDxwZXRyaS5sYXR2YWxhQGludGVsLmNvbT4K PiBTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5j b20+Cj4gLS0tCj4gIGxpYi9pZ3RfY29yZS5jICAgICAgICAgICAgICAgICAgIHwgNzIgKysrKysr KysrKysrKy0tLS0tLS0tLS0KPiAgbGliL3Rlc3RzL2lndF9jb25mbGljdGluZ19hcmdzLmMgfCA5 OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICBsaWIvdGVzdHMvbWVzb24uYnVp bGQgICAgICAgICAgICB8ICAxICsKPiAgMyBmaWxlcyBjaGFuZ2VkLCAxNDEgaW5zZXJ0aW9ucygr KSwgMzEgZGVsZXRpb25zKC0pCj4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWIvdGVzdHMvaWd0X2Nv bmZsaWN0aW5nX2FyZ3MuYwo+IAo+IGRpZmYgLS1naXQgYS9saWIvaWd0X2NvcmUuYyBiL2xpYi9p Z3RfY29yZS5jCj4gaW5kZXggZDVkNGZjZTIuLjZiYmM4MDVjIDEwMDY0NAo+IC0tLSBhL2xpYi9p Z3RfY29yZS5jCj4gKysrIGIvbGliL2lndF9jb3JlLmMKPiBAQCAtNjY2LDEyICs2NjYsMTIgQEAg c3RhdGljIGludCBjb21tb25faW5pdChpbnQgKmFyZ2MsIGNoYXIgKiphcmd2LAo+ICB7Cj4gIAlp bnQgYywgb3B0aW9uX2luZGV4ID0gMCwgaSwgeDsKPiAgCXN0YXRpYyBzdHJ1Y3Qgb3B0aW9uIGxv bmdfb3B0aW9uc1tdID0gewo+IC0JCXsibGlzdC1zdWJ0ZXN0cyIsIDAsIDAsIE9QVF9MSVNUX1NV QlRFU1RTfSwKPiAtCQl7InJ1bi1zdWJ0ZXN0IiwgMSwgMCwgT1BUX1JVTl9TVUJURVNUfSwKPiAt CQl7ImhlbHAtZGVzY3JpcHRpb24iLCAwLCAwLCBPUFRfREVTQ1JJUFRJT059LAo+IC0JCXsiZGVi dWciLCBvcHRpb25hbF9hcmd1bWVudCwgMCwgT1BUX0RFQlVHfSwKPiAtCQl7ImludGVyYWN0aXZl LWRlYnVnIiwgb3B0aW9uYWxfYXJndW1lbnQsIDAsIE9QVF9JTlRFUkFDVElWRV9ERUJVR30sCj4g LQkJeyJoZWxwIiwgMCwgMCwgT1BUX0hFTFB9LAo+ICsJCXsibGlzdC1zdWJ0ZXN0cyIsICAgICBu b19hcmd1bWVudCwgICAgICAgTlVMTCwgT1BUX0xJU1RfU1VCVEVTVFN9LAo+ICsJCXsicnVuLXN1 YnRlc3QiLCAgICAgICByZXF1aXJlZF9hcmd1bWVudCwgTlVMTCwgT1BUX1JVTl9TVUJURVNUfSwK PiArCQl7ImhlbHAtZGVzY3JpcHRpb24iLCAgbm9fYXJndW1lbnQsICAgICAgIE5VTEwsIE9QVF9E RVNDUklQVElPTn0sCj4gKwkJeyJkZWJ1ZyIsICAgICAgICAgICAgIG9wdGlvbmFsX2FyZ3VtZW50 LCBOVUxMLCBPUFRfREVCVUd9LAo+ICsJCXsiaW50ZXJhY3RpdmUtZGVidWciLCBvcHRpb25hbF9h cmd1bWVudCwgTlVMTCwgT1BUX0lOVEVSQUNUSVZFX0RFQlVHfSwKPiArCQl7ImhlbHAiLCAgICAg ICAgICAgICAgbm9fYXJndW1lbnQsICAgICAgIE5VTEwsIE9QVF9IRUxQfSwKPiAgCQl7MCwgMCwg MCwgMH0KPiAgCX07Cj4gIAljaGFyICpzaG9ydF9vcHRzOwo+IEBAIC02ODcsNDggKzY4Nyw1OCBA QCBzdGF0aWMgaW50IGNvbW1vbl9pbml0KGludCAqYXJnYywgY2hhciAqKmFyZ3YsCj4gIAlpZiAo c3RycmNocihjb21tYW5kX3N0ciwgJy8nKSkKPiAgCQljb21tYW5kX3N0ciA9IHN0cnJjaHIoY29t bWFuZF9zdHIsICcvJykgKyAxOwo+ICAKPiAtCS8qIEZpcnN0IGNhbGN1bGF0ZSBzcGFjZSBmb3Ig YWxsIHBhc3NlZC1pbiBleHRyYSBsb25nIG9wdGlvbnMgKi8KPiAtCWFsbF9vcHRfY291bnQgPSAw Owo+IC0Jd2hpbGUgKGV4dHJhX2xvbmdfb3B0cyAmJiBleHRyYV9sb25nX29wdHNbYWxsX29wdF9j b3VudF0ubmFtZSkgewo+ICsJLyogQ2hlY2sgZm9yIGNvbmZsaWN0cyBhbmQgY2FsY3VsYXRlIHNw YWNlIGZvciBwYXNzZWQtaW4gZXh0cmEgbG9uZyBvcHRpb25zICovCj4gKwlmb3IgIChleHRyYV9v cHRfY291bnQgPSAwOyBleHRyYV9sb25nX29wdHMgJiYgZXh0cmFfbG9uZ19vcHRzW2V4dHJhX29w dF9jb3VudF0ubmFtZTsgZXh0cmFfb3B0X2NvdW50KyspIHsKPiArCQljaGFyICpjb25mbGljdGlu Z19jaGFyOwo+ICAKPiAgCQkvKiBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggc3RhbmRhcmQgbG9u ZyBvcHRpb24gdmFsdWVzICovCj4gLQkJZm9yIChpID0gMDsgbG9uZ19vcHRpb25zW2ldLm5hbWU7 IGkrKykKPiAtCQkJaWYgKGV4dHJhX2xvbmdfb3B0c1thbGxfb3B0X2NvdW50XS52YWwgPT0gbG9u Z19vcHRpb25zW2ldLnZhbCkKPiAtCQkJCWlndF93YXJuKCJDb25mbGljdGluZyBsb25nIG9wdGlv biB2YWx1ZXMgYmV0d2VlbiAtLSVzIGFuZCAtLSVzXG4iLAo+IC0JCQkJCSBleHRyYV9sb25nX29w dHNbYWxsX29wdF9jb3VudF0ubmFtZSwKPiArCQlmb3IgKGkgPSAwOyBsb25nX29wdGlvbnNbaV0u bmFtZTsgaSsrKSB7Cj4gKwkJCWlmICgwID09IHN0cmNtcChleHRyYV9sb25nX29wdHNbZXh0cmFf b3B0X2NvdW50XS5uYW1lLCBsb25nX29wdGlvbnNbaV0ubmFtZSkpIHsKPiArCQkJCWlndF9jcml0 aWNhbCgiQ29uZmxpY3RpbmcgZXh0cmEgbG9uZyBvcHRpb24gZGVmaW5lZCAtLSVzXG4iLCBsb25n X29wdGlvbnNbaV0ubmFtZSk7Cj4gKwkJCQlhc3NlcnQoMCk7Cj4gKwo+ICsJCQl9Cj4gKwo+ICsJ CQlpZiAoZXh0cmFfbG9uZ19vcHRzW2V4dHJhX29wdF9jb3VudF0udmFsID09IGxvbmdfb3B0aW9u c1tpXS52YWwpIHsKPiArCQkJCWlndF9jcml0aWNhbCgiQ29uZmxpY3RpbmcgbG9uZyBvcHRpb24g J3ZhbCcgcmVwcmVzZW50YXRpb24gYmV0d2VlbiAtLSVzIGFuZCAtLSVzXG4iLAo+ICsJCQkJCSBl eHRyYV9sb25nX29wdHNbZXh0cmFfb3B0X2NvdW50XS5uYW1lLAo+ICAJCQkJCSBsb25nX29wdGlv bnNbaV0ubmFtZSk7CgoKSW5kZW50YXRpb24gaGVyZSBsb29rcyBmdW5reS4KCgo+IC0KPiAtCQkv KiBjaGVjayBmb3IgY29uZmxpY3RzIHdpdGggc2hvcnQgb3B0aW9ucyAqLwo+IC0JCWlmIChleHRy YV9sb25nX29wdHNbYWxsX29wdF9jb3VudF0udmFsICE9ICc6Jwo+IC0JCSAgICAmJiBzdHJjaHIo c3RkX3Nob3J0X29wdHMsIGV4dHJhX2xvbmdfb3B0c1thbGxfb3B0X2NvdW50XS52YWwpKSB7Cj4g LQkJCWlndF93YXJuKCJDb25mbGljdGluZyBsb25nIGFuZCBzaG9ydCBvcHRpb24gdmFsdWVzIGJl dHdlZW4gLS0lcyBhbmQgLSVzXG4iLAo+IC0JCQkJIGV4dHJhX2xvbmdfb3B0c1thbGxfb3B0X2Nv dW50XS5uYW1lLAo+IC0JCQkJIGxvbmdfb3B0aW9uc1tpXS5uYW1lKTsKPiArCQkJCWFzc2VydCgw KTsKPiArCQkJfQo+ICAJCX0KPiAgCj4gLQo+IC0JCWFsbF9vcHRfY291bnQrKzsKPiArCQkvKiBj aGVjayBmb3IgY29uZmxpY3RzIHdpdGggc3RhbmRhcmQgc2hvcnQgb3B0aW9ucyAqLwo+ICsJCWlm IChleHRyYV9sb25nX29wdHNbZXh0cmFfb3B0X2NvdW50XS52YWwgIT0gJzonCj4gKwkJICAgICYm IChjb25mbGljdGluZ19jaGFyID0gc3RyY2hyKHN0ZF9zaG9ydF9vcHRzLCBleHRyYV9sb25nX29w dHNbZXh0cmFfb3B0X2NvdW50XS52YWwpKSkgewo+ICsJCQlpZ3RfY3JpdGljYWwoIkNvbmZsaWN0 aW5nIGxvbmcgYW5kIHNob3J0IG9wdGlvbiAndmFsJyByZXByZXNlbnRhdGlvbiBiZXR3ZWVuIC0t JXMgYW5kIC0lY1xuIiwKPiArCQkJCSBleHRyYV9sb25nX29wdHNbZXh0cmFfb3B0X2NvdW50XS5u YW1lLAo+ICsJCQkJICpjb25mbGljdGluZ19jaGFyKTsKCgpJbmRlbnRhdGlvbiBmdW5reSBoZXJl IGFzIHdlbGwuCgoKT3RoZXJ3aXNlIExHVE0uIFRoYW5rcyBmb3IgZG9pbmcgdGhpcywgdGhpcyBp cyBhIGdyZWF0IGhlbHAgaW4gbXkKdXBjb21pbmcgc2VyaWVzIHRoYXQgdG91Y2hlcyB0ZXN0ZGlz cGxheSBhbW9uZyBvdGhlciB0aGluZ3MuLi4KClJldmlld2VkLWJ5OiBQZXRyaSBMYXR2YWxhIDxw ZXRyaS5sYXR2YWxhQGludGVsLmNvbT4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p Z3QtZGV2