From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH libdrm 2/3] tests/util: Make util_open() use drmDevice Date: Mon, 30 Jan 2017 11:29:22 +0100 Message-ID: <20170130102923.1991-2-thierry.reding@gmail.com> References: <20170130102923.1991-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7ACE6E3C8 for ; Mon, 30 Jan 2017 10:29:28 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id c85so76320855wmi.1 for ; Mon, 30 Jan 2017 02:29:28 -0800 (PST) Received: from localhost (port-6519.pppoe.wtnet.de. [84.46.25.144]) by smtp.gmail.com with ESMTPSA id p7sm21981990wrc.2.2017.01.30.02.29.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jan 2017 02:29:25 -0800 (PST) In-Reply-To: <20170130102923.1991-1-thierry.reding@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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClRoZSB1dGlsX29wZW4o KSBoZWxwZXIgaXMgdXNlZCBpbiBhIGNvdXBsZSBvZiB0ZXN0IHByb2dyYW1zIHRvIG9wZW4gYW4K YXBwcm9wcmlhdGUgZGV2aWNlLiBJdCB0YWtlcyBhIGRldmljZSBwYXRoIGFuZCBhIG1vZHVsZSBu YW1lLCBib3RoIGFyZQpvcHRpb25hbCwgYXMgcGFyYW1ldGVycy4gSWYgYSBkZXZpY2UgcGF0aCBp cyBzcGVjaWZpZWQsIGl0IHdpbGwgdHJ5IHRvCm9wZW4gdGhlIGdpdmVuIGRldmljZS4gT3RoZXJ3 aXNlIGl0IHdpbGwgdHJ5IGFsbCBhdmFpbGFibGUgZGV2aWNlcy4gSWYKb25seSBhIHNwZWNpZmlj IHN1YnNldCBpcyBkZXNpcmVkLCB0aGUgbW9kdWxlIHBhcmFtZXRlciBjYW4gYmUgdXNlZCBhcwph IGZpbHRlci4gVGhlIGZ1bmN0aW9uIHdpbGwgdXNlIGl0IHRvIG9wZW4gb25seSBkZXZpY2VzIHdo b3NlIGtlcm5lbApkcml2ZXIgbWF0Y2hlcyB0aGUgZ2l2ZW4gbW9kdWxlIG5hbWUuCgpJbnN0ZWFk IG9mIHJlbHlpbmcgb24gdGhlIGxlZ2FjeSBkcm1PcGVuKCkgZnVuY3Rpb24gdG8gZG8gdGhpcywg Y29udmVydAp1dGlsX29wZW4oKSB0byB1c2UgdGhlIG5ldyBkcm1EZXZpY2UgaGVscGVycy4gVGhp cyBnZXRzIGl0IGZ1bmN0aW9uYWxseQptdWNoIGNsb3NlciB0byB3aGF0IG90aGVyIERSTS9LTVMg dXNlcnMsIHN1Y2ggYXMgdGhlIFguT3JnIFNlcnZlciBvciBhCldheWxhbmQgc2VydmVyLCBkby4K ClNpZ25lZC1vZmYtYnk6IFRoaWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQog dGVzdHMvdXRpbC9rbXMuYyB8IDE2NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tCiB0ZXN0cy91dGlsL2ttcy5oIHwgIDQzICsrKysrKysrKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDE2OCBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS90ZXN0cy91dGlsL2ttcy5jIGIvdGVzdHMvdXRpbC9rbXMuYwppbmRleCBk ODY2Mzk4MjM3YmIuLmM1ZDM1YWI2MTZkMSAxMDA2NDQKLS0tIGEvdGVzdHMvdXRpbC9rbXMuYwor KysgYi90ZXN0cy91dGlsL2ttcy5jCkBAIC00MiwxNSArNDIsMTggQEAKICNlbmRpZgogCiAjaW5j bHVkZSA8ZXJybm8uaD4KKyNpbmNsdWRlIDxmY250bC5oPgogI2luY2x1ZGUgPHN0ZGludC5oPgog I2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5n Lmg+CisjaW5jbHVkZSA8dW5pc3RkLmg+CiAKICNpbmNsdWRlICJ4Zjg2ZHJtLmgiCiAjaW5jbHVk ZSAieGY4NmRybU1vZGUuaCIKIAogI2luY2x1ZGUgImNvbW1vbi5oIgorI2luY2x1ZGUgImttcy5o IgogCiBzdHJ1Y3QgdHlwZV9uYW1lIHsKICAgICB1bnNpZ25lZCBpbnQgdHlwZTsKQEAgLTEyNSw1 OCArMTI4LDEzOCBAQCBjb25zdCBjaGFyICp1dGlsX2xvb2t1cF9jb25uZWN0b3JfdHlwZV9uYW1l KHVuc2lnbmVkIGludCB0eXBlKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVJS QVlfU0laRShjb25uZWN0b3JfdHlwZV9uYW1lcykpOwogfQogCi1zdGF0aWMgY29uc3QgY2hhciAq IGNvbnN0IG1vZHVsZXNbXSA9IHsKLSAgICAiaTkxNSIsCi0gICAgImFtZGdwdSIsCi0gICAgInJh ZGVvbiIsCi0gICAgIm5vdXZlYXUiLAotICAgICJ2bXdnZngiLAotICAgICJvbWFwZHJtIiwKLSAg ICAiZXh5bm9zIiwKLSAgICAidGlsY2RjIiwKLSAgICAibXNtIiwKLSAgICAic3RpIiwKLSAgICAi dGVncmEiLAotICAgICJpbXgtZHJtIiwKLSAgICAicm9ja2NoaXAiLAotICAgICJhdG1lbC1obGNk YyIsCi0gICAgImZzbC1kY3UtZHJtIiwKLSAgICAidmM0IiwKLSAgICAidmlydGlvX2dwdSIsCi0g ICAgIm1lZGlhdGVrIiwKLSAgICAibWVzb24iLAotfTsKK2NoYXIgKnV0aWxfZ2V0X2RyaXZlcihp bnQgZmQpCit7CisgICAgZHJtVmVyc2lvblB0ciB2ZXJzaW9uOworICAgIGNoYXIgKmRyaXZlcjsK IAotaW50IHV0aWxfb3Blbihjb25zdCBjaGFyICpkZXZpY2UsIGNvbnN0IGNoYXIgKm1vZHVsZSkK KyAgICB2ZXJzaW9uID0gZHJtR2V0VmVyc2lvbihmZCk7CisgICAgaWYgKCF2ZXJzaW9uKQorICAg ICAgICByZXR1cm4gTlVMTDsKKworICAgIGRyaXZlciA9IHN0cmR1cCh2ZXJzaW9uLT5uYW1lKTsK KworICAgIGRybUZyZWVWZXJzaW9uKHZlcnNpb24pOworCisgICAgcmV0dXJuIGRyaXZlcjsKK30K KworaW50IHV0aWxfZ2V0X2RldmljZXMoZHJtRGV2aWNlUHRyICoqZGV2aWNlc3AsIHVpbnQzMl90 IGZsYWdzKQoreworICAgIGRybURldmljZVB0ciAqZGV2aWNlczsKKyAgICB1bnNpZ25lZCBpbnQg Y291bnQ7CisgICAgaW50IGVycjsKKworICAgIGVyciA9IGRybUdldERldmljZXMyKGZsYWdzLCBO VUxMLCAwKTsKKyAgICBpZiAoZXJyIDwgMCkKKyAgICAgICAgcmV0dXJuIGVycjsKKworICAgIC8q CisgICAgICogSWYgdGhlIGNhbGxlciBoYXNuJ3Qgc3BlY2lmaWVkIGEgcmV0dXJuIHBvaW50ZXIg Zm9yIHRoZSBuZXcgZGV2aWNlcworICAgICAqIGFycmF5LCBhbGwgb2YgdGhlIGJlbG93IGlzIHBv aW50bGVzcywgc28gc2ltcGx5IHJldHVybiB0aGUgbnVtYmVyIG9mCisgICAgICogZGV2aWNlcyBh dmFpbGFibGUuCisgICAgICovCisgICAgaWYgKCFkZXZpY2VzcCkKKyAgICAgICAgcmV0dXJuIGVy cjsKKworICAgIGNvdW50ID0gZXJyOworCisgICAgZGV2aWNlcyA9IGNhbGxvYyhjb3VudCwgc2l6 ZW9mKCpkZXZpY2VzKSk7CisgICAgaWYgKCFkZXZpY2VzKQorICAgICAgICByZXR1cm4gLUVOT01F TTsKKworICAgIGVyciA9IGRybUdldERldmljZXMyKGZsYWdzLCBkZXZpY2VzLCBjb3VudCk7Cisg ICAgaWYgKGVyciA8IDApIHsKKyAgICAgICAgZnJlZShkZXZpY2VzKTsKKyAgICAgICAgcmV0dXJu IGVycjsKKyAgICB9CisKKyAgICBpZiAoZGV2aWNlc3ApCisgICAgICAgICpkZXZpY2VzcCA9IGRl dmljZXM7CisgICAgZWxzZQorICAgICAgICBmcmVlKGRldmljZXMpOworCisgICAgcmV0dXJuIGNv dW50OworfQorCit2b2lkIHV0aWxfZnJlZV9kZXZpY2VzKGRybURldmljZVB0ciAqZGV2aWNlcywg dW5zaWduZWQgaW50IGNvdW50KQoreworICAgIGRybUZyZWVEZXZpY2VzKGRldmljZXMsIGNvdW50 KTsKKyAgICBmcmVlKGRldmljZXMpOworfQorCitpbnQgdXRpbF9vcGVuX3dpdGhfbW9kdWxlKGNv bnN0IGNoYXIgKmRldmljZSwgY29uc3QgY2hhciAqbW9kdWxlKQogewotICAgIGludCBmZDsKKyAg ICBpbnQgZmQsIGVyciA9IDA7CisKKyAgICBpZiAobW9kdWxlKQorICAgICAgICBwcmludGYoInRy eWluZyB0byBvcGVuIGAlcycgd2l0aCBgJXMnLi4uIiwgZGV2aWNlLCBtb2R1bGUpOworICAgIGVs c2UKKyAgICAgICAgcHJpbnRmKCJ0cnlpbmcgdG8gb3BlbiBgJXMnLi4uIiwgZGV2aWNlKTsKKwor ICAgIGZkID0gb3BlbihkZXZpY2UsIE9fUkRXUik7CisgICAgaWYgKGZkIDwgMCkgeworICAgICAg ICBlcnIgPSAtZXJybm87CisgICAgICAgIGdvdG8gb3V0OworICAgIH0KIAogICAgIGlmIChtb2R1 bGUpIHsKLSAgICAgICAgZmQgPSBkcm1PcGVuKG1vZHVsZSwgZGV2aWNlKTsKLSAgICAgICAgaWYg KGZkIDwgMCkgewotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJmYWlsZWQgdG8gb3BlbiBk ZXZpY2UgJyVzJzogJXNcbiIsCi0gICAgICAgICAgICAgICAgbW9kdWxlLCBzdHJlcnJvcihlcnJu bykpOwotICAgICAgICAgICAgcmV0dXJuIC1lcnJubzsKKyAgICAgICAgY2hhciAqZHJpdmVyID0g dXRpbF9nZXRfZHJpdmVyKGZkKTsKKyAgICAgICAgaWYgKCFkcml2ZXIpIHsKKyAgICAgICAgICAg IGVyciA9IC1FSU5WQUw7CisgICAgICAgICAgICBnb3RvIGNsb3NlOwogICAgICAgICB9Ci0gICAg fSBlbHNlIHsKLSAgICAgICAgdW5zaWduZWQgaW50IGk7CiAKLSAgICAgICAgZm9yIChpID0gMDsg aSA8IEFSUkFZX1NJWkUobW9kdWxlcyk7IGkrKykgewotICAgICAgICAgICAgcHJpbnRmKCJ0cnlp bmcgdG8gb3BlbiBkZXZpY2UgJyVzJy4uLiIsIG1vZHVsZXNbaV0pOworICAgICAgICBpZiAoc3Ry Y21wKG1vZHVsZSwgZHJpdmVyKSAhPSAwKQorICAgICAgICAgICAgZXJyID0gLUVJTlZBTDsKKwor ICAgICAgICBmcmVlKGRyaXZlcik7CisKKyAgICAgICAgaWYgKGVyciA8IDApCisgICAgICAgICAg ICBnb3RvIGNsb3NlOworICAgIH0KKworICAgIHByaW50ZigiZG9uZVxuIik7CisgICAgcmV0dXJu IGZkOworCitjbG9zZToKKyAgICBjbG9zZShmZCk7CitvdXQ6CisgICAgcHJpbnRmKCJmYWlsZWRc biIpOworICAgIHJldHVybiBlcnI7Cit9CiAKLSAgICAgICAgICAgIGZkID0gZHJtT3Blbihtb2R1 bGVzW2ldLCBkZXZpY2UpOwotICAgICAgICAgICAgaWYgKGZkIDwgMCkgewotICAgICAgICAgICAg ICAgIHByaW50ZigiZmFpbGVkXG4iKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICAgICAgcHJpbnRmKCJkb25lXG4iKTsKK2ludCB1dGlsX29wZW4oY29uc3QgY2hhciAqZGV2aWNl LCBjb25zdCBjaGFyICptb2R1bGUpCit7CisgICAgaW50IGZkLCBlcnI7CisKKyAgICBpZiAoIWRl dmljZSkgeworICAgICAgICBkcm1EZXZpY2VQdHIgKmRldmljZXMsIGRldjsKKyAgICAgICAgdW5z aWduZWQgaW50IGNvdW50LCBpLCBqOworICAgICAgICBjb25zdCBjaGFyICpub2RlOworCisgICAg ICAgIGVyciA9IHV0aWxfZ2V0X2RldmljZXMoJmRldmljZXMsIDApOworICAgICAgICBpZiAoZXJy IDwgMCkKKyAgICAgICAgICAgIHJldHVybiBlcnI7CisKKyAgICAgICAgY291bnQgPSBlcnI7CisK KyAgICAgICAgdXRpbF9mb3JfZWFjaF9kZXZpY2UoZGV2LCBpLCBkZXZpY2VzLCBjb3VudCkgewor ICAgICAgICAgICAgbm9kZSA9IHV0aWxfZGV2aWNlX2dldF9ub2RlKGRldiwgRFJNX05PREVfUFJJ TUFSWSk7CisgICAgICAgICAgICBpZiAoIW5vZGUpCisgICAgICAgICAgICAgICAgY29udGludWU7 CisKKyAgICAgICAgICAgIGZkID0gdXRpbF9vcGVuX3dpdGhfbW9kdWxlKG5vZGUsIG1vZHVsZSk7 CisgICAgICAgICAgICBpZiAoZmQgPj0gMCkKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGlmIChmZCA8IDApIHsKLSAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAibm8gZGV2aWNlIGZvdW5kXG4iKTsKLSAgICAgICAgICAgIHJldHVy biAtRU5PREVWOwotICAgICAgICB9CisgICAgICAgIHV0aWxfZnJlZV9kZXZpY2VzKGRldmljZXMs IGNvdW50KTsKKworICAgICAgICBpZiAoaSA9PSBjb3VudCkKKyAgICAgICAgICAgIGZkID0gLUVO T0VOVDsKKyAgICB9IGVsc2UgeworICAgICAgICBmZCA9IHV0aWxfb3Blbl93aXRoX21vZHVsZShk ZXZpY2UsIG1vZHVsZSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGZkOwpkaWZmIC0tZ2l0IGEvdGVz dHMvdXRpbC9rbXMuaCBiL3Rlc3RzL3V0aWwva21zLmgKaW5kZXggZGRlMmVkMmM1NjM2Li5iN2I1 YjQ3NDc5NTAgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3V0aWwva21zLmgKKysrIGIvdGVzdHMvdXRpbC9r bXMuaApAQCAtMzAsNiArMzAsNDkgQEAgY29uc3QgY2hhciAqdXRpbF9sb29rdXBfZW5jb2Rlcl90 eXBlX25hbWUodW5zaWduZWQgaW50IHR5cGUpOwogY29uc3QgY2hhciAqdXRpbF9sb29rdXBfY29u bmVjdG9yX3N0YXR1c19uYW1lKHVuc2lnbmVkIGludCB0eXBlKTsKIGNvbnN0IGNoYXIgKnV0aWxf bG9va3VwX2Nvbm5lY3Rvcl90eXBlX25hbWUodW5zaWduZWQgaW50IHR5cGUpOwogCitjaGFyICp1 dGlsX2dldF9kcml2ZXIoaW50IGZkKTsKKworaW50IHV0aWxfZ2V0X2RldmljZXMoZHJtRGV2aWNl UHRyICoqZGV2aWNlc3AsIHVpbnQzMl90IGZsYWdzKTsKK3ZvaWQgdXRpbF9mcmVlX2RldmljZXMo ZHJtRGV2aWNlUHRyICpkZXZpY2VzLCB1bnNpZ25lZCBpbnQgY291bnQpOworCitzdGF0aWMgaW5s aW5lIGRybURldmljZVB0ciB1dGlsX2dldF9kZXZpY2UoZHJtRGV2aWNlUHRyICpkZXZpY2VzLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBj b3VudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBpbnQgaW5kZXgpCit7CisgICAgaWYgKGluZGV4ID49IGNvdW50KQorICAgICAgICByZXR1cm4g TlVMTDsKKworICAgIHJldHVybiBkZXZpY2VzW2luZGV4XTsKK30KKworI2RlZmluZSB1dGlsX2Zv cl9lYWNoX2RldmljZShkZXZpY2UsIGluZGV4LCBkZXZpY2VzLCBjb3VudCkgICAgIFwKKyAgICBm b3IgKGRldmljZSA9IHV0aWxfZ2V0X2RldmljZShkZXZpY2VzLCBjb3VudCwgKGluZGV4KSA9IDAp OyBcCisgICAgICAgICAoaW5kZXgpIDwgKGNvdW50KTsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAorICAgICAgICAgZGV2aWNlID0gdXRpbF9nZXRfZGV2aWNlKGRldmljZXMs IGNvdW50LCArKyhpbmRleCkpKQorCitzdGF0aWMgaW5saW5lIGNoYXIgKnV0aWxfZGV2aWNlX2dl dF9ub2RlKGRybURldmljZVB0ciBkZXZpY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGludCB0eXBlKQoreworICAgIGlmICh0eXBlID49IERSTV9O T0RFX01BWCkKKyAgICAgICAgcmV0dXJuIE5VTEw7CisKKyAgICByZXR1cm4gZGV2aWNlLT5ub2Rl c1t0eXBlXTsKK30KKworI2RlZmluZSBmb3JfZWFjaF9pZihjb25kaXRpb24pIFwKKyAgICBpZiAo IShjb25kaXRpb24pKSB7ICAgICAgICBcCisgICAgfSBlbHNlCisKKyNkZWZpbmUgdXRpbF9kZXZp Y2VfZm9yX2VhY2hfbm9kZShub2RlLCB0eXBlLCBkZXZpY2UpICAgICBcCisgICAgZm9yIChub2Rl ID0gdXRpbF9kZXZpY2VfZ2V0X25vZGUoZGV2aWNlLCAodHlwZSkgPSAwKTsgXAorICAgICAgICAg KHR5cGUpIDwgRFJNX05PREVfTUFYOyAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAg ICAgIG5vZGUgPSB1dGlsX2RldmljZV9nZXRfbm9kZShkZXZpY2UsICsrKHR5cGUpKSkKKworI2Rl ZmluZSB1dGlsX2RldmljZV9mb3JfZWFjaF9hdmFpbGFibGVfbm9kZShub2RlLCB0eXBlLCBkZXZp Y2UpICAgICBcCisgICAgICAgIHV0aWxfZGV2aWNlX2Zvcl9lYWNoX25vZGUobm9kZSwgdHlwZSwg ZGV2aWNlKSAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIGZvcl9lYWNoX2lmICgoZGV2aWNl KS0+YXZhaWxhYmxlX25vZGVzICYgKDEgPDwgKHR5cGUpKSkKKworaW50IHV0aWxfb3Blbl93aXRo X21vZHVsZShjb25zdCBjaGFyICpkZXZpY2UsIGNvbnN0IGNoYXIgKm1vZHVsZSk7CiBpbnQgdXRp bF9vcGVuKGNvbnN0IGNoYXIgKmRldmljZSwgY29uc3QgY2hhciAqbW9kdWxlKTsKIAogI2VuZGlm IC8qIFVUSUxfS01TX0ggKi8KLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==