From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 11/15] drm/i915: support inserting 64K pages in the ppgtt Date: Mon, 6 Mar 2017 23:54:10 +0000 Message-ID: <20170306235414.23407-12-matthew.auld@intel.com> References: <20170306235414.23407-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 AD3CD6E58A for ; Mon, 6 Mar 2017 23:54:28 +0000 (UTC) In-Reply-To: <20170306235414.23407-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 U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNzAgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDcwIGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDBmYjY3OTQxYmE2Yi4uNGQ4NjNk ZTY0NzNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtODQ4LDYgKzg0OCw3 MyBAQCBzdGF0aWMgX19hbHdheXNfaW5saW5lIHN0cnVjdCBnZW44X2luc2VydF9wdGUgZ2VuOF9p bnNlcnRfcHRlKHU2NCBzdGFydCkKIH0KIAogc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sCitn ZW44X3BwZ3R0X2luc2VydF82NEtfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LAorCQkJCSAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAorCQkJ CSAgc3RydWN0IHNndF9kbWEgKml0ZXIsCisJCQkJICBzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlICpp ZHgsCisJCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwpCit7CisJc3RydWN0 IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkOworCWNvbnN0IGdlbjhfcHRlX3QgcHRlX2VuY29kZSA9 IGdlbjhfcHRlX2VuY29kZSgwLCBjYWNoZV9sZXZlbCk7CisJZ2VuOF9wdGVfdCAqdmFkZHI7CisJ Ym9vbCByZXQ7CisKKwlHRU1fQlVHX09OKGlkeC0+cHRlICUgMTYpOworCUdFTV9CVUdfT04oaWR4 LT5wZHBlID49IGk5MTVfcGRwZXNfcGVyX3BkcCgmcHBndHQtPmJhc2UpKTsKKwkvKiBUT0RPOiBw cm9iYWJseSBtb3ZlIHRoaXMgdG8gdGhlIGFsbG9jYXRpb24gcGhhc2UuLiAqLworCXBkID0gcGRw LT5wYWdlX2RpcmVjdG9yeVtpZHgtPnBkcGVdOworCXZhZGRyID0ga21hcF9hdG9taWNfcHgocGQp OworCXZhZGRyW2lkeC0+cGRlXSB8PSBHRU44X1BERV9JUFNfNjRLOworCWt1bm1hcF9hdG9taWMo dmFkZHIpOworCisJdmFkZHIgPSBrbWFwX2F0b21pY19weChwZC0+cGFnZV90YWJsZVtpZHgtPnBk ZV0pOworCWRvIHsKKwkJdmFkZHJbaWR4LT5wdGVdID0gcHRlX2VuY29kZSB8IGl0ZXItPmRtYTsK KwkJaXRlci0+ZG1hICs9IEk5MTVfR1RUX1BBR0VfU0laRV82NEs7CisJCWlmIChpdGVyLT5kbWEg Pj0gaXRlci0+bWF4KSB7CisJCQlpdGVyLT5zZyA9IF9fc2dfbmV4dChpdGVyLT5zZyk7CisJCQlp ZiAoIWl0ZXItPnNnKSB7CisJCQkJcmV0ID0gZmFsc2U7CisJCQkJYnJlYWs7CisJCQl9CisKKwkJ CWl0ZXItPmRtYSA9IHNnX2RtYV9hZGRyZXNzKGl0ZXItPnNnKTsKKwkJCWl0ZXItPm1heCA9IGl0 ZXItPmRtYSArIGl0ZXItPnNnLT5sZW5ndGg7CisJCX0KKworCQlpZHgtPnB0ZSArPSAxNjsKKwor CQlpZiAoaWR4LT5wdGUgPT0gR0VOOF9QVEVTKSB7CisJCQlpZHgtPnB0ZSA9IDA7CisKKwkJCWlm ICgrK2lkeC0+cGRlID09IEk5MTVfUERFUykgeworCQkJCWlkeC0+cGRlID0gMDsKKworCQkJCS8q IExpbWl0ZWQgYnkgc2cgbGVuZ3RoIGZvciAzbHZsICovCisJCQkJaWYgKCsraWR4LT5wZHBlID09 IEdFTjhfUE1MNEVTX1BFUl9QTUw0KSB7CisJCQkJCWlkeC0+cGRwZSA9IDA7CisJCQkJCXJldCA9 IHRydWU7CisJCQkJCWJyZWFrOworCQkJCX0KKworCQkJCUdFTV9CVUdfT04oaWR4LT5wZHBlID49 IGk5MTVfcGRwZXNfcGVyX3BkcCgmcHBndHQtPmJhc2UpKTsKKwkJCQlwZCA9IHBkcC0+cGFnZV9k aXJlY3RvcnlbaWR4LT5wZHBlXTsKKwkJCX0KKworCQkJa3VubWFwX2F0b21pYyh2YWRkcik7CisJ CQl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkKTsKKwkJCXZhZGRyW2lkeC0+cGRlXSB8PSBHRU44 X1BERV9JUFNfNjRLOworCQkJa3VubWFwX2F0b21pYyh2YWRkcik7CisKKwkJCXZhZGRyID0ga21h cF9hdG9taWNfcHgocGQtPnBhZ2VfdGFibGVbaWR4LT5wZGVdKTsKKwkJfQorCX0gd2hpbGUgKDEp OworCWt1bm1hcF9hdG9taWModmFkZHIpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIF9f YWx3YXlzX2lubGluZSBib29sCiBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyhzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsCiAJCQkgICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eV9wb2ludGVyICpwZHAsCiAJCQkgICAgICBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKQEAgLTk0Nyw2 ICsxMDE0LDkgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAljYXNlIEk5MTVfR1RUX1BBR0VfU0laRToKIAkJaW5zZXJ0 X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllczsKIAkJYnJlYWs7CisJY2Fz ZSBJOTE1X0dUVF9QQUdFX1NJWkVfNjRLOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhfcHBndHRf aW5zZXJ0XzY0S19wdGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJTUlTU0lOR19D QVNFKHBhZ2Vfc2l6ZSk7CiAJCXJldHVybjsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK