From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: Re: [PATCH libdrm 2/2] xf85drm: de-duplicate drmParse{Platform.Host1x}{Bus, Device}Info Date: Fri, 25 Jan 2019 13:11:31 +0000 Message-ID: <20190125131131.ptsyzbyjmdsf3cm6@intel.com> References: <20190123104518.7332-1-emil.l.velikov@gmail.com> <20190123104518.7332-2-emil.l.velikov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED2206E329 for ; Fri, 25 Jan 2019 13:11:33 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190123104518.7332-2-emil.l.velikov@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Emil Velikov Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkbmVzZGF5LCAyMDE5LTAxLTIzIDEwOjQ1OjE4ICswMDAwLCBFbWlsIFZlbGlrb3Ygd3Jv dGU6Cj4gRnJvbTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNvbT4KPiAK PiBUaGUgZnVuY3Rpb25zIGFyZSB2aXJ0dWFsbHkgaWRlbnRpY2FsLCBmb2xkIHRoZW0gdXAuCj4g Cj4gU2lnbmVkLW9mZi1ieTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNv bT4KCkFzc3VtaW5nIHBhdGNoIDEgaXMgT0ssIGFuZCBgZm9vYCBnZXRzIHJlbmFtZWQgdG8gc29t ZXRoaW5nIGJldHRlcjoKUmV2aWV3ZWQtYnk6IEVyaWMgRW5nZXN0cm9tIDxlcmljLmVuZ2VzdHJv bUBpbnRlbC5jb20+CgpJIGRvbid0IGtub3cgZW5vdWdoIHRvIHJldmlldyBwYXRjaCAxIHRob3Vn aC4KCj4gLS0tCj4gIHhmODZkcm0uYyB8IDk4ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlv bnMoKyksIDgzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS94Zjg2ZHJtLmMgYi94Zjg2 ZHJtLmMKPiBpbmRleCAzNzQ3MzRlYi4uMThjOTY5M2EgMTAwNjQ0Cj4gLS0tIGEveGY4NmRybS5j Cj4gKysrIGIveGY4NmRybS5jCj4gQEAgLTM1MDgsNyArMzUwOCw3IEBAIGZyZWVfZGV2aWNlOgo+ ICAgICAgcmV0dXJuIHJldDsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBkcm1QYXJzZVBsYXRmb3Jt QnVzSW5mbyhpbnQgbWFqLCBpbnQgbWluLCBkcm1QbGF0Zm9ybUJ1c0luZm9QdHIgaW5mbykKPiAr c3RhdGljIGludCBkcm1QYXJzZU9GQnVzSW5mbyhpbnQgbWFqLCBpbnQgbWluLCBjaGFyICpmdWxs bmFtZSkKPiAgewo+ICAjaWZkZWYgX19saW51eF9fCj4gICAgICBjaGFyIHBhdGhbUEFUSF9NQVgg KyAxXSwgKm5hbWUsICpmb287Cj4gQEAgLTM1MzIsMTkgKzM1MzIsMTggQEAgc3RhdGljIGludCBk cm1QYXJzZVBsYXRmb3JtQnVzSW5mbyhpbnQgbWFqLCBpbnQgbWluLCBkcm1QbGF0Zm9ybUJ1c0lu Zm9QdHIgaW5mbykKPiAgICAgICAgICBmb28rKzsKPiAgICAgIH0KPiAgCj4gLSAgICBzdHJuY3B5 KGluZm8tPmZ1bGxuYW1lLCBmb28sIERSTV9QTEFURk9STV9ERVZJQ0VfTkFNRV9MRU4pOwo+IC0g ICAgaW5mby0+ZnVsbG5hbWVbRFJNX1BMQVRGT1JNX0RFVklDRV9OQU1FX0xFTiAtIDFdID0gJ1ww JzsKPiArICAgIHN0cm5jcHkoZnVsbG5hbWUsIGZvbywgRFJNX1BMQVRGT1JNX0RFVklDRV9OQU1F X0xFTik7Cj4gKyAgICBmdWxsbmFtZVtEUk1fUExBVEZPUk1fREVWSUNFX05BTUVfTEVOIC0gMV0g PSAnXDAnOwo+ICAgICAgZnJlZShuYW1lKTsKPiAgCj4gICAgICByZXR1cm4gMDsKPiAgI2Vsc2UK PiAtI3dhcm5pbmcgIk1pc3NpbmcgaW1wbGVtZW50YXRpb24gb2YgZHJtUGFyc2VQbGF0Zm9ybUJ1 c0luZm8iCj4gKyN3YXJuaW5nICJNaXNzaW5nIGltcGxlbWVudGF0aW9uIG9mIGRybVBhcnNlT0ZC dXNJbmZvIgo+ICAgICAgcmV0dXJuIC1FSU5WQUw7Cj4gICNlbmRpZgo+ICB9Cj4gIAo+IC1zdGF0 aWMgaW50IGRybVBhcnNlUGxhdGZvcm1EZXZpY2VJbmZvKGludCBtYWosIGludCBtaW4sCj4gLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZHJtUGxhdGZvcm1EZXZpY2VJbmZv UHRyIGluZm8pCj4gK3N0YXRpYyBpbnQgZHJtUGFyc2VPRkRldmljZUluZm8oaW50IG1haiwgaW50 IG1pbiwgY2hhciAqKipjb21wYXRpYmxlKQo+ICB7Cj4gICNpZmRlZiBfX2xpbnV4X18KPiAgICAg IGNoYXIgcGF0aFtQQVRIX01BWCArIDFdLCAqdmFsdWUsICpmb287Cj4gQEAgLTM1NjIsOCArMzU2 MSw4IEBAIHN0YXRpYyBpbnQgZHJtUGFyc2VQbGF0Zm9ybURldmljZUluZm8oaW50IG1haiwgaW50 IG1pbiwKPiAgICAgICAgICBjb3VudCA9IDE7Cj4gICAgICB9Cj4gIAo+IC0gICAgaW5mby0+Y29t cGF0aWJsZSA9IGNhbGxvYyhjb3VudCArIDEsIHNpemVvZigqaW5mby0+Y29tcGF0aWJsZSkpOwo+ IC0gICAgaWYgKCFpbmZvLT5jb21wYXRpYmxlKQo+ICsgICAgKmNvbXBhdGlibGUgPSBjYWxsb2Mo Y291bnQgKyAxLCBzaXplb2YoY2hhciAqKSk7Cj4gKyAgICBpZiAoISpjb21wYXRpYmxlKQo+ICAg ICAgICAgIHJldHVybiAtRU5PTUVNOwo+ICAKPiAgICAgIGZvciAoaSA9IDA7IGkgPCBjb3VudDsg aSsrKSB7Cj4gQEAgLTM1ODcsMTkgKzM1ODYsMTkgQEAgc3RhdGljIGludCBkcm1QYXJzZVBsYXRm b3JtRGV2aWNlSW5mbyhpbnQgbWFqLCBpbnQgbWluLAo+ICAgICAgICAgICAgICBmcmVlKHZhbHVl KTsKPiAgICAgICAgICB9Cj4gIAo+IC0gICAgICAgIGluZm8tPmNvbXBhdGlibGVbaV0gPSBmb287 Cj4gKyAgICAgICAgKmNvbXBhdGlibGVbaV0gPSBmb287Cj4gICAgICB9Cj4gIAo+ICAgICAgcmV0 dXJuIDA7Cj4gIAo+ICBmcmVlOgo+ICAgICAgd2hpbGUgKGktLSkKPiAtICAgICAgICBmcmVlKGlu Zm8tPmNvbXBhdGlibGVbaV0pOwo+ICsgICAgICAgIGZyZWUoKmNvbXBhdGlibGVbaV0pOwo+ICAK PiAtICAgIGZyZWUoaW5mby0+Y29tcGF0aWJsZSk7Cj4gKyAgICBmcmVlKCpjb21wYXRpYmxlKTsK PiAgICAgIHJldHVybiBlcnI7Cj4gICNlbHNlCj4gLSN3YXJuaW5nICJNaXNzaW5nIGltcGxlbWVu dGF0aW9uIG9mIGRybVBhcnNlUGxhdGZvcm1EZXZpY2VJbmZvIgo+ICsjd2FybmluZyAiTWlzc2lu ZyBpbXBsZW1lbnRhdGlvbiBvZiBkcm1QYXJzZU9GRGV2aWNlSW5mbyIKPiAgICAgIHJldHVybiAt RUlOVkFMOwo+ICAjZW5kaWYKPiAgfQo+IEBAIC0zNjIyLDcgKzM2MjEsNyBAQCBzdGF0aWMgaW50 IGRybVByb2Nlc3NQbGF0Zm9ybURldmljZShkcm1EZXZpY2VQdHIgKmRldmljZSwKPiAgCj4gICAg ICBkZXYtPmJ1c2luZm8ucGxhdGZvcm0gPSAoZHJtUGxhdGZvcm1CdXNJbmZvUHRyKXB0cjsKPiAg Cj4gLSAgICByZXQgPSBkcm1QYXJzZVBsYXRmb3JtQnVzSW5mbyhtYWosIG1pbiwgZGV2LT5idXNp bmZvLnBsYXRmb3JtKTsKPiArICAgIHJldCA9IGRybVBhcnNlT0ZCdXNJbmZvKG1haiwgbWluLCBk ZXYtPmJ1c2luZm8ucGxhdGZvcm0tPmZ1bGxuYW1lKTsKPiAgICAgIGlmIChyZXQgPCAwKQo+ICAg ICAgICAgIGdvdG8gZnJlZV9kZXZpY2U7Cj4gIAo+IEBAIC0zNjMwLDcgKzM2MjksNyBAQCBzdGF0 aWMgaW50IGRybVByb2Nlc3NQbGF0Zm9ybURldmljZShkcm1EZXZpY2VQdHIgKmRldmljZSwKPiAg ICAgICAgICBwdHIgKz0gc2l6ZW9mKGRybVBsYXRmb3JtQnVzSW5mbyk7Cj4gICAgICAgICAgZGV2 LT5kZXZpY2VpbmZvLnBsYXRmb3JtID0gKGRybVBsYXRmb3JtRGV2aWNlSW5mb1B0cilwdHI7Cj4g IAo+IC0gICAgICAgIHJldCA9IGRybVBhcnNlUGxhdGZvcm1EZXZpY2VJbmZvKG1haiwgbWluLCBk ZXYtPmRldmljZWluZm8ucGxhdGZvcm0pOwo+ICsgICAgICAgIHJldCA9IGRybVBhcnNlT0ZEZXZp Y2VJbmZvKG1haiwgbWluLCAmZGV2LT5kZXZpY2VpbmZvLnBsYXRmb3JtLT5jb21wYXRpYmxlKTsK PiAgICAgICAgICBpZiAocmV0IDwgMCkKPiAgICAgICAgICAgICAgZ290byBmcmVlX2RldmljZTsK PiAgICAgIH0KPiBAQCAtMzY0NCw3MyArMzY0Myw2IEBAIGZyZWVfZGV2aWNlOgo+ICAgICAgcmV0 dXJuIHJldDsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBkcm1QYXJzZUhvc3QxeEJ1c0luZm8oaW50 IG1haiwgaW50IG1pbiwgZHJtSG9zdDF4QnVzSW5mb1B0ciBpbmZvKQo+IC17Cj4gLSNpZmRlZiBf X2xpbnV4X18KPiAtICAgIGNoYXIgcGF0aFtQQVRIX01BWCArIDFdLCAqbmFtZTsKPiAtCj4gLSAg ICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksICIvc3lzL2Rldi9jaGFyLyVkOiVkL2Rldmlj ZSIsIG1haiwgbWluKTsKPiAtCj4gLSAgICBuYW1lID0gc3lzZnNfdWV2ZW50X2dldChwYXRoLCAi T0ZfRlVMTE5BTUUiKTsKPiAtICAgIGlmICghbmFtZSkKPiAtICAgICAgICByZXR1cm4gLUVOT0VO VDsKPiAtCj4gLSAgICBzdHJuY3B5KGluZm8tPmZ1bGxuYW1lLCBuYW1lLCBEUk1fSE9TVDFYX0RF VklDRV9OQU1FX0xFTik7Cj4gLSAgICBpbmZvLT5mdWxsbmFtZVtEUk1fSE9TVDFYX0RFVklDRV9O QU1FX0xFTiAtIDFdID0gJ1wwJzsKPiAtICAgIGZyZWUobmFtZSk7Cj4gLQo+IC0gICAgcmV0dXJu IDA7Cj4gLSNlbHNlCj4gLSN3YXJuaW5nICJNaXNzaW5nIGltcGxlbWVudGF0aW9uIG9mIGRybVBh cnNlSG9zdDF4QnVzSW5mbyIKPiAtICAgIHJldHVybiAtRUlOVkFMOwo+IC0jZW5kaWYKPiAtfQo+ IC0KPiAtc3RhdGljIGludCBkcm1QYXJzZUhvc3QxeERldmljZUluZm8oaW50IG1haiwgaW50IG1p biwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZHJtSG9zdDF4RGV2aWNl SW5mb1B0ciBpbmZvKQo+IC17Cj4gLSNpZmRlZiBfX2xpbnV4X18KPiAtICAgIGNoYXIgcGF0aFtQ QVRIX01BWCArIDFdLCAqdmFsdWU7Cj4gLSAgICB1bnNpZ25lZCBpbnQgY291bnQsIGk7Cj4gLSAg ICBpbnQgZXJyOwo+IC0KPiAtICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwgIi9zeXMv ZGV2L2NoYXIvJWQ6JWQvZGV2aWNlIiwgbWFqLCBtaW4pOwo+IC0KPiAtICAgIHZhbHVlID0gc3lz ZnNfdWV2ZW50X2dldChwYXRoLCAiT0ZfQ09NUEFUSUJMRV9OIik7Cj4gLSAgICBpZiAoIXZhbHVl KQo+IC0gICAgICAgIHJldHVybiAtRU5PRU5UOwo+IC0KPiAtICAgIHNzY2FuZih2YWx1ZSwgIiV1 IiwgJmNvdW50KTsKPiAtICAgIGZyZWUodmFsdWUpOwo+IC0KPiAtICAgIGluZm8tPmNvbXBhdGli bGUgPSBjYWxsb2MoY291bnQgKyAxLCBzaXplb2YoKmluZm8tPmNvbXBhdGlibGUpKTsKPiAtICAg IGlmICghaW5mby0+Y29tcGF0aWJsZSkKPiAtICAgICAgICByZXR1cm4gLUVOT01FTTsKPiAtCj4g LSAgICBmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykgewo+IC0gICAgICAgIHZhbHVlID0gc3lz ZnNfdWV2ZW50X2dldChwYXRoLCAiT0ZfQ09NUEFUSUJMRV8ldSIsIGkpOwo+IC0gICAgICAgIGlm ICghdmFsdWUpIHsKPiAtICAgICAgICAgICAgZXJyID0gLUVOT0VOVDsKPiAtICAgICAgICAgICAg Z290byBmcmVlOwo+IC0gICAgICAgIH0KPiAtCj4gLSAgICAgICAgaW5mby0+Y29tcGF0aWJsZVtp XSA9IHZhbHVlOwo+IC0gICAgfQo+IC0KPiAtICAgIHJldHVybiAwOwo+IC0KPiAtZnJlZToKPiAt ICAgIHdoaWxlIChpLS0pCj4gLSAgICAgICAgZnJlZShpbmZvLT5jb21wYXRpYmxlW2ldKTsKPiAt Cj4gLSAgICBmcmVlKGluZm8tPmNvbXBhdGlibGUpOwo+IC0gICAgcmV0dXJuIGVycjsKPiAtI2Vs c2UKPiAtI3dhcm5pbmcgIk1pc3NpbmcgaW1wbGVtZW50YXRpb24gb2YgZHJtUGFyc2VIb3N0MXhE ZXZpY2VJbmZvIgo+IC0gICAgcmV0dXJuIC1FSU5WQUw7Cj4gLSNlbmRpZgo+IC19Cj4gLQo+ICBz dGF0aWMgaW50IGRybVByb2Nlc3NIb3N0MXhEZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2UsCj4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpub2RlLCBpbnQg bm9kZV90eXBlLAo+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IG1haiwg aW50IG1pbiwgYm9vbCBmZXRjaF9kZXZpY2VpbmZvLAo+IEBAIC0zNzI5LDcgKzM2NjEsNyBAQCBz dGF0aWMgaW50IGRybVByb2Nlc3NIb3N0MXhEZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2UsCj4g IAo+ICAgICAgZGV2LT5idXNpbmZvLmhvc3QxeCA9IChkcm1Ib3N0MXhCdXNJbmZvUHRyKXB0cjsK PiAgCj4gLSAgICByZXQgPSBkcm1QYXJzZUhvc3QxeEJ1c0luZm8obWFqLCBtaW4sIGRldi0+YnVz aW5mby5ob3N0MXgpOwo+ICsgICAgcmV0ID0gZHJtUGFyc2VPRkJ1c0luZm8obWFqLCBtaW4sIGRl di0+YnVzaW5mby5ob3N0MXgtPmZ1bGxuYW1lKTsKPiAgICAgIGlmIChyZXQgPCAwKQo+ICAgICAg ICAgIGdvdG8gZnJlZV9kZXZpY2U7Cj4gIAo+IEBAIC0zNzM3LDcgKzM2NjksNyBAQCBzdGF0aWMg aW50IGRybVByb2Nlc3NIb3N0MXhEZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2UsCj4gICAgICAg ICAgcHRyICs9IHNpemVvZihkcm1Ib3N0MXhCdXNJbmZvKTsKPiAgICAgICAgICBkZXYtPmRldmlj ZWluZm8uaG9zdDF4ID0gKGRybUhvc3QxeERldmljZUluZm9QdHIpcHRyOwo+ICAKPiAtICAgICAg ICByZXQgPSBkcm1QYXJzZUhvc3QxeERldmljZUluZm8obWFqLCBtaW4sIGRldi0+ZGV2aWNlaW5m by5ob3N0MXgpOwo+ICsgICAgICAgIHJldCA9IGRybVBhcnNlT0ZEZXZpY2VJbmZvKG1haiwgbWlu LCAmZGV2LT5kZXZpY2VpbmZvLmhvc3QxeC0+Y29tcGF0aWJsZSk7Cj4gICAgICAgICAgaWYgKHJl dCA8IDApCj4gICAgICAgICAgICAgIGdvdG8gZnJlZV9kZXZpY2U7Cj4gICAgICB9Cj4gLS0gCj4g Mi4yMC4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=