From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 12/17] drm/i915: support inserting 2M pages into the 48b PPGTT Date: Tue, 16 May 2017 09:29:43 +0100 Message-ID: <20170516082948.28090-13-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 6C5366E2DC for ; Tue, 16 May 2017 08:30:10 +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 VG8gZW5hYmxlIDJNIHBhZ2VzIHdlIHNldCB0aGUgUFMgYml0IG9mIFBERSwgYWthIFBERVs3XSB0 byBpbmRpY2F0ZSBhIDJNCnBhZ2UgYW5kIG5vdCBhIHBhZ2UtdGFibGUuCgpTaWduZWQtb2ZmLWJ5 OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGlu ZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA1MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICAxICsKIDIgZmls ZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKaW5kZXggODc0ODU0ZTc3MjQ3Li4zZGFkYjUwMWRhYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC04NTQsNiArODU0LDU2IEBAIHN0YXRpYyBfX2Fsd2F5c19pbmxpbmUg c3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBnZW44X2luc2VydF9wdGUodTY0IHN0YXJ0KQogfQogCiBz dGF0aWMgX19hbHdheXNfaW5saW5lIGJvb2wKK2dlbjhfcHBndHRfaW5zZXJ0XzJNX3BkZV9lbnRy aWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKKwkJCQkgc3RydWN0IGk5MTVfcGFnZV9k aXJlY3RvcnlfcG9pbnRlciAqcGRwLAorCQkJCSBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKKwkJCQkg c3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSAqaWR4LAorCQkJCSBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwg Y2FjaGVfbGV2ZWwpCit7CisJY29uc3QgZ2VuOF9wdGVfdCBwZGVfZW5jb2RlID0gZ2VuOF9wdGVf ZW5jb2RlKEdFTjhfUERFX1BTXzJNLAorCQkJCQkJICAgICAgY2FjaGVfbGV2ZWwpOworCWdlbjhf cHRlX3QgKnZhZGRyOworCWJvb2wgcmV0OworCisJR0VNX0JVR19PTihpZHgtPnB0ZSk7CisJR0VN X0JVR19PTihpZHgtPnBkcGUgPj0gaTkxNV9wZHBlc19wZXJfcGRwKCZwcGd0dC0+YmFzZSkpOwor CXZhZGRyID0ga21hcF9hdG9taWNfcHgocGRwLT5wYWdlX2RpcmVjdG9yeVtpZHgtPnBkcGVdKTsK KwlkbyB7CisJCXZhZGRyW2lkeC0+cGRlXSA9IHBkZV9lbmNvZGUgfCBpdGVyLT5kbWE7CisJCWl0 ZXItPmRtYSArPSBJOTE1X0dUVF9QQUdFX1NJWkVfMk07CisJCWlmIChpdGVyLT5kbWEgPj0gaXRl ci0+bWF4KSB7CisJCQlpdGVyLT5zZyA9IF9fc2dfbmV4dChpdGVyLT5zZyk7CisJCQlpZiAoIWl0 ZXItPnNnKSB7CisJCQkJcmV0ID0gZmFsc2U7CisJCQkJYnJlYWs7CisJCQl9CisKKwkJCWl0ZXIt PmRtYSA9IHNnX2RtYV9hZGRyZXNzKGl0ZXItPnNnKTsKKwkJCWl0ZXItPm1heCA9IGl0ZXItPmRt YSArIGl0ZXItPnNnLT5sZW5ndGg7CisJCX0KKworCQlpZiAoKytpZHgtPnBkZSA9PSBJOTE1X1BE RVMpIHsKKwkJCWlkeC0+cGRlID0gMDsKKworCQkJaWYgKCsraWR4LT5wZHBlID09IEdFTjhfUE1M NEVTX1BFUl9QTUw0KSB7CisJCQkJaWR4LT5wZHBlID0gMDsKKwkJCQlyZXQgPSB0cnVlOworCQkJ CWJyZWFrOworCQkJfQorCisJCQlrdW5tYXBfYXRvbWljKHZhZGRyKTsKKwkJCXZhZGRyID0ga21h cF9hdG9taWNfcHgocGRwLT5wYWdlX2RpcmVjdG9yeVtpZHgtPnBkcGVdKTsKKwkJfQorCisJfSB3 aGlsZSAoMSk7CisJa3VubWFwX2F0b21pYyh2YWRkcik7CisKKwltYXJrX3RsYnNfZGlydHkocHBn dHQpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sCiBn ZW44X3BwZ3R0X2luc2VydF82NEtfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LAogCQkJCSAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAogCQkJ CSAgc3RydWN0IHNndF9kbWEgKml0ZXIsCkBAIC0xMDI4LDYgKzEwNzgsOSBAQCBzdGF0aWMgdm9p ZCBnZW44X3BwZ3R0X2luc2VydF80bHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CWNhc2UgSTkxNV9HVFRfUEFHRV9TSVpFXzY0SzoKIAkJaW5zZXJ0X2VudHJpZXMgPSBnZW44X3Bw Z3R0X2luc2VydF82NEtfcHRlX2VudHJpZXM7CiAJCWJyZWFrOworCWNhc2UgSTkxNV9HVFRfUEFH RV9TSVpFXzJNOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhfcHBndHRfaW5zZXJ0XzJNX3BkZV9l bnRyaWVzOworCQlicmVhazsKIAlkZWZhdWx0OgogCQlNSVNTSU5HX0NBU0UocGFnZV9zaXplKTsK IAkJcmV0dXJuOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCAwNGQzN2M2MmMz ZWYuLjg0MGQwOGJlOGZhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTE1 MCw2ICsxNTAsNyBAQCB0eXBlZGVmIHU2NCBnZW44X3BwZ3R0X3BtbDRlX3Q7CiAjZGVmaW5lIEdF TjhfUFBBVChpLCB4KQkJCSgodTY0KSh4KSA8PCAoKGkpICogOCkpCiAKICNkZWZpbmUgR0VOOF9Q REVfSVBTXzY0SyBCSVQoMTEpCisjZGVmaW5lIEdFTjhfUERFX1BTXzJNICAgQklUKDcpCiAKIHN0 cnVjdCBzZ190YWJsZTsKIAotLSAKMi45LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=