From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <igt-dev-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5A8926E223
 for <igt-dev@lists.freedesktop.org>; Mon,  3 Aug 2020 08:58:22 +0000 (UTC)
From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= <zbigniew.kempczynski@intel.com>
Date: Mon,  3 Aug 2020 10:57:48 +0200
Message-Id: <20200803085803.23741-7-zbigniew.kempczynski@intel.com>
In-Reply-To: <20200803085803.23741-1-zbigniew.kempczynski@intel.com>
References: <20200803085803.23741-1-zbigniew.kempczynski@intel.com>
MIME-Version: 1.0
Subject: [igt-dev] [PATCH i-g-t v24 06/21] lib/intel_batchbuffer: use
 canonical addresses for 48bit ppgtt
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
Cc: Chris Wilson <chris@chris-wilson.co.uk>
List-ID: <igt-dev@lists.freedesktop.org>

Rm9yIGFsbCBFWEVDX09CSkVDVF9QSU5ORUQgb2JqZWN0cyB3ZSBuZWVkIHRvIGJlIHN1cmUgYWRk
cmVzcwpwYXNzZWQgbXVzdCBiZSBpbiBjYW5vbmljYWwgZm9ybS4KClVudGlsIElHVCBhbGxvY2F0
b3Igd2lsbCBiZSB3cml0dGVuIGp1c3QgbGltaXQgNDggYW5kIDQ3IGJpdApndHQgdGFibGVzIHRv
IDQ2IGJpdCBvbmx5LiBXZSBkb24ndCB3YW50IHRvIHBsYXkgd2l0aCBjYW5vbmljYWwKYWRkcmVz
c2VzIHdpdGggNDctYml0IHNldCB0byAxIChhbmQgdGhlbiA2Mzo0OCkuCgpTaWduZWQtb2ZmLWJ5
OiBaYmlnbmlldyBLZW1wY3p5xYRza2kgPHpiaWduaWV3LmtlbXBjenluc2tpQGludGVsLmNvbT4K
Q2M6IERvbWluaWsgR3J6ZWdvcnplayA8ZG9taW5pay5ncnplZ29yemVrQGludGVsLmNvbT4KQ2M6
IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGxpYi9pbnRlbF9i
YXRjaGJ1ZmZlci5jICAgfCAzNyArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogdGVz
dHMvaTkxNS9hcGlfaW50ZWxfYmIuYyB8IDQ0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pbnRlbF9iYXRjaGJ1ZmZlci5jIGIvbGliL2ludGVsX2Jh
dGNoYnVmZmVyLmMKaW5kZXggNDY1YzMyNzEuLmU2ZDAxOTE1IDEwMDY0NAotLS0gYS9saWIvaW50
ZWxfYmF0Y2hidWZmZXIuYworKysgYi9saWIvaW50ZWxfYmF0Y2hidWZmZXIuYwpAQCAtMTIwNSw2
ICsxMjA1LDIwIEBAIHN0YXRpYyB2b2lkIF9fcmVhbGxvY2F0ZV9vYmplY3RzKHN0cnVjdCBpbnRl
bF9iYiAqaWJiKQogCX0KIH0KIAorLyoKKyAqIGdlbjhfY2Fub25pY2FsX2FkZHIKKyAqIFVzZWQg
dG8gY29udmVydCBhbnkgYWRkcmVzcyBpbnRvIGNhbm9uaWNhbCBmb3JtLCBpLmUuIFs2Mzo0OF0g
PT0gWzQ3XS4KKyAqIEJhc2VkIG9uIGtlcm5lbCdzIHNpZ25fZXh0ZW5kNjQgaW1wbGVtZW50YXRp
b24uCisgKiBAYWRkcmVzcyAtIGEgdmlydHVhbCBhZGRyZXNzCisgKi8KKyNkZWZpbmUgR0VOOF9I
SUdIX0FERFJFU1NfQklUIDQ3CitzdGF0aWMgdWludDY0X3QgZ2VuOF9jYW5vbmljYWxfYWRkcih1
aW50NjRfdCBhZGRyZXNzKQoreworCV9fdTggc2hpZnQgPSA2MyAtIEdFTjhfSElHSF9BRERSRVNT
X0JJVDsKKworCXJldHVybiAoX19zNjQpKGFkZHJlc3MgPDwgc2hpZnQpID4+IHNoaWZ0OworfQor
CiBzdGF0aWMgaW5saW5lIHVpbnQ2NF90IF9faW50ZWxfYmJfcHJvcG9zZV9vZmZzZXQoc3RydWN0
IGludGVsX2JiICppYmIpCiB7CiAJdWludDY0X3Qgb2Zmc2V0OwpAQCAtMTIxNyw2ICsxMjMxLDcg
QEAgc3RhdGljIGlubGluZSB1aW50NjRfdCBfX2ludGVsX2JiX3Byb3Bvc2Vfb2Zmc2V0KHN0cnVj
dCBpbnRlbF9iYiAqaWJiKQogCW9mZnNldCArPSAyNTYgPDwgMTA7IC8qIEtlZXAgdGhlIGxvdyAy
NTZrIGNsZWFyLCBmb3IgbmVnYXRpdmUgZGVsdGFzICovCiAJb2Zmc2V0ICY9IGliYi0+Z3R0X3Np
emUgLSAxOwogCW9mZnNldCAmPSB+KGliYi0+YWxpZ25tZW50IC0gMSk7CisJb2Zmc2V0ID0gZ2Vu
OF9jYW5vbmljYWxfYWRkcihvZmZzZXQpOwogCiAJcmV0dXJuIG9mZnNldDsKIH0KQEAgLTEyNTQs
OSArMTI2OSwyMSBAQCBfX2ludGVsX2JiX2NyZWF0ZShpbnQgaTkxNSwgdWludDMyX3Qgc2l6ZSwg
Ym9vbCBkb19yZWxvY3MpCiAJZ3R0X3NpemUgPSBnZW1fYXBlcnR1cmVfc2l6ZShpOTE1KTsKIAlp
ZiAoIWdlbV91c2VzX2Z1bGxfcHBndHQoaTkxNSkpCiAJCWd0dF9zaXplIC89IDI7Ci0JaWYgKChn
dHRfc2l6ZSAtIDEpID4+IDMyKQorCWlmICgoZ3R0X3NpemUgLSAxKSA+PiAzMikgewogCQlpYmIt
PnN1cHBvcnRzXzQ4Yl9hZGRyZXNzID0gdHJ1ZTsKIAorCQkvKgorCQkgKiBVbnRpbCB3ZSBkZXZl
bG9wIElHVCBhZGRyZXNzIGFsbG9jYXRvciB3ZSB3b3JrYXJvdW5kCisJCSAqIHBsYXlpbmcgd2l0
aCBjYW5vbmljYWwgYWRkcmVzc2VzIHdpdGggNDctYml0IHNldCB0byAxCisJCSAqIGp1c3QgYnkg
bGltaXRpbmcgZ3R0IHNpemUgdG8gNDYtYml0IHdoZW4gZ3R0IGlzIDQ3IG9yIDQ4CisJCSAqIGJp
dCBzaXplLiBDdXJyZW50IGludGVyZmFjZSBkb2Vzbid0IHBhc3MgYm8gc2l6ZSwgc28KKwkJICog
bGltaXRpbmcgdG8gNDYgYml0IG1ha2UgdXMgc3VyZSB3ZSB3b24ndCBlbnRlciB0bworCQkgKiBh
ZGRyZXNzZXMgd2l0aCA0Ny1iaXQgc2V0ICh3ZSB1c2UgMzItYml0IHNpemUgbm93IHNvCisJCSAq
IHN0aWxsIHdlIGZpdCA0Ny1iaXQgYWRkcmVzcyBzcGFjZSkuCisJCSAqLworCQlpZiAoZ3R0X3Np
emUgJiAoM3VsbCA8PCA0NykpCisJCQlndHRfc2l6ZSA9ICgxdWxsIDw8IDQ2KTsKKwl9CiAJaWJi
LT5ndHRfc2l6ZSA9IGd0dF9zaXplOwogCiAJX19yZWFsbG9jYXRlX29iamVjdHMoaWJiKTsKQEAg
LTE1MjQsNyArMTU1MSwxMSBAQCBpbnRlbF9iYl9hZGRfb2JqZWN0KHN0cnVjdCBpbnRlbF9iYiAq
aWJiLCB1aW50MzJfdCBoYW5kbGUsCiAJaSA9IGliYi0+bnVtX29iamVjdHM7CiAJb2JqZWN0ID0g
JmliYi0+b2JqZWN0c1tpXTsKIAlvYmplY3QtPmhhbmRsZSA9IGhhbmRsZTsKKworCS8qIExpbWl0
IGN1cnJlbnQgb2Zmc2V0IHRvIGd0dCBzaXplICovCiAJb2JqZWN0LT5vZmZzZXQgPSBvZmZzZXQ7
CisJaWYgKG9mZnNldCAhPSBJTlRFTF9CVUZfSU5WQUxJRF9BRERSRVNTKQorCQlvYmplY3QtPm9m
ZnNldCA9IGdlbjhfY2Fub25pY2FsX2FkZHIob2Zmc2V0ICYgKGliYi0+Z3R0X3NpemUgLSAxKSk7
CiAJb2JqZWN0LT5hbGlnbm1lbnQgPSBpYmItPmFsaWdubWVudDsKIAogCWZvdW5kID0gdHNlYXJj
aCgodm9pZCAqKSBvYmplY3QsICZpYmItPnJvb3QsIF9fY29tcGFyZV9vYmplY3RzKTsKQEAgLTE4
NjIsOCArMTg5Myw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2JiX2R1bXBfZXhlY2J1ZihzdHJ1Y3Qg
aW50ZWxfYmIgKmliYiwKIAkJCSAgICBmcm9tX3VzZXJfcG9pbnRlcihleGVjYnVmLT5idWZmZXJz
X3B0cikpW2ldOwogCQlyZWxvY3MgPSBmcm9tX3VzZXJfcG9pbnRlcihvYmplY3RzLT5yZWxvY3Nf
cHRyKTsKIAkJYWRkcmVzcyA9IG9iamVjdHMtPm9mZnNldDsKLQkJaWYgKGFkZHJlc3MgIT0gSU5U
RUxfQlVGX0lOVkFMSURfQUREUkVTUykKLQkJCWFkZHJlc3MgPSBhZGRyZXNzICYgKGliYi0+Z3R0
X3NpemUgLSAxKTsKIAkJaWd0X2luZm8oIiBbJWRdIGhhbmRsZTogJXUsIHJlbG9jX2NvdW50OiAl
ZCwgcmVsb2NfcHRyOiAlcCwgIgogCQkJICJhbGlnbjogMHglbGx4LCBvZmZzZXQ6IDB4JSIgUFJJ
eDY0ICIsIGZsYWdzOiAweCVsbHgsICIKIAkJCSAicnN2ZDE6IDB4JWxseCwgcnN2ZDI6IDB4JWxs
eFxuIiwKQEAgLTE4NzgsOCArMTkwNyw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2JiX2R1bXBfZXhl
Y2J1ZihzdHJ1Y3QgaW50ZWxfYmIgKmliYiwKIAkJCWZvciAoaiA9IDA7IGogPCBvYmplY3RzLT5y
ZWxvY2F0aW9uX2NvdW50OyBqKyspIHsKIAkJCQlyZWxvYyA9ICZyZWxvY3Nbal07CiAJCQkJYWRk
cmVzcyA9IHJlbG9jLT5wcmVzdW1lZF9vZmZzZXQ7Ci0JCQkJaWYgKGFkZHJlc3MgIT0gSU5URUxf
QlVGX0lOVkFMSURfQUREUkVTUykKLQkJCQkJYWRkcmVzcyA9IGFkZHJlc3MgJiAoaWJiLT5ndHRf
c2l6ZSAtIDEpOwogCQkJCWlndF9pbmZvKCJcdCBbJWRdIHRhcmdldCBoYW5kbGU6ICV1LCAiCiAJ
CQkJCSAib2Zmc2V0OiAweCVsbHgsIGRlbHRhOiAweCV4LCAiCiAJCQkJCSAicHJlc3VtZWRfb2Zm
c2V0OiAweCUiIFBSSXg2NCAiLCAiCmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2FwaV9pbnRlbF9i
Yi5jIGIvdGVzdHMvaTkxNS9hcGlfaW50ZWxfYmIuYwppbmRleCA2OTY3ZmM1ZC4uOTg4NzJiZTgg
MTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvYXBpX2ludGVsX2JiLmMKKysrIGIvdGVzdHMvaTkxNS9h
cGlfaW50ZWxfYmIuYwpAQCAtMTY1LDYgKzE2NSw0NyBAQCBzdGF0aWMgdm9pZCBzaW1wbGVfYmIo
c3RydWN0IGJ1Zl9vcHMgKmJvcHMsIGJvb2wgdXNlX2NvbnRleHQpCiAJCWdlbV9jb250ZXh0X2Rl
c3Ryb3koaTkxNSwgY3R4KTsKIH0KIAorLyoKKyAqIE1ha2Ugc3VyZSBpbnRlbC1iYiBzcGFjZSBh
bGxvY2F0b3IgY3VycmVudGx5IGRvZXNuJ3QgZW50ZXIgNDctNDggYml0CisgKiBndHQgc2l6ZXMu
CisgKi8KK3N0YXRpYyB2b2lkIGNoZWNrX2Nhbm9uaWNhbChzdHJ1Y3QgYnVmX29wcyAqYm9wcykK
K3sKKwlpbnQgaTkxNSA9IGJ1Zl9vcHNfZ2V0X2ZkKGJvcHMpOworCXN0cnVjdCBpbnRlbF9iYiAq
aWJiOworCXN0cnVjdCBpbnRlbF9idWYgKmJ1ZjsKKwl1aW50MzJfdCBvZmZzZXQ7CisJdWludDY0
X3QgYWRkcmVzczsKKwlib29sIHN1cHBvcnRzXzQ4Yml0OworCisJaWJiID0gaW50ZWxfYmJfY3Jl
YXRlKGk5MTUsIFBBR0VfU0laRSk7CisJc3VwcG9ydHNfNDhiaXQgPSBpYmItPnN1cHBvcnRzXzQ4
Yl9hZGRyZXNzOworCWlmICghc3VwcG9ydHNfNDhiaXQpCisJCWludGVsX2JiX2Rlc3Ryb3koaWJi
KTsKKwlpZ3RfcmVxdWlyZV9mKHN1cHBvcnRzXzQ4Yml0LCAiV2UgbmVlZCA0OGJpdCBwcGd0dCBm
b3IgdGVzdGluZ1xuIik7CisKKwlhZGRyZXNzID0gMHhjMDAwMDAwMDAwMDA7CisJaWYgKGRlYnVn
X2JiKQorCQlpbnRlbF9iYl9zZXRfZGVidWcoaWJiLCB0cnVlKTsKKworCW9mZnNldCA9IGludGVs
X2JiX2VtaXRfYmJlKGliYik7CisKKwlidWYgPSBpbnRlbF9idWZfY3JlYXRlKGJvcHMsIDUxMiwg
NTEyLCAzMiwgMCwKKwkJCSAgICAgICBJOTE1X1RJTElOR19OT05FLCBJOTE1X0NPTVBSRVNTSU9O
X05PTkUpOworCisJYnVmLT5hZGRyLm9mZnNldCA9IGFkZHJlc3M7CisJaW50ZWxfYmJfYWRkX2lu
dGVsX2J1ZihpYmIsIGJ1ZiwgdHJ1ZSk7CisJaW50ZWxfYmJfb2JqZWN0X3NldF9mbGFnKGliYiwg
YnVmLT5oYW5kbGUsIEVYRUNfT0JKRUNUX1BJTk5FRCk7CisKKwlpZ3RfYXNzZXJ0KGJ1Zi0+YWRk
ci5vZmZzZXQgPT0gMCk7CisKKwlpbnRlbF9iYl9leGVjKGliYiwgb2Zmc2V0LAorCQkgICAgICBJ
OTE1X0VYRUNfREVGQVVMVCB8IEk5MTVfRVhFQ19OT19SRUxPQywgdHJ1ZSk7CisKKwlpbnRlbF9i
dWZfZGVzdHJveShidWYpOworCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKK30KKwogI2RlZmluZSBN
SV9GTFVTSF9EVyAoMHgyNjw8MjMpCiAjZGVmaW5lIEJDU19TV0NUUkwgIDB4MjIyMDAKICNkZWZp
bmUgQkNTX1NSQ19ZICAgKDEgPDwgMCkKQEAgLTY3Myw2ICs3MTQsOSBAQCBpZ3RfbWFpbl9hcmdz
KCJkcGkiLCBOVUxMLCBoZWxwX3N0ciwgb3B0X2hhbmRsZXIsIE5VTEwpCiAJaWd0X3N1YnRlc3Qo
InNpbXBsZS1iYi1jdHgiKQogCQlzaW1wbGVfYmIoYm9wcywgdHJ1ZSk7CiAKKwlpZ3Rfc3VidGVz
dCgiY2hlY2stY2Fub25pY2FsIikKKwkJY2hlY2tfY2Fub25pY2FsKGJvcHMpOworCiAJaWd0X3N1
YnRlc3QoImJsaXQtbm9yZWxvYy1rZWVwLWNhY2hlIikKIAkJYmxpdChib3BzLCBOT1JFTE9DLCBL
RUVQX0NBQ0hFKTsKIAotLSAKMi4yNi4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2lndC1kZXYK