From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: [PATCH libdrm 1/2] xf86drm: merge get_normal_pci_path() into get_real_pci_path() Date: Wed, 5 Sep 2018 13:31:48 +0100 Message-ID: <20180905123149.18117-1-eric.engestrom@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id DBA1C6E127 for ; Wed, 5 Sep 2018 12:31:55 +0000 (UTC) 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: Emil Velikov List-Id: dri-devel@lists.freedesktop.org Q2M6IEVtaWwgVmVsaWtvdiA8ZW1pbC5sLnZlbGlrb3ZAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBFcmljIEVuZ2VzdHJvbSA8ZXJpYy5lbmdlc3Ryb21AaW50ZWwuY29tPgotLS0KIHhmODZkcm0u YyB8IDI1ICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2Vy dGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hmODZkcm0uYyBiL3hmODZk cm0uYwppbmRleCA3ODA3ZGNlOWM3ZmJiYTZkNzRmNy4uNjQ5ZDQwMGJjYmM0OTRhYzA0ZTYgMTAw NjQ0Ci0tLSBhL3hmODZkcm0uYworKysgYi94Zjg2ZHJtLmMKQEAgLTI5OTgsMjYgKzI5OTgsMjAg QEAgc3RhdGljIGludCBkcm1QYXJzZVN1YnN5c3RlbVR5cGUoaW50IG1haiwgaW50IG1pbikKICNl bmRpZgogfQogCi1zdGF0aWMgY2hhciAqCitzdGF0aWMgdm9pZAogZ2V0X3JlYWxfcGNpX3BhdGgo aW50IG1haiwgaW50IG1pbiwgY2hhciAqcmVhbF9wYXRoKQogewogICAgIGNoYXIgcGF0aFtQQVRI X01BWCArIDFdLCAqdGVybTsKIAogICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwgIi9z eXMvZGV2L2NoYXIvJWQ6JWQvZGV2aWNlIiwgbWFqLCBtaW4pOwotICAgIGlmICghcmVhbHBhdGgo cGF0aCwgcmVhbF9wYXRoKSkKLSAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgaWYgKCFyZWFscGF0 aChwYXRoLCByZWFsX3BhdGgpKSB7CisgICAgICAgIHN0cmNweShyZWFsX3BhdGgsIHBhdGgpOwor ICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgdGVybSA9IHN0cnJjaHIocmVhbF9wYXRoLCAn LycpOwogICAgIGlmICh0ZXJtICYmIHN0cm5jbXAodGVybSwgIi92aXJ0aW8iLCA3KSA9PSAwKQog ICAgICAgICAqdGVybSA9IDA7Ci0KLSAgICByZXR1cm4gcmVhbF9wYXRoOwotfQotCi1zdGF0aWMg dm9pZAotZ2V0X25vcm1hbF9wY2lfcGF0aChpbnQgbWFqLCBpbnQgbWluLCBjaGFyICpub3JtYWxf cGF0aCkKLXsKLSAgICBzbnByaW50Zihub3JtYWxfcGF0aCwgUEFUSF9NQVgsICIvc3lzL2Rldi9j aGFyLyVkOiVkL2RldmljZSIsIG1haiwgbWluKTsKIH0KIAogc3RhdGljIGludCBkcm1QYXJzZVBj aUJ1c0luZm8oaW50IG1haiwgaW50IG1pbiwgZHJtUGNpQnVzSW5mb1B0ciBpbmZvKQpAQCAtMzAy Nyw4ICszMDIxLDcgQEAgc3RhdGljIGludCBkcm1QYXJzZVBjaUJ1c0luZm8oaW50IG1haiwgaW50 IG1pbiwgZHJtUGNpQnVzSW5mb1B0ciBpbmZvKQogICAgIGNoYXIgcmVhbF9wYXRoW1BBVEhfTUFY ICsgMV0sICp2YWx1ZTsKICAgICBpbnQgbnVtOwogCi0gICAgaWYgKGdldF9yZWFsX3BjaV9wYXRo KG1haiwgbWluLCByZWFsX3BhdGgpID09IE5VTEwpCi0gICAgICAgIGdldF9ub3JtYWxfcGNpX3Bh dGgobWFqLCBtaW4sIHJlYWxfcGF0aCk7CisgICAgZ2V0X3JlYWxfcGNpX3BhdGgobWFqLCBtaW4s IHJlYWxfcGF0aCk7CiAKICAgICB2YWx1ZSA9IHN5c2ZzX3VldmVudF9nZXQocmVhbF9wYXRoLCAi UENJX1NMT1RfTkFNRSIpOwogICAgIGlmICghdmFsdWUpCkBAIC0zMTQ4LDggKzMxNDEsNyBAQCBz dGF0aWMgaW50IHBhcnNlX3NlcGFyYXRlX3N5c2ZzX2ZpbGVzKGludCBtYWosIGludCBtaW4sCiAg ICAgRklMRSAqZnA7CiAgICAgaW50IHJldDsKIAotICAgIGlmIChnZXRfcmVhbF9wY2lfcGF0aCht YWosIG1pbiwgcmVhbF9wYXRoKSA9PSBOVUxMKQotICAgICAgICBnZXRfbm9ybWFsX3BjaV9wYXRo KG1haiwgbWluLCByZWFsX3BhdGgpOworICAgIGdldF9yZWFsX3BjaV9wYXRoKG1haiwgbWluLCBy ZWFsX3BhdGgpOwogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gaWdub3JlX3JldmlzaW9uID8gMSA6 IDA7IGkgPCBBUlJBWV9TSVpFKGF0dHJzKTsgaSsrKSB7CiAgICAgICAgIHNucHJpbnRmKHBhdGgs IFBBVEhfTUFYLCAiJXMvJXMiLCByZWFsX3BhdGgsIGF0dHJzW2ldKTsKQEAgLTMxODAsOCArMzE3 Miw3IEBAIHN0YXRpYyBpbnQgcGFyc2VfY29uZmlnX3N5c2ZzX2ZpbGUoaW50IG1haiwgaW50IG1p biwKICAgICB1bnNpZ25lZCBjaGFyIGNvbmZpZ1s2NF07CiAgICAgaW50IGZkLCByZXQ7CiAKLSAg ICBpZiAoZ2V0X3JlYWxfcGNpX3BhdGgobWFqLCBtaW4sIHJlYWxfcGF0aCkgPT0gTlVMTCkKLSAg ICAgICAgZ2V0X25vcm1hbF9wY2lfcGF0aChtYWosIG1pbiwgcmVhbF9wYXRoKTsKKyAgICBnZXRf cmVhbF9wY2lfcGF0aChtYWosIG1pbiwgcmVhbF9wYXRoKTsKIAogICAgIHNucHJpbnRmKHBhdGgs IFBBVEhfTUFYLCAiJXMvY29uZmlnIiwgcmVhbF9wYXRoKTsKICAgICBmZCA9IG9wZW4ocGF0aCwg T19SRE9OTFkpOwotLSAKQ2hlZXJzLAogIEVyaWMKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=