From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C08646E948 for ; Fri, 24 Jul 2020 09:57:18 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Fri, 24 Jul 2020 11:56:52 +0200 Message-Id: <20200724095659.535-7-zbigniew.kempczynski@intel.com> In-Reply-To: <20200724095659.535-1-zbigniew.kempczynski@intel.com> References: <20200724095659.535-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v3 06/13] lib/intel_batchbuffer: use canonical addresses for 48bit ppgtt List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Chris Wilson List-ID: Rm9yIGFsbCBFWEVDX09CSkVDVF9QSU5ORUQgb2JqZWN0cyB3ZSBuZWVkIHRvIGJlIHN1cmUgYWRk cmVzcwpwYXNzZWQgbXVzdCBiZSBpbiBjYW5vbmljYWwgZm9ybS4KClNpZ25lZC1vZmYtYnk6IFpi aWduaWV3IEtlbXBjennFhHNraSA8emJpZ25pZXcua2VtcGN6eW5za2lAaW50ZWwuY29tPgpDYzog RG9taW5payBHcnplZ29yemVrIDxkb21pbmlrLmdyemVnb3J6ZWtAaW50ZWwuY29tPgpDYzogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogbGliL2ludGVsX2JhdGNo YnVmZmVyLmMgICB8IDIxICsrKysrKysrKysrKysrLS0tLS0KIHRlc3RzL2k5MTUvYXBpX2ludGVs X2JiLmMgfCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmls ZXMgY2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9saWIvaW50ZWxfYmF0Y2hidWZmZXIuYyBiL2xpYi9pbnRlbF9iYXRjaGJ1ZmZlci5jCmluZGV4 IGJmODRkNWYwLi4xOTQ3NGIwNiAxMDA2NDQKLS0tIGEvbGliL2ludGVsX2JhdGNoYnVmZmVyLmMK KysrIGIvbGliL2ludGVsX2JhdGNoYnVmZmVyLmMKQEAgLTEyMDQsNiArMTIwNCwyMCBAQCBzdGF0 aWMgdm9pZCBfX3JlYWxsb2NhdGVfb2JqZWN0cyhzdHJ1Y3QgaW50ZWxfYmIgKmliYikKIAl9CiB9 CiAKKy8qCisgKiBnZW44X2Nhbm9uaWNhbF9hZGRyCisgKiBVc2VkIHRvIGNvbnZlcnQgYW55IGFk ZHJlc3MgaW50byBjYW5vbmljYWwgZm9ybSwgaS5lLiBbNjM6NDhdID09IFs0N10uCisgKiBCYXNl ZCBvbiBrZXJuZWwncyBzaWduX2V4dGVuZDY0IGltcGxlbWVudGF0aW9uLgorICogQGFkZHJlc3Mg LSBhIHZpcnR1YWwgYWRkcmVzcworICovCisjZGVmaW5lIEdFTjhfSElHSF9BRERSRVNTX0JJVCA0 Nworc3RhdGljIHVpbnQ2NF90IGdlbjhfY2Fub25pY2FsX2FkZHIodWludDY0X3QgYWRkcmVzcykK K3sKKwlfX3U4IHNoaWZ0ID0gNjMgLSBHRU44X0hJR0hfQUREUkVTU19CSVQ7CisKKwlyZXR1cm4g KF9fczY0KShhZGRyZXNzIDw8IHNoaWZ0KSA+PiBzaGlmdDsKK30KKwogc3RhdGljIGlubGluZSB1 aW50NjRfdCBfX2ludGVsX2JiX3Byb3Bvc2Vfb2Zmc2V0KHN0cnVjdCBpbnRlbF9iYiAqaWJiKQog ewogCXVpbnQ2NF90IG9mZnNldDsKQEAgLTEyMTYsNiArMTIzMCw3IEBAIHN0YXRpYyBpbmxpbmUg dWludDY0X3QgX19pbnRlbF9iYl9wcm9wb3NlX29mZnNldChzdHJ1Y3QgaW50ZWxfYmIgKmliYikK IAlvZmZzZXQgKz0gMjU2IDw8IDEwOyAvKiBLZWVwIHRoZSBsb3cgMjU2ayBjbGVhciwgZm9yIG5l Z2F0aXZlIGRlbHRhcyAqLwogCW9mZnNldCAmPSBpYmItPmd0dF9zaXplIC0gMTsKIAlvZmZzZXQg Jj0gfihpYmItPmFsaWdubWVudCAtIDEpOworCW9mZnNldCA9IGdlbjhfY2Fub25pY2FsX2FkZHIo b2Zmc2V0KTsKIAogCXJldHVybiBvZmZzZXQ7CiB9CkBAIC0xNDk5LDcgKzE1MTQsNyBAQCBpbnRl bF9iYl9hZGRfb2JqZWN0KHN0cnVjdCBpbnRlbF9iYiAqaWJiLCB1aW50MzJfdCBoYW5kbGUsCiAJ aSA9IGliYi0+bnVtX29iamVjdHM7CiAJb2JqZWN0ID0gJmliYi0+b2JqZWN0c1tpXTsKIAlvYmpl Y3QtPmhhbmRsZSA9IGhhbmRsZTsKLQlvYmplY3QtPm9mZnNldCA9IG9mZnNldDsKKwlvYmplY3Qt Pm9mZnNldCA9IGdlbjhfY2Fub25pY2FsX2FkZHIob2Zmc2V0KTsKIAlvYmplY3QtPmFsaWdubWVu dCA9IGliYi0+YWxpZ25tZW50OwogCiAJZm91bmQgPSB0c2VhcmNoKCh2b2lkICopIG9iamVjdCwg JmliYi0+cm9vdCwgX19jb21wYXJlX29iamVjdHMpOwpAQCAtMTgwOSw4ICsxODI0LDYgQEAgc3Rh dGljIHZvaWQgaW50ZWxfYmJfZHVtcF9leGVjYnVmKHN0cnVjdCBpbnRlbF9iYiAqaWJiLAogCQkJ ICAgIGZyb21fdXNlcl9wb2ludGVyKGV4ZWNidWYtPmJ1ZmZlcnNfcHRyKSlbaV07CiAJCXJlbG9j cyA9IGZyb21fdXNlcl9wb2ludGVyKG9iamVjdHMtPnJlbG9jc19wdHIpOwogCQlhZGRyZXNzID0g b2JqZWN0cy0+b2Zmc2V0OwotCQlpZiAoYWRkcmVzcyAhPSBJTlRFTF9CVUZfSU5WQUxJRF9BRERS RVNTKQotCQkJYWRkcmVzcyA9IGFkZHJlc3MgJiAoaWJiLT5ndHRfc2l6ZSAtIDEpOwogCQlpZ3Rf aW5mbygiIFslZF0gaGFuZGxlOiAldSwgcmVsb2NfY291bnQ6ICVkLCByZWxvY19wdHI6ICVwLCAi CiAJCQkgImFsaWduOiAweCVsbHgsIG9mZnNldDogMHglIiBQUkl4NjQgIiwgZmxhZ3M6IDB4JWxs eCwgIgogCQkJICJyc3ZkMTogMHglbGx4LCByc3ZkMjogMHglbGx4XG4iLApAQCAtMTgyNSw4ICsx ODM4LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfYmJfZHVtcF9leGVjYnVmKHN0cnVjdCBpbnRlbF9i YiAqaWJiLAogCQkJZm9yIChqID0gMDsgaiA8IG9iamVjdHMtPnJlbG9jYXRpb25fY291bnQ7IGor KykgewogCQkJCXJlbG9jID0gJnJlbG9jc1tqXTsKIAkJCQlhZGRyZXNzID0gcmVsb2MtPnByZXN1 bWVkX29mZnNldDsKLQkJCQlpZiAoYWRkcmVzcyAhPSBJTlRFTF9CVUZfSU5WQUxJRF9BRERSRVNT KQotCQkJCQlhZGRyZXNzID0gYWRkcmVzcyAmIChpYmItPmd0dF9zaXplIC0gMSk7CiAJCQkJaWd0 X2luZm8oIlx0IFslZF0gdGFyZ2V0IGhhbmRsZTogJXUsICIKIAkJCQkJICJvZmZzZXQ6IDB4JWxs eCwgZGVsdGE6IDB4JXgsICIKIAkJCQkJICJwcmVzdW1lZF9vZmZzZXQ6IDB4JSIgUFJJeDY0ICIs ICIKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUvYXBpX2ludGVsX2JiLmMgYi90ZXN0cy9pOTE1L2Fw aV9pbnRlbF9iYi5jCmluZGV4IGRmMGViOTMzLi4xYTIyZThmZCAxMDA2NDQKLS0tIGEvdGVzdHMv aTkxNS9hcGlfaW50ZWxfYmIuYworKysgYi90ZXN0cy9pOTE1L2FwaV9pbnRlbF9iYi5jCkBAIC0x NjUsNiArMTY1LDQ3IEBAIHN0YXRpYyB2b2lkIHNpbXBsZV9iYihzdHJ1Y3QgYnVmX29wcyAqYm9w cywgYm9vbCB1c2VfY29udGV4dCkKIAkJZ2VtX2NvbnRleHRfZGVzdHJveShpOTE1LCBjdHgpOwog fQogCitzdGF0aWMgdm9pZCBjaGVja19jYW5vbmljYWwoc3RydWN0IGJ1Zl9vcHMgKmJvcHMpCit7 CisJaW50IGk5MTUgPSBidWZfb3BzX2dldF9mZChib3BzKTsKKwlzdHJ1Y3QgaW50ZWxfYmIgKmli YjsKKwlzdHJ1Y3QgaW50ZWxfYnVmICpidWY7CisJdWludDMyX3Qgb2Zmc2V0OworCXVpbnQ2NF90 IGd0dF9zaXplLCBhZGRyZXNzOworCWJvb2wgc3VwcG9ydHNfNDhiaXQ7CisKKwlpYmIgPSBpbnRl bF9iYl9jcmVhdGUoaTkxNSwgUEFHRV9TSVpFKTsKKwlzdXBwb3J0c180OGJpdCA9IGliYi0+c3Vw cG9ydHNfNDhiX2FkZHJlc3M7CisJaWYgKCFzdXBwb3J0c180OGJpdCkKKwkJaW50ZWxfYmJfZGVz dHJveShpYmIpOworCWlndF9yZXF1aXJlX2Yoc3VwcG9ydHNfNDhiaXQsICJXZSBuZWVkIDQ4Yml0 IHBwZ3R0IGZvciB0ZXN0aW5nXG4iKTsKKworCWFkZHJlc3MgPSAweDgwMDA0MDAwMjAwMDsKKwln dHRfc2l6ZSA9IGliYi0+Z3R0X3NpemU7CisJaWYgKChhZGRyZXNzICYgKGd0dF9zaXplIC0gMSkp ICE9IGFkZHJlc3MpCisJCWludGVsX2JiX2Rlc3Ryb3koaWJiKTsKKwlpZ3RfcmVxdWlyZV9mKChh ZGRyZXNzICYgKGd0dF9zaXplIC0gMSkpID09IGFkZHJlc3MsCisJCSAgICAgICJZb3VyIHBwZ3R0 IGlzIG5vdCBmdWxsIDQ4IHBwZ3R0XG4iKTsKKworCWlmIChkZWJ1Z19iYikKKwkJaW50ZWxfYmJf c2V0X2RlYnVnKGliYiwgdHJ1ZSk7CisKKwlvZmZzZXQgPSBpbnRlbF9iYl9lbWl0X2JiZShpYmIp OworCisJYnVmID0gaW50ZWxfYnVmX2NyZWF0ZShib3BzLCA1MTIsIDUxMiwgMzIsIDAsCisJCQkg ICAgICAgSTkxNV9USUxJTkdfTk9ORSwgSTkxNV9DT01QUkVTU0lPTl9OT05FKTsKKworCWJ1Zi0+ YWRkci5vZmZzZXQgPSBhZGRyZXNzOworCWludGVsX2JiX2FkZF9pbnRlbF9idWYoaWJiLCBidWYs IHRydWUpOworCWludGVsX2JiX29iamVjdF9zZXRfZmxhZyhpYmIsIGJ1Zi0+aGFuZGxlLCBFWEVD X09CSkVDVF9QSU5ORUQpOworCisJaW50ZWxfYmJfZXhlYyhpYmIsIG9mZnNldCwKKwkJICAgICAg STkxNV9FWEVDX0RFRkFVTFQgfCBJOTE1X0VYRUNfTk9fUkVMT0MsIHRydWUpOworCisJaW50ZWxf YnVmX2Rlc3Ryb3koYnVmKTsKKwlpbnRlbF9iYl9kZXN0cm95KGliYik7Cit9CisKICNkZWZpbmUg TUlfRkxVU0hfRFcgKDB4MjY8PDIzKQogI2RlZmluZSBCQ1NfU1dDVFJMICAweDIyMjAwCiAjZGVm aW5lIEJDU19TUkNfWSAgICgxIDw8IDApCkBAIC04MjksNiArODcwLDkgQEAgaWd0X21haW5fYXJn cygiZHBpIiwgTlVMTCwgaGVscF9zdHIsIG9wdF9oYW5kbGVyLCBOVUxMKQogCWlndF9zdWJ0ZXN0 KCJzaW1wbGUtYmItY3R4IikKIAkJc2ltcGxlX2JiKGJvcHMsIHRydWUpOwogCisJaWd0X3N1YnRl c3QoImNoZWNrLWNhbm9uaWNhbCIpCisJCWNoZWNrX2Nhbm9uaWNhbChib3BzKTsKKwogCWlndF9z dWJ0ZXN0KCJibGl0LW5vcmVsb2Mta2VlcC1jYWNoZSIpCiAJCWJsaXQoYm9wcywgTk9SRUxPQywg S0VFUF9DQUNIRSk7CiAKLS0gCjIuMjYuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pZ3QtZGV2Cg==