From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <igt-dev-bounces@lists.freedesktop.org>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 1CFBB8924F
 for <igt-dev@lists.freedesktop.org>; Thu, 25 Apr 2019 20:59:42 +0000 (UTC)
From: Daniel Mrzyglod <daniel.t.mrzyglod@intel.com>
Date: Thu, 25 Apr 2019 22:58:19 +0200
Message-Id: <20190425205822.8995-4-daniel.t.mrzyglod@intel.com>
In-Reply-To: <20190425205822.8995-1-daniel.t.mrzyglod@intel.com>
References: <20190425205822.8995-1-daniel.t.mrzyglod@intel.com>
MIME-Version: 1.0
Subject: [igt-dev] [PATCH i-g-t v4 3/6] lib/intel_mmio: use
 igt_device_map_pci_bar_region for mmap if fd is known.
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/igt-dev>
List-Post: <mailto:igt-dev@lists.freedesktop.org>
List-Help: <mailto:igt-dev-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/igt-dev>,
 <mailto:igt-dev-request@lists.freedesktop.org?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: igt-dev-bounces@lists.freedesktop.org
Sender: "igt-dev" <igt-dev-bounces@lists.freedesktop.org>
To: igt-dev@lists.freedesktop.org
List-ID: <igt-dev@lists.freedesktop.org>

SWYgZmlsZSBkZXNjcmlwdG9yIGlzIGtub3duIHdlIHVzZSBpZ3RfZGV2aWNlX21hcF9wY2lfYmFy
X3JlZ2lvbiB0byBtbWFwCmJhci4gT2xkIG1ldGhvZCBmcm9tIGxpYnBjaWFjY2VzcyBsaWJyYXJ5
IGlzIGxlZnQgZm9yIGxlZ2FjeQphcHBzIHRoYXQgd29yayB3aGVuIGRyaXZlciBpcyBub3QgbG9h
ZGVkLgoKdjQ6IFJld29yZCBkZXNjcmlwdGlvbiByZW1vdmUgd2hpdGVzcGFjZQoKU2lnbmVkLW9m
Zi1ieTogRGFuaWVsIE1yenlnbG9kIDxkYW5pZWwudC5tcnp5Z2xvZEBpbnRlbC5jb20+Ci0tLQog
bGliL2ludGVsX2lvLmggICAgICAgICAgICB8ICAyICstCiBsaWIvaW50ZWxfbW1pby5jICAgICAg
ICAgIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiB0b29scy9pbnRlbF9h
dWRpb19kdW1wLmMgIHwgIDIgKy0KIHRvb2xzL2ludGVsX2JhY2tsaWdodC5jICAgfCAgMiArLQog
dG9vbHMvaW50ZWxfZ3B1X3RpbWUuYyAgICB8ICAyICstCiB0b29scy9pbnRlbF9saWQuYyAgICAg
ICAgIHwgIDIgKy0KIHRvb2xzL2ludGVsX3JlZy5jICAgICAgICAgfCAgMiArLQogdG9vbHMvaW50
ZWxfcmVnX2NoZWNrZXIuYyB8ICAyICstCiA4IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMo
KyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pbnRlbF9pby5oIGIvbGliL2lu
dGVsX2lvLmgKaW5kZXggNjAxNGM0ODUuLjA5ZmVhMzg2IDEwMDY0NAotLS0gYS9saWIvaW50ZWxf
aW8uaAorKysgYi9saWIvaW50ZWxfaW8uaApAQCAtMzMsNyArMzMsNyBAQAogCiAvKiByZWdpc3Rl
ciBhY2Nlc3MgaGVscGVycyBmcm9tIGludGVsX21taW8uYyAqLwogZXh0ZXJuIHZvaWQgKmlndF9n
bG9iYWxfbW1pbzsKLXZvaWQgaW50ZWxfbW1pb191c2VfcGNpX2JhcihzdHJ1Y3QgcGNpX2Rldmlj
ZSAqcGNpX2Rldik7Cit2b2lkIGludGVsX21taW9fdXNlX3BjaV9iYXIoc3RydWN0IHBjaV9kZXZp
Y2UgKnBjaV9kZXYsIGludCBmZCk7CiB2b2lkIGludGVsX21taW9fdXNlX2R1bXBfZmlsZShjaGFy
ICpmaWxlKTsKIAogaW50IGludGVsX3JlZ2lzdGVyX2FjY2Vzc19pbml0KHN0cnVjdCBwY2lfZGV2
aWNlICpwY2lfZGV2LCBpbnQgc2FmZSwgaW50IGZkKTsKZGlmZiAtLWdpdCBhL2xpYi9pbnRlbF9t
bWlvLmMgYi9saWIvaW50ZWxfbW1pby5jCmluZGV4IGE1NDU4YWViLi40MjUzNjBlNCAxMDA2NDQK
LS0tIGEvbGliL2ludGVsX21taW8uYworKysgYi9saWIvaW50ZWxfbW1pby5jCkBAIC00NSw2ICs0
NSw3IEBACiAjaW5jbHVkZSAiaWd0X2NvcmUuaCIKICNpbmNsdWRlICJpZ3RfZ3QuaCIKICNpbmNs
dWRlICJpbnRlbF9jaGlwc2V0LmgiCisjaW5jbHVkZSAiaWd0X2RldmljZS5oIgogCiAvKioKICAq
IFNFQ1RJT046aW50ZWxfaW8KQEAgLTExNSw3ICsxMTYsNyBAQCBpbnRlbF9tbWlvX3VzZV9kdW1w
X2ZpbGUoY2hhciAqZmlsZSkKICAqIEBwY2lfZGV2IGNhbiBiZSBvYnRhaW5lZCBmcm9tIGludGVs
X2dldF9wY2lfZGV2aWNlKCkuCiAgKi8KIHZvaWQKLWludGVsX21taW9fdXNlX3BjaV9iYXIoc3Ry
dWN0IHBjaV9kZXZpY2UgKnBjaV9kZXYpCitpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKHN0cnVjdCBw
Y2lfZGV2aWNlICpwY2lfZGV2LCBpbnQgZmQpCiB7CiAJdWludDMyX3QgZGV2aWQsIGdlbjsKIAlp
bnQgbW1pb19iYXIsIG1taW9fc2l6ZTsKQEAgLTEzNSwxNCArMTM2LDI4IEBAIGludGVsX21taW9f
dXNlX3BjaV9iYXIoc3RydWN0IHBjaV9kZXZpY2UgKnBjaV9kZXYpCiAJZWxzZQogCQltbWlvX3Np
emUgPSAyKjEwMjQqMTAyNDsKIAotCWVycm9yID0gcGNpX2RldmljZV9tYXBfcmFuZ2UgKHBjaV9k
ZXYsCi0JCQkJICAgICAgcGNpX2Rldi0+cmVnaW9uc1ttbWlvX2Jhcl0uYmFzZV9hZGRyLAotCQkJ
CSAgICAgIG1taW9fc2l6ZSwKLQkJCQkgICAgICBQQ0lfREVWX01BUF9GTEFHX1dSSVRBQkxFLAot
CQkJCSAgICAgICZpZ3RfZ2xvYmFsX21taW8pOworCS8qIEl0J3MgZm9yIHNvbWUgbGVnYWN5IHRv
b2xzIGV4aXN0aW5nIGluIHRyZWUgdGhhdCByZXF1aXJlCisJICogd29ya2luZyB3aXRob3V0IGRy
aXZlcgorCSAqLworCisJaWYgKGZkID09IC0xKSB7CisJCWVycm9yID0gcGNpX2RldmljZV9tYXBf
cmFuZ2UocGNpX2RldiwKKwkJCQkJICAgICBwY2lfZGV2LT5yZWdpb25zW21taW9fYmFyXS5iYXNl
X2FkZHIsCisJCQkJCSAgICAgbW1pb19zaXplLAorCQkJCQkgICAgIFBDSV9ERVZfTUFQX0ZMQUdf
V1JJVEFCTEUsCisJCQkJCSAgICAgJmlndF9nbG9iYWxfbW1pbyk7CisKKwkJaWd0X2ZhaWxfb25f
ZihlcnJvciAhPSAwLCAiQ291bGRuJ3QgbWFwIE1NSU8gcmVnaW9uXG4iKTsKKwl9IGVsc2Ugewor
CQkvKiBUaGlzIG1ldGhvZCBpcyBtdWNoIG1vcmUgY29udmVuaWVudCB3aGVuIHdlIGhhdmUgbWFu
eQorCQkgKiBjb25jdXJyZW50IFBDSSBkZXZpY2VzCisJCSAqLworCQlpZ3RfZ2xvYmFsX21taW8g
PSBpZ3RfZGV2aWNlX21hcF9wY2lfYmFyX3JlZ2lvbihmZCwgbW1pb19iYXIsCisJCQkJCQkJCW1t
aW9fc2l6ZSk7CisJCWlndF9mYWlsX29uX2YobW1pb19kYXRhLT5pZ3RfbW1pbyA9PSBNQVBfRkFJ
TEVELAorCQkJICAgICAgIkNvdWxkbid0IG1hcCBNTUlPIHJlZ2lvblxuIik7CisJfQogCi0JaWd0
X2ZhaWxfb25fZihlcnJvciAhPSAwLAotCQkgICAgICAiQ291bGRuJ3QgbWFwIE1NSU8gcmVnaW9u
XG4iKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTE3MSw3ICsxODYsNyBAQCBpbnRlbF9yZWdpc3Rl
cl9hY2Nlc3NfaW5pdChzdHJ1Y3QgcGNpX2RldmljZSAqcGNpX2RldiwgaW50IHNhZmUsIGludCBm
ZCkKIAogCS8qIGFmdGVyIG9sZCBBUEkgaXMgZGVwcmVjYXRlZCwgcmVtb3ZlIHRoaXMgKi8KIAlp
ZiAoaWd0X2dsb2JhbF9tbWlvID09IE5VTEwpCi0JCWludGVsX21taW9fdXNlX3BjaV9iYXIocGNp
X2Rldik7CisJCWludGVsX21taW9fdXNlX3BjaV9iYXIocGNpX2RldiwgZmQpOwogCiAJaWd0X2Fz
c2VydChpZ3RfZ2xvYmFsX21taW8gIT0gTlVMTCk7CiAKZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVs
X2F1ZGlvX2R1bXAuYyBiL3Rvb2xzL2ludGVsX2F1ZGlvX2R1bXAuYwppbmRleCA5MDI2MGEyZi4u
ZDk1MmU1NGIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX2F1ZGlvX2R1bXAuYworKysgYi90b29s
cy9pbnRlbF9hdWRpb19kdW1wLmMKQEAgLTI0NzMsNyArMjQ3Myw3IEBAIGludCBtYWluKGludCBh
cmdjLCBjaGFyICoqYXJndikKIAlpZiAoYXJnYyA9PSAyKQogCQlpbnRlbF9tbWlvX3VzZV9kdW1w
X2ZpbGUoYXJndlsxXSk7CiAJZWxzZQotCQlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKHBjaV9kZXYp
OworCQlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKHBjaV9kZXYsIC0xKTsKIAogCXByaW50ZigiJXMg
YXVkaW8gcmVnaXN0ZXJzOlxuXG4iLCBpbnRlbF9nZXRfZGV2aWNlX2luZm8oZGV2aWQpLT5jb2Rl
bmFtZSk7CiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2aWQpKSB7CmRpZmYgLS1naXQgYS90b29scy9p
bnRlbF9iYWNrbGlnaHQuYyBiL3Rvb2xzL2ludGVsX2JhY2tsaWdodC5jCmluZGV4IDA2N2ZkNDE4
Li5lNDg1MGU4OCAxMDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxfYmFja2xpZ2h0LmMKKysrIGIvdG9v
bHMvaW50ZWxfYmFja2xpZ2h0LmMKQEAgLTQwLDcgKzQwLDcgQEAgaW50IG1haW4oaW50IGFyZ2Ms
IGNoYXIqKiBhcmd2KQogewogCXVpbnQzMl90IGN1cnJlbnQsIG1heDsKIAotCWludGVsX21taW9f
dXNlX3BjaV9iYXIoaW50ZWxfZ2V0X3BjaV9kZXZpY2UoKSk7CisJaW50ZWxfbW1pb191c2VfcGNp
X2JhcihpbnRlbF9nZXRfcGNpX2RldmljZSgpLCAtMSk7CiAKIAljdXJyZW50ID0gSU5SRUcoQkxD
X1BXTV9DUFVfQ1RMKSAmIEJBQ0tMSUdIVF9EVVRZX0NZQ0xFX01BU0s7CiAJbWF4ID0gSU5SRUco
QkxDX1BXTV9QQ0hfQ1RMMikgPj4gMTY7CmRpZmYgLS1naXQgYS90b29scy9pbnRlbF9ncHVfdGlt
ZS5jIGIvdG9vbHMvaW50ZWxfZ3B1X3RpbWUuYwppbmRleCA1NmQ2NWZlMC4uNGVkNjQzMGUgMTAw
NjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX2dwdV90aW1lLmMKKysrIGIvdG9vbHMvaW50ZWxfZ3B1X3Rp
bWUuYwpAQCAtNjcsNyArNjcsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJ
c3RhdGljIHN0cnVjdCBydXNhZ2UgcnVzYWdlOwogCWludCBzdGF0dXM7CiAKLQlpbnRlbF9tbWlv
X3VzZV9wY2lfYmFyKGludGVsX2dldF9wY2lfZGV2aWNlKCkpOworCWludGVsX21taW9fdXNlX3Bj
aV9iYXIoaW50ZWxfZ2V0X3BjaV9kZXZpY2UoKSwgLTEpOwogCiAJaWYgKGFyZ2MgPT0gMSkgewog
CQlmcHJpbnRmKHN0ZGVyciwgInVzYWdlOiAlcyBjbWQgW2FyZ3MuLi5dXG4iLCBhcmd2WzBdKTsK
ZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVsX2xpZC5jIGIvdG9vbHMvaW50ZWxfbGlkLmMKaW5kZXgg
MzdjNmJhNWUuLmY0NTc1NmUyIDEwMDY0NAotLS0gYS90b29scy9pbnRlbF9saWQuYworKysgYi90
b29scy9pbnRlbF9saWQuYwpAQCAtMTE5LDcgKzExOSw3IEBAIGludCBtYWluKGludCBhcmdjLCBj
aGFyICoqYXJndikKIHsKIAlpbnQgc3dmMTQsIGFjcGlfbGlkOwogCi0JaW50ZWxfbW1pb191c2Vf
cGNpX2JhcihpbnRlbF9nZXRfcGNpX2RldmljZSgpKTsKKwlpbnRlbF9tbWlvX3VzZV9wY2lfYmFy
KGludGVsX2dldF9wY2lfZGV2aWNlKCksIC0xKTsKIAogCXdoaWxlICgxKSB7CiAJCXN3ZjE0ID0g
SU5SRUcoU1dGMTQpOwpkaWZmIC0tZ2l0IGEvdG9vbHMvaW50ZWxfcmVnLmMgYi90b29scy9pbnRl
bF9yZWcuYwppbmRleCAxMjQ3YjcwYi4uOTQ3ZWMzNzggMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVs
X3JlZy5jCisrKyBiL3Rvb2xzL2ludGVsX3JlZy5jCkBAIC02NTAsNyArNjUwLDcgQEAgc3RhdGlj
IGludCBpbnRlbF9yZWdfc25hcHNob3Qoc3RydWN0IGNvbmZpZyAqY29uZmlnLCBpbnQgYXJnYywg
Y2hhciAqYXJndltdKQogCQlyZXR1cm4gRVhJVF9GQUlMVVJFOwogCX0KIAotCWludGVsX21taW9f
dXNlX3BjaV9iYXIoY29uZmlnLT5wY2lfZGV2KTsKKwlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKGNv
bmZpZy0+cGNpX2RldiwgLTEpOwogCiAJLyogWFhYOiBlcnJvciBoYW5kbGluZyAqLwogCWlmICh3
cml0ZSgxLCBpZ3RfZ2xvYmFsX21taW8sIGNvbmZpZy0+cGNpX2Rldi0+cmVnaW9uc1ttbWlvX2Jh
cl0uc2l6ZSkgPT0gLTEpCmRpZmYgLS1naXQgYS90b29scy9pbnRlbF9yZWdfY2hlY2tlci5jIGIv
dG9vbHMvaW50ZWxfcmVnX2NoZWNrZXIuYwppbmRleCA2YmRlNjNlYy4uOTJhODlhZTAgMTAwNjQ0
Ci0tLSBhL3Rvb2xzL2ludGVsX3JlZ19jaGVja2VyLmMKKysrIGIvdG9vbHMvaW50ZWxfcmVnX2No
ZWNrZXIuYwpAQCAtMzQ1LDcgKzM0NSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJn
dikKIAogCWRldiA9IGludGVsX2dldF9wY2lfZGV2aWNlKCk7CiAJZGV2aWQgPSBkZXYtPmRldmlj
ZV9pZDsKLQlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKGRldik7CisJaW50ZWxfbW1pb191c2VfcGNp
X2JhcihkZXYsIC0xKTsKIAogCWlmIChJU19HRU43KGRldmlkKSkKIAkJZ2VuID0gNzsKLS0gCjIu
MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0
LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2