From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emil Velikov Subject: [PATCH libdrm v2] xf86drm: Parse the separate files to retrieve the vendor, ... info Date: Wed, 9 Nov 2016 18:08:50 +0000 Message-ID: <20161109180850.6012-1-emil.l.velikov@gmail.com> References: <20161101181334.8225-1-emil.l.velikov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0850A6E0BE for ; Wed, 9 Nov 2016 18:19:26 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u144so30882497wmu.0 for ; Wed, 09 Nov 2016 10:19:25 -0800 (PST) In-Reply-To: <20161101181334.8225-1-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: dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Michel=20D=C3=A4nzer?= , emil.l.velikov@gmail.com, Mauro Santos List-Id: dri-devel@lists.freedesktop.org RnJvbTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNvbT4KClBhcnNpbmcg Y29uZmlnIHN5c2ZzIGZpbGUgd2FrZXMgdXAgdGhlIGRldmljZS4gVGhlIGxhdHRlciBvZiB3aGlj aCBtYXkKYmUgc2xvdyBhbmQgaXNuJ3QgcmVxdWlyZWQgdG8gYmVnaW4gd2l0aC4KClJlYWRpbmcg dGhyb3VnaCBjb25maWcgaXMvd2FzIHJlcXVpcmVkIHNpbmNlIHRoZSByZXZpc2lvbiBpcyBub3QK YXZhaWxhYmxlIGJ5IG90aGVyIG1lYW5zLCBhbHRob3VnaCB3aXRoIGEga2VybmVsIHBhdGNoIGlu IHRoZSB3YXkgdGhhdAppcyBhYm91dCB0byBjaGFuZ2UuCgpTaW5jZSByZXR1cm5pbmcgMCB3aGVu IG9uZSBtaWdodCBleHBlY3QgYSB2YWxpZCB2YWx1ZSBpcyBhIG5vLWdvIGFkZCBhCndvcmthcm91 bmQgZHJtRGV2aWNlVXNlUmV2aXNpb25GaWxlKCkgd2hpY2ggb25lIGNhbiB1c2UgdG8gc2F5ICJJ IGRvbid0CmNhcmUgaWYgdGhlIHJldmlzaW9uIGZpbGUgcmV0dXJucyAwLiIKCnYyOiBDb21wbGV0 ZSByZXdvcmsgLSBhZGQgbmV3IEFQSSB0byBjb250cm9sIHRoZSBtZXRob2QsIGluc3RlYWQgb2YK Y2hhbmdpbmcgaXQgdW5kZXJuZWF0IHRoZSB1c2VycycgZmVldC4KCkNjOiBNaWNoZWwgRMOkbnpl ciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KQ2M6IE1hdXJvIFNhbnRvcyA8cmVnaXN0by5tYWls bGluZ0BnbWFpbC5jb20+CkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3No b3dfYnVnLmNnaT9pZD05ODUwMgpTaWduZWQtb2ZmLWJ5OiBFbWlsIFZlbGlrb3YgPGVtaWwudmVs aWtvdkBjb2xsYWJvcmEuY29tPgotLS0KSSBkb24ndCBoYXZlIGEgc3Ryb25nIHByZWZlcmVuY2Ug Zm9yL2FnYWluc3QgdGhpcyBvciB2MS4KCldpdGggdGhpcyBNZXNhIHdpbGwgcmVxdWlyZSBhIDIg bGluZSBwYXRjaC4gV2l0aCB2MSB0aGluZ3Mgd2lsbCBnZXQKZml4ZWQgbWFnaWNhbGx5LCB3aGVu IHJlYnVpbHQgYWdhaW5zdCBuZXdlciBsaWJkcm0uCgpNYXVybyBJJ2xsIHNlbmQgdGhlIG1lc2Eg cGF0Y2ggaW4gYSBzZWNvbmQuIEZlZWwgZnJlZSB0byBnaXZlIGl0IGEgc3Bpbi4KClRoYW5rcwot LS0KIHhmODZkcm0uYyB8IDcwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLQogeGY4NmRybS5oIHwgMTEgKysrKysrKysrKwogMiBm aWxlcyBjaGFuZ2VkLCA3OCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3hmODZkcm0uYyBiL3hmODZkcm0uYwppbmRleCA1MmFkZDVlLi42NzZlZmZjIDEwMDY0NAot LS0gYS94Zjg2ZHJtLmMKKysrIGIveGY4NmRybS5jCkBAIC0xMTMsNiArMTEzLDEzIEBAIHZvaWQg ZHJtU2V0U2VydmVySW5mbyhkcm1TZXJ2ZXJJbmZvUHRyIGluZm8pCiAgICAgZHJtX3NlcnZlcl9p bmZvID0gaW5mbzsKIH0KIAorc3RhdGljIGJvb2wgdXNlX3JldmlzaW9uX2ZpbGU7CisKK3ZvaWQg ZHJtRGV2aWNlVXNlUmV2aXNpb25GaWxlKHZvaWQpCit7CisgICAgdXNlX3JldmlzaW9uX2ZpbGUg PSB0cnVlOworfQorCiAvKioKICAqIE91dHB1dCBhIG1lc3NhZ2UgdG8gc3RkZXJyLgogICoKQEAg LTI5NDYsMTAgKzI5NTMsNTYgQEAgc3RhdGljIGludCBkcm1HZXRNYXhOb2RlTmFtZSh2b2lkKQog ICAgICAgICAgICAzIC8qIGxlbmd0aCBvZiB0aGUgbm9kZSBudW1iZXIgKi87CiB9CiAKLXN0YXRp YyBpbnQgZHJtUGFyc2VQY2lEZXZpY2VJbmZvKGNvbnN0IGNoYXIgKmRfbmFtZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRybVBjaURldmljZUluZm9QdHIgZGV2aWNlKQotewog I2lmZGVmIF9fbGludXhfXworc3RhdGljIGludCBwYXJzZV9zZXBhcmF0ZV9zeXNmc19maWxlcyhj b25zdCBjaGFyICpkX25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRybVBjaURldmljZUluZm9QdHIgZGV2aWNlKQoreworI2RlZmluZSBBUlJBWV9TSVpFKGEpIChz aXplb2YoYSkgLyBzaXplb2YoKGEpWzBdKSkKKyAgICBzdGF0aWMgY29uc3QgY2hhciAqYXR0cnNb XSA9IHsKKyAgICAgICJyZXZpc2lvbiIsIC8qIFhYWDogbWFrZSBzdXJlIGl0J3MgYWx3YXlzIGZp cnN0LCBzZWUgbm90ZSBiZWxvdyAqLworICAgICAgInZlbmRvciIsCisgICAgICAiZGV2aWNlIiwK KyAgICAgICJzdWJzeXN0ZW1fdmVuZG9yIiwKKyAgICAgICJzdWJzeXN0ZW1fZGV2aWNlIiwKKyAg ICB9OworICAgIGNoYXIgcGF0aFtQQVRIX01BWCArIDFdOworICAgIHVuc2lnbmVkIGludCBkYXRh W0FSUkFZX1NJWkUoYXR0cnMpXTsKKyAgICBGSUxFICpmcDsKKyAgICBpbnQgcmV0OworCisgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IEFSUkFZX1NJWkUoYXR0cnMpOyBpKyspIHsKKyAgICAg ICAgc25wcmludGYocGF0aCwgUEFUSF9NQVgsICIvc3lzL2NsYXNzL2RybS8lcy9kZXZpY2UvJXMi LAorICAgICAgICAgICAgICAgICBkX25hbWUsIGF0dHJzW2ldKTsKKyAgICAgICAgZnAgPSBmb3Bl bihwYXRoLCAiciIpOworICAgICAgICBpZiAoIWZwKSB7CisgICAgICAgICAgICAvKiBOb3RlOiBG aXJzdCB3ZSBjaGVjayB0aGUgcmV2aXNpb24sIHNpbmNlIG9sZGVyIGtlcm5lbHMKKyAgICAgICAg ICAgICAqIG1heSBub3QgaGF2ZSBpdC4gRGVmYXVsdCB0byB6ZXJvIGluIHN1Y2ggY2FzZXMuICov CisgICAgICAgICAgICBpZiAoaSA9PSAwKSB7CisgICAgICAgICAgICAgICAgZGF0YVtpXSA9IDA7 CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBy ZXR1cm4gLWVycm5vOworICAgICAgICB9CisKKyAgICAgICAgcmV0ID0gZnNjYW5mKGZwLCAiJXgi LCAmZGF0YVtpXSk7CisgICAgICAgIGZjbG9zZShmcCk7CisgICAgICAgIGlmIChyZXQgIT0gMSkK KyAgICAgICAgICAgIHJldHVybiAtZXJybm87CisKKyAgICB9CisKKyAgICBkZXZpY2UtPnJldmlz aW9uX2lkID0gZGF0YVswXSAmIDB4ZmY7CisgICAgZGV2aWNlLT52ZW5kb3JfaWQgPSBkYXRhWzFd ICYgMHhmZmZmOworICAgIGRldmljZS0+ZGV2aWNlX2lkID0gZGF0YVsyXSAmIDB4ZmZmZjsKKyAg ICBkZXZpY2UtPnN1YnZlbmRvcl9pZCA9IGRhdGFbM10gJiAweGZmZmY7CisgICAgZGV2aWNlLT5z dWJkZXZpY2VfaWQgPSBkYXRhWzRdICYgMHhmZmZmOworCisgICAgcmV0dXJuIDA7Cit9CisKK3N0 YXRpYyBpbnQgcGFyc2VfY29uZmlnX3N5c2ZzX2ZpbGUoY29uc3QgY2hhciAqZF9uYW1lLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRybVBjaURldmljZUluZm9QdHIgZGV2aWNl KQorewogICAgIGNoYXIgcGF0aFtQQVRIX01BWCArIDFdOwogICAgIHVuc2lnbmVkIGNoYXIgY29u ZmlnWzY0XTsKICAgICBpbnQgZmQsIHJldDsKQEAgLTI5NzEsNiArMzAyNCwxNyBAQCBzdGF0aWMg aW50IGRybVBhcnNlUGNpRGV2aWNlSW5mbyhjb25zdCBjaGFyICpkX25hbWUsCiAgICAgZGV2aWNl LT5zdWJkZXZpY2VfaWQgPSBjb25maWdbNDZdIHwgKGNvbmZpZ1s0N10gPDwgOCk7CiAKICAgICBy ZXR1cm4gMDsKK30KKyNlbmRpZgorCitzdGF0aWMgaW50IGRybVBhcnNlUGNpRGV2aWNlSW5mbyhj b25zdCBjaGFyICpkX25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkcm1Q Y2lEZXZpY2VJbmZvUHRyIGRldmljZSkKK3sKKyNpZmRlZiBfX2xpbnV4X18KKyAgICBpZiAodXNl X3JldmlzaW9uX2ZpbGUpCisgICAgICAgIHJldHVybiBwYXJzZV9zZXBhcmF0ZV9zeXNmc19maWxl cyhkX25hbWUsIGRldmljZSk7CisKKyAgICByZXR1cm4gcGFyc2VfY29uZmlnX3N5c2ZzX2ZpbGUo ZF9uYW1lLCBkZXZpY2UpOwogI2Vsc2UKICN3YXJuaW5nICJNaXNzaW5nIGltcGxlbWVudGF0aW9u IG9mIGRybVBhcnNlUGNpRGV2aWNlSW5mbyIKICAgICByZXR1cm4gLUVJTlZBTDsKZGlmZiAtLWdp dCBhL3hmODZkcm0uaCBiL3hmODZkcm0uaAppbmRleCA0ODFkODgyLi5kMWViYzMyIDEwMDY0NAot LS0gYS94Zjg2ZHJtLmgKKysrIGIveGY4NmRybS5oCkBAIC03OTYsNiArNzk2LDE3IEBAIGV4dGVy biB2b2lkIGRybUZyZWVEZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2UpOwogZXh0ZXJuIGludCBk cm1HZXREZXZpY2VzKGRybURldmljZVB0ciBkZXZpY2VzW10sIGludCBtYXhfZGV2aWNlcyk7CiBl eHRlcm4gdm9pZCBkcm1GcmVlRGV2aWNlcyhkcm1EZXZpY2VQdHIgZGV2aWNlc1tdLCBpbnQgY291 bnQpOwogCisKKy8qKgorICogRm9yY2UgYW55IHNlcXVlbnRpYWwgY2FsbHMgdG8gZHJtR2V0RGV2 aWNlL2RybUdldERldmljZXMgdG8gdXNlIHRoZQorICogcmV2aXNpb24gc3lzZnMgZmlsZSBpbnN0 ZWFkIG9mIGNvbmZpZyBvbmUuIFRoZSBsYXR0ZXIgd2FrZXMgdXAgdGhlIGRldmljZQorICogaWYg cG93ZXJlZCBvZmYuCisgKgorICogQSB2YWx1ZSBvZiAwIHdpbGwgYmUgcmV0dXJuZWQgZm9yIHRo ZSByZXZpc2lvbl9pZCBmaWVsZCBpZiB0aGUgc3lzZnMgZmlsZQorICogaXMgbWlzc2luZy4gRE8g Tk9UIFVTRSBUSElTIGlmIHlvdSBkZXBlbmQgb24gYSBjb3JyZWN0IHJldmlzaW9uX2lkLgorICov CitleHRlcm4gdm9pZCBkcm1EZXZpY2VVc2VSZXZpc2lvbkZpbGUodm9pZCk7CisKICNpZiBkZWZp bmVkKF9fY3BsdXNwbHVzKQogfQogI2VuZGlmCi0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=