From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 10/17] drm/i915: support inserting 64K pages into the 48b PPGTT Date: Tue, 16 May 2017 09:29:41 +0100 Message-ID: <20170516082948.28090-11-matthew.auld@intel.com> References: <20170516082948.28090-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E87FA6E2DC for ; Tue, 16 May 2017 08:30:07 +0000 (UTC) In-Reply-To: <20170516082948.28090-1-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SWYgd2Ugc2V0IHRoZSBJUFMgYml0LCBha2EgUERFWzExXSB0aGVuIGV2ZXJ5IDE2dGggZW50cnkg c2hvdWxkIGJlIHVzZWQKdG8gaW5kZXgsIHRoZSBIVyBtYWtlcyBubyBhc3N1bXB0aW9ucyBmb3Ig YW55IG90aGVyIFBURXMuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVs ZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA3NCAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaCB8ICAyICsKIDIgZmlsZXMgY2hhbmdlZCwgNzYgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggM2JlM2NiZmI2ZDI4Li44NzQ4 NTRlNzcyNDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC04NTQsNiArODU0 LDc3IEBAIHN0YXRpYyBfX2Fsd2F5c19pbmxpbmUgc3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBnZW44 X2luc2VydF9wdGUodTY0IHN0YXJ0KQogfQogCiBzdGF0aWMgX19hbHdheXNfaW5saW5lIGJvb2wK K2dlbjhfcHBndHRfaW5zZXJ0XzY0S19wdGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQsCisJCQkJICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJ CQkJICBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKKwkJCQkgIHN0cnVjdCBnZW44X2luc2VydF9wdGUg KmlkeCwKKwkJCQkgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCkKK3sKKwlzdHJ1 Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CisJY29uc3QgZ2VuOF9wdGVfdCBwdGVfZW5jb2Rl ID0gZ2VuOF9wdGVfZW5jb2RlKDAsIGNhY2hlX2xldmVsKTsKKwlnZW44X3B0ZV90ICp2YWRkcjsK Kwlib29sIHJldDsKKworCS8qIEN1cnJlbnRseSA2NEsgb2JqZWN0cyBzaG91bGQgYmUgYWxpZ25l ZCB0byAyTSB0byBwcmV2ZW50IG1peGluZyA0SworCSAqIGFuZCA2NEsgcHRlJ3MgaW4gdGhlIHNh bWUgcGFnZS10YWJsZS4KKwkgKi8KKwlHRU1fQlVHX09OKGlkeC0+cHRlKTsKKwlHRU1fQlVHX09O KGlkeC0+cGRwZSA+PSBpOTE1X3BkcGVzX3Blcl9wZHAoJnBwZ3R0LT5iYXNlKSk7CisJcGQgPSBw ZHAtPnBhZ2VfZGlyZWN0b3J5W2lkeC0+cGRwZV07CisKKwl2YWRkciA9IGttYXBfYXRvbWljX3B4 KHBkKTsKKwl2YWRkcltpZHgtPnBkZV0gfD0gR0VOOF9QREVfSVBTXzY0SzsKKwlrdW5tYXBfYXRv bWljKHZhZGRyKTsKKworCXZhZGRyID0ga21hcF9hdG9taWNfcHgocGQtPnBhZ2VfdGFibGVbaWR4 LT5wZGVdKTsKKwlkbyB7CisJCXZhZGRyW2lkeC0+cHRlXSA9IHB0ZV9lbmNvZGUgfCBpdGVyLT5k bWE7CisJCWl0ZXItPmRtYSArPSBJOTE1X0dUVF9QQUdFX1NJWkVfNjRLOworCQlpZiAoaXRlci0+ ZG1hID49IGl0ZXItPm1heCkgeworCQkJaXRlci0+c2cgPSBfX3NnX25leHQoaXRlci0+c2cpOwor CQkJaWYgKCFpdGVyLT5zZykgeworCQkJCXJldCA9IGZhbHNlOworCQkJCWJyZWFrOworCQkJfQor CisJCQlpdGVyLT5kbWEgPSBzZ19kbWFfYWRkcmVzcyhpdGVyLT5zZyk7CisJCQlpdGVyLT5tYXgg PSBpdGVyLT5kbWEgKyBpdGVyLT5zZy0+bGVuZ3RoOworCQl9CisKKwkJaWR4LT5wdGUgKz0gMTY7 CisKKwkJaWYgKGlkeC0+cHRlID09IEdFTjhfUFRFUykgeworCQkJaWR4LT5wdGUgPSAwOworCisJ CQlpZiAoKytpZHgtPnBkZSA9PSBJOTE1X1BERVMpIHsKKwkJCQlpZHgtPnBkZSA9IDA7CisKKwkJ CQlpZiAoKytpZHgtPnBkcGUgPT0gR0VOOF9QTUw0RVNfUEVSX1BNTDQpIHsKKwkJCQkJaWR4LT5w ZHBlID0gMDsKKwkJCQkJcmV0ID0gdHJ1ZTsKKwkJCQkJYnJlYWs7CisJCQkJfQorCisJCQkJR0VN X0JVR19PTihpZHgtPnBkcGUgPj0gaTkxNV9wZHBlc19wZXJfcGRwKCZwcGd0dC0+YmFzZSkpOwor CQkJCXBkID0gcGRwLT5wYWdlX2RpcmVjdG9yeVtpZHgtPnBkcGVdOworCQkJfQorCisJCQlrdW5t YXBfYXRvbWljKHZhZGRyKTsKKwkJCXZhZGRyID0ga21hcF9hdG9taWNfcHgocGQpOworCQkJdmFk ZHJbaWR4LT5wZGVdIHw9IEdFTjhfUERFX0lQU182NEs7CisJCQlrdW5tYXBfYXRvbWljKHZhZGRy KTsKKworCQkJdmFkZHIgPSBrbWFwX2F0b21pY19weChwZC0+cGFnZV90YWJsZVtpZHgtPnBkZV0p OworCQl9CisJfSB3aGlsZSAoMSk7CisJa3VubWFwX2F0b21pYyh2YWRkcik7CisKKwltYXJrX3Rs YnNfZGlydHkocHBndHQpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIF9fYWx3YXlzX2lu bGluZSBib29sCiBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsCiAJCQkgICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVy ICpwZHAsCiAJCQkgICAgICBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKQEAgLTk1NCw2ICsxMDI1LDkg QEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKIAljYXNlIEk5MTVfR1RUX1BBR0VfU0laRV80SzoKIAkJaW5zZXJ0X2VudHJp ZXMgPSBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllczsKIAkJYnJlYWs7CisJY2FzZSBJOTE1 X0dUVF9QQUdFX1NJWkVfNjRLOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhfcHBndHRfaW5zZXJ0 XzY0S19wdGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJTUlTU0lOR19DQVNFKHBh Z2Vfc2l6ZSk7CiAJCXJldHVybjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXgg NWEyYTM5MDdkMjY2Li4wNGQzN2M2MmMzZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oCkBAIC0xNDksNiArMTQ5LDggQEAgdHlwZWRlZiB1NjQgZ2VuOF9wcGd0dF9wbWw0ZV90Owog I2RlZmluZSBHRU44X1BQQVRfRUxMQ19PVkVSUklERQkJKDA8PDIpCiAjZGVmaW5lIEdFTjhfUFBB VChpLCB4KQkJCSgodTY0KSh4KSA8PCAoKGkpICogOCkpCiAKKyNkZWZpbmUgR0VOOF9QREVfSVBT XzY0SyBCSVQoMTEpCisKIHN0cnVjdCBzZ190YWJsZTsKIAogc3RydWN0IGludGVsX3JvdGF0aW9u X2luZm8gewotLSAKMi45LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=