From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 14/21] drm/i915: support 64K pages for the 48b PPGTT Date: Thu, 5 Oct 2017 16:19:08 +0100 Message-ID: <20171005151915.11151-15-matthew.auld@intel.com> References: <20171005151915.11151-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C95AE6E82E for ; Thu, 5 Oct 2017 15:19:43 +0000 (UTC) In-Reply-To: <20171005151915.11151-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 U3VwcG9ydCBpbnNlcnRpbmcgNjRLIHBhZ2VzIGludG8gdGhlIDQ4YiBQUEdUVC4KCnYyOiBjaGVj ayBmb3IgNjRLIHNjcmF0Y2gKCnYzOiB3ZSBzaG91bGQgb25seSBoYXZlIHRvIHJlLWFkanVzdCBt YXliZV82NEsgYXQgZXZlcnkgc2cgaW50ZXJ2YWwKClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVs ZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxh aHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAzMSArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaCB8ICA3ICsrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggN2VhZTZhYjhjNWZkLi4xMThhYWQ5 MDQ2OGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMDY5LDYgKzEwNjks NyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9odWdlX2VudHJpZXMoc3RydWN0IGk5 MTVfdm1hICp2bWEsCiAJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCA9 IHBkcHNbaWR4LnBtbDRlXTsKIAkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkID0gcGRw LT5wYWdlX2RpcmVjdG9yeVtpZHgucGRwZV07CiAJCXVuc2lnbmVkIGludCBwYWdlX3NpemU7CisJ CWJvb2wgbWF5YmVfNjRLID0gZmFsc2U7CiAJCWdlbjhfcHRlX3QgZW5jb2RlID0gcHRlX2VuY29k ZTsKIAkJZ2VuOF9wdGVfdCAqdmFkZHI7CiAJCXUxNiBpbmRleCwgbWF4OwpAQCAtMTA5MCw2ICsx MDkxLDEzIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2h1Z2VfZW50cmllcyhzdHJ1 Y3QgaTkxNV92bWEgKnZtYSwKIAkJCW1heCA9IEdFTjhfUFRFUzsKIAkJCXBhZ2Vfc2l6ZSA9IEk5 MTVfR1RUX1BBR0VfU0laRTsKIAorCQkJaWYgKCFpbmRleCAmJgorCQkJICAgIHZtYS0+cGFnZV9z aXplcy5zZyAmIEk5MTVfR1RUX1BBR0VfU0laRV82NEsgJiYKKwkJCSAgICBJU19BTElHTkVEKGl0 ZXItPmRtYSwgSTkxNV9HVFRfUEFHRV9TSVpFXzY0SykgJiYKKwkJCSAgICAoSVNfQUxJR05FRChy ZW0sIEk5MTVfR1RUX1BBR0VfU0laRV82NEspIHx8CisJCQkgICAgIHJlbSA+PSAobWF4IC0gaW5k ZXgpIDw8IFBBR0VfU0hJRlQpKQorCQkJCW1heWJlXzY0SyA9IHRydWU7CisKIAkJCXZhZGRyID0g a21hcF9hdG9taWNfcHgocHQpOwogCQl9CiAKQEAgLTExMDksMTIgKzExMTcsMzUgQEAgc3RhdGlj IHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfaHVnZV9lbnRyaWVzKHN0cnVjdCBpOTE1X3ZtYSAqdm1h LAogCQkJCWl0ZXItPmRtYSA9IHNnX2RtYV9hZGRyZXNzKGl0ZXItPnNnKTsKIAkJCQlpdGVyLT5t YXggPSBpdGVyLT5kbWEgKyByZW07CiAKKwkJCQlpZiAobWF5YmVfNjRLICYmIGluZGV4IDwgbWF4 ICYmCisJCQkJICAgICEoSVNfQUxJR05FRChpdGVyLT5kbWEsIEk5MTVfR1RUX1BBR0VfU0laRV82 NEspICYmCisJCQkJICAgICAgKElTX0FMSUdORUQocmVtLCBJOTE1X0dUVF9QQUdFX1NJWkVfNjRL KSB8fAorCQkJCSAgICAgICByZW0gPj0gKG1heCAtIGluZGV4KSA8PCBQQUdFX1NISUZUKSkpCisJ CQkJCW1heWJlXzY0SyA9IGZhbHNlOworCiAJCQkJaWYgKHVubGlrZWx5KCFJU19BTElHTkVEKGl0 ZXItPmRtYSwgcGFnZV9zaXplKSkpCiAJCQkJCWJyZWFrOwogCQkJfQogCQl9IHdoaWxlIChyZW0g Pj0gcGFnZV9zaXplICYmIGluZGV4IDwgbWF4KTsKIAogCQlrdW5tYXBfYXRvbWljKHZhZGRyKTsK KworCQkvKgorCQkgKiBJcyBpdCBzYWZlIHRvIG1hcmsgdGhlIDJNIGJsb2NrIGFzIDY0Sz8gLS0g RWl0aGVyIHdlIGhhdmUKKwkJICogZmlsbGVkIHdob2xlIHBhZ2UtdGFibGUgd2l0aCA2NEsgZW50 cmllcywgb3IgZmlsbGVkIHBhcnQgb2YKKwkJICogaXQgYW5kIGhhdmUgcmVhY2hlZCB0aGUgZW5k IG9mIHRoZSBzZyB0YWJsZSBhbmQgd2UgaGF2ZQorCQkgKiBlbm91Z2ggcGFkZGluZy4KKwkJICov CisJCWlmIChtYXliZV82NEsgJiYKKwkJICAgIChpbmRleCA9PSBtYXggfHwKKwkJICAgICAoaTkx NV92bV9oYXNfc2NyYXRjaF82NEsodm1hLT52bSkgJiYKKwkJICAgICAgIWl0ZXItPnNnICYmIElT X0FMSUdORUQodm1hLT5ub2RlLnN0YXJ0ICsKKwkJCQkJICAgICAgdm1hLT5ub2RlLnNpemUsCisJ CQkJCSAgICAgIEk5MTVfR1RUX1BBR0VfU0laRV8yTSkpKSkgeworCQkJdmFkZHIgPSBrbWFwX2F0 b21pY19weChwZCk7CisJCQl2YWRkcltpZHgucGRlXSB8PSBHRU44X1BERV9JUFNfNjRLOworCQkJ a3VubWFwX2F0b21pYyh2YWRkcik7CisJCX0KIAl9IHdoaWxlIChpdGVyLT5zZyk7CiB9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMGEzMWRjMzY5YzI4Li40NzVlNGNmMDQy YmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0xNTMsNiArMTUzLDcgQEAg dHlwZWRlZiB1NjQgZ2VuOF9wcGd0dF9wbWw0ZV90OwogI2RlZmluZSBHRU44X1BQQVRfR0VUX0FH RSh4KSAoKHgpICYgKDMgPDwgNCkpCiAjZGVmaW5lIENIVl9QUEFUX0dFVF9TTk9PUCh4KSAoKHgp ICYgKDEgPDwgNikpCiAKKyNkZWZpbmUgR0VOOF9QREVfSVBTXzY0SyBCSVQoMTEpCiAjZGVmaW5l IEdFTjhfUERFX1BTXzJNICAgQklUKDcpCiAKIHN0cnVjdCBzZ190YWJsZTsKQEAgLTM1MSw2ICsz NTIsMTIgQEAgaTkxNV92bV9pc180OGJpdChjb25zdCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSkKIAlyZXR1cm4gKHZtLT50b3RhbCAtIDEpID4+IDMyOwogfQogCitzdGF0aWMgaW5saW5l IGJvb2wKK2k5MTVfdm1faGFzX3NjcmF0Y2hfNjRLKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtKQoreworCXJldHVybiB2bS0+c2NyYXRjaF9wYWdlLm9yZGVyID09IGdldF9vcmRlcihJOTE1 X0dUVF9QQUdFX1NJWkVfNjRLKTsKK30KKwogLyogVGhlIEdyYXBoaWNzIFRyYW5zbGF0aW9uIFRh YmxlIGlzIHRoZSB3YXkgaW4gd2hpY2ggR0VOIGhhcmR3YXJlIHRyYW5zbGF0ZXMgYQogICogR3Jh cGhpY3MgVmlydHVhbCBBZGRyZXNzIGludG8gYSBQaHlzaWNhbCBBZGRyZXNzLiBJbiBhZGRpdGlv biB0byB0aGUgbm9ybWFsCiAgKiBjb2xsYXRlcmFsIGFzc29jaWF0ZWQgd2l0aCBhbnkgdmEtPnBh IHRyYW5zbGF0aW9ucyBHRU4gaGFyZHdhcmUgYWxzbyBoYXMgYQotLSAKMi4xMy41CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK