From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Engestrom <eric.engestrom@intel.com>
Subject: [PATCH libdrm 2/2] xf86drm: rename "real_path" to "pci_path"
Date: Wed,  5 Sep 2018 13:31:49 +0100
Message-ID: <20180905123149.18117-2-eric.engestrom@intel.com>
References: <20180905123149.18117-1-eric.engestrom@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 1339E6E446
 for <dri-devel@lists.freedesktop.org>; Wed,  5 Sep 2018 12:31:58 +0000 (UTC)
In-Reply-To: <20180905123149.18117-1-eric.engestrom@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

InJlYWxfcGF0aCIgd2FzIGdldHRpbmcgY29uZnVzaW5nIHdoZW4gdGhlcmUgYXJlIG90aGVyICpw
YXRocyBpbiB0aGUKc2FtZSBmdW5jdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBFcmljIEVuZ2VzdHJv
bSA8ZXJpYy5lbmdlc3Ryb21AaW50ZWwuY29tPgotLS0KIHhmODZkcm0uYyB8IDI2ICsrKysrKysr
KysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTMg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGY4NmRybS5jIGIveGY4NmRybS5jCmluZGV4IDY0
OWQ0MDBiY2JjNDk0YWMwNGU2Li5iMjM4ODE5NDkzMjc1NGRhZGM5OSAxMDA2NDQKLS0tIGEveGY4
NmRybS5jCisrKyBiL3hmODZkcm0uYwpAQCAtMjk5OSwxNyArMjk5OSwxNyBAQCBzdGF0aWMgaW50
IGRybVBhcnNlU3Vic3lzdGVtVHlwZShpbnQgbWFqLCBpbnQgbWluKQogfQogCiBzdGF0aWMgdm9p
ZAotZ2V0X3JlYWxfcGNpX3BhdGgoaW50IG1haiwgaW50IG1pbiwgY2hhciAqcmVhbF9wYXRoKQor
Z2V0X3BjaV9wYXRoKGludCBtYWosIGludCBtaW4sIGNoYXIgKnBjaV9wYXRoKQogewogICAgIGNo
YXIgcGF0aFtQQVRIX01BWCArIDFdLCAqdGVybTsKIAogICAgIHNucHJpbnRmKHBhdGgsIHNpemVv
ZihwYXRoKSwgIi9zeXMvZGV2L2NoYXIvJWQ6JWQvZGV2aWNlIiwgbWFqLCBtaW4pOwotICAgIGlm
ICghcmVhbHBhdGgocGF0aCwgcmVhbF9wYXRoKSkgewotICAgICAgICBzdHJjcHkocmVhbF9wYXRo
LCBwYXRoKTsKKyAgICBpZiAoIXJlYWxwYXRoKHBhdGgsIHBjaV9wYXRoKSkgeworICAgICAgICBz
dHJjcHkocGNpX3BhdGgsIHBhdGgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgdGVy
bSA9IHN0cnJjaHIocmVhbF9wYXRoLCAnLycpOworICAgIHRlcm0gPSBzdHJyY2hyKHBjaV9wYXRo
LCAnLycpOwogICAgIGlmICh0ZXJtICYmIHN0cm5jbXAodGVybSwgIi92aXJ0aW8iLCA3KSA9PSAw
KQogICAgICAgICAqdGVybSA9IDA7CiB9CkBAIC0zMDE4LDEyICszMDE4LDEyIEBAIHN0YXRpYyBp
bnQgZHJtUGFyc2VQY2lCdXNJbmZvKGludCBtYWosIGludCBtaW4sIGRybVBjaUJ1c0luZm9QdHIg
aW5mbykKIHsKICNpZmRlZiBfX2xpbnV4X18KICAgICB1bnNpZ25lZCBpbnQgZG9tYWluLCBidXMs
IGRldiwgZnVuYzsKLSAgICBjaGFyIHJlYWxfcGF0aFtQQVRIX01BWCArIDFdLCAqdmFsdWU7Cisg
ICAgY2hhciBwY2lfcGF0aFtQQVRIX01BWCArIDFdLCAqdmFsdWU7CiAgICAgaW50IG51bTsKIAot
ICAgIGdldF9yZWFsX3BjaV9wYXRoKG1haiwgbWluLCByZWFsX3BhdGgpOworICAgIGdldF9wY2lf
cGF0aChtYWosIG1pbiwgcGNpX3BhdGgpOwogCi0gICAgdmFsdWUgPSBzeXNmc191ZXZlbnRfZ2V0
KHJlYWxfcGF0aCwgIlBDSV9TTE9UX05BTUUiKTsKKyAgICB2YWx1ZSA9IHN5c2ZzX3VldmVudF9n
ZXQocGNpX3BhdGgsICJQQ0lfU0xPVF9OQU1FIik7CiAgICAgaWYgKCF2YWx1ZSkKICAgICAgICAg
cmV0dXJuIC1FTk9FTlQ7CiAKQEAgLTMxMzYsMTUgKzMxMzYsMTUgQEAgc3RhdGljIGludCBwYXJz
ZV9zZXBhcmF0ZV9zeXNmc19maWxlcyhpbnQgbWFqLCBpbnQgbWluLAogICAgICAgInN1YnN5c3Rl
bV92ZW5kb3IiLAogICAgICAgInN1YnN5c3RlbV9kZXZpY2UiLAogICAgIH07Ci0gICAgY2hhciBw
YXRoW1BBVEhfTUFYICsgMV0sIHJlYWxfcGF0aFtQQVRIX01BWCArIDFdOworICAgIGNoYXIgcGF0
aFtQQVRIX01BWCArIDFdLCBwY2lfcGF0aFtQQVRIX01BWCArIDFdOwogICAgIHVuc2lnbmVkIGlu
dCBkYXRhW0FSUkFZX1NJWkUoYXR0cnMpXTsKICAgICBGSUxFICpmcDsKICAgICBpbnQgcmV0Owog
Ci0gICAgZ2V0X3JlYWxfcGNpX3BhdGgobWFqLCBtaW4sIHJlYWxfcGF0aCk7CisgICAgZ2V0X3Bj
aV9wYXRoKG1haiwgbWluLCBwY2lfcGF0aCk7CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBpZ25v
cmVfcmV2aXNpb24gPyAxIDogMDsgaSA8IEFSUkFZX1NJWkUoYXR0cnMpOyBpKyspIHsKLSAgICAg
ICAgc25wcmludGYocGF0aCwgUEFUSF9NQVgsICIlcy8lcyIsIHJlYWxfcGF0aCwgYXR0cnNbaV0p
OworICAgICAgICBzbnByaW50ZihwYXRoLCBQQVRIX01BWCwgIiVzLyVzIiwgcGNpX3BhdGgsIGF0
dHJzW2ldKTsKICAgICAgICAgZnAgPSBmb3BlbihwYXRoLCAiciIpOwogICAgICAgICBpZiAoIWZw
KQogICAgICAgICAgICAgcmV0dXJuIC1lcnJubzsKQEAgLTMxNjgsMTMgKzMxNjgsMTMgQEAgc3Rh
dGljIGludCBwYXJzZV9zZXBhcmF0ZV9zeXNmc19maWxlcyhpbnQgbWFqLCBpbnQgbWluLAogc3Rh
dGljIGludCBwYXJzZV9jb25maWdfc3lzZnNfZmlsZShpbnQgbWFqLCBpbnQgbWluLAogICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkcm1QY2lEZXZpY2VJbmZvUHRyIGRldmljZSkK
IHsKLSAgICBjaGFyIHBhdGhbUEFUSF9NQVggKyAxXSwgcmVhbF9wYXRoW1BBVEhfTUFYICsgMV07
CisgICAgY2hhciBwYXRoW1BBVEhfTUFYICsgMV0sIHBjaV9wYXRoW1BBVEhfTUFYICsgMV07CiAg
ICAgdW5zaWduZWQgY2hhciBjb25maWdbNjRdOwogICAgIGludCBmZCwgcmV0OwogCi0gICAgZ2V0
X3JlYWxfcGNpX3BhdGgobWFqLCBtaW4sIHJlYWxfcGF0aCk7CisgICAgZ2V0X3BjaV9wYXRoKG1h
aiwgbWluLCBwY2lfcGF0aCk7CiAKLSAgICBzbnByaW50ZihwYXRoLCBQQVRIX01BWCwgIiVzL2Nv
bmZpZyIsIHJlYWxfcGF0aCk7CisgICAgc25wcmludGYocGF0aCwgUEFUSF9NQVgsICIlcy9jb25m
aWciLCBwY2lfcGF0aCk7CiAgICAgZmQgPSBvcGVuKHBhdGgsIE9fUkRPTkxZKTsKICAgICBpZiAo
ZmQgPCAwKQogICAgICAgICByZXR1cm4gLWVycm5vOwotLSAKQ2hlZXJzLAogIEVyaWMKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls
aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy
ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=