From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 12/15] drm/i915: support inserting 2M pages in the ppgtt Date: Mon, 6 Mar 2017 23:54:11 +0000 Message-ID: <20170306235414.23407-13-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 B15736E592 for ; Mon, 6 Mar 2017 23:54:29 +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 IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNTMgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDRkODYzZGU2NDczZC4uZjcxYTYz MjBhZTFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtODQ4LDYgKzg0OCw1 NiBAQCBzdGF0aWMgX19hbHdheXNfaW5saW5lIHN0cnVjdCBnZW44X2luc2VydF9wdGUgZ2VuOF9p bnNlcnRfcHRlKHU2NCBzdGFydCkKIH0KIAogc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sCitn ZW44X3BwZ3R0X2luc2VydF8yTV9wZGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQsCisJCQkJIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKKwkJCQkg c3RydWN0IHNndF9kbWEgKml0ZXIsCisJCQkJIHN0cnVjdCBnZW44X2luc2VydF9wdGUgKmlkeCwK KwkJCQkgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsKQoreworCWNvbnN0IGdlbjhf cHRlX3QgcGRlX2VuY29kZSA9IGdlbjhfcHRlX2VuY29kZShHRU44X1BERV9QU18yTSwKKwkJCQkJ CSAgICAgIGNhY2hlX2xldmVsKTsKKwlnZW44X3B0ZV90ICp2YWRkcjsKKwlib29sIHJldDsKKwor CUdFTV9CVUdfT04oaWR4LT5wdGUpOworCUdFTV9CVUdfT04oaWR4LT5wZHBlID49IGk5MTVfcGRw ZXNfcGVyX3BkcCgmcHBndHQtPmJhc2UpKTsKKwl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkcC0+ cGFnZV9kaXJlY3RvcnlbaWR4LT5wZHBlXSk7CisJZG8geworCQl2YWRkcltpZHgtPnBkZV0gPSBw ZGVfZW5jb2RlIHwgaXRlci0+ZG1hOworCQlpdGVyLT5kbWEgKz0gSTkxNV9HVFRfUEFHRV9TSVpF XzJNOworCQlpZiAoaXRlci0+ZG1hID49IGl0ZXItPm1heCkgeworCQkJaXRlci0+c2cgPSBfX3Nn X25leHQoaXRlci0+c2cpOworCQkJaWYgKCFpdGVyLT5zZykgeworCQkJCXJldCA9IGZhbHNlOwor CQkJCWJyZWFrOworCQkJfQorCisJCQlpdGVyLT5kbWEgPSBzZ19kbWFfYWRkcmVzcyhpdGVyLT5z Zyk7CisJCQlpdGVyLT5tYXggPSBpdGVyLT5kbWEgKyBpdGVyLT5zZy0+bGVuZ3RoOworCQl9CisK KwkJaWYgKCsraWR4LT5wZGUgPT0gSTkxNV9QREVTKSB7CisJCQlpZHgtPnBkZSA9IDA7CisKKwkJ CWlmICgrK2lkeC0+cGRwZSA9PSBHRU44X1BNTDRFU19QRVJfUE1MNCkgeworCQkJCWlkeC0+cGRw ZSA9IDA7CisJCQkJcmV0ID0gdHJ1ZTsKKwkJCQlicmVhazsKKwkJCX0KKworCQkJa3VubWFwX2F0 b21pYyh2YWRkcik7CisJCQl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkcC0+cGFnZV9kaXJlY3Rv cnlbaWR4LT5wZHBlXSk7CisJCX0KKworCX0gd2hpbGUgKDEpOworCWt1bm1hcF9hdG9taWModmFk ZHIpOworCisJbWFya190bGJzX2RpcnR5KHBwZ3R0KTsKKworCXJldHVybiByZXQ7Cit9CisKK3N0 YXRpYyBfX2Fsd2F5c19pbmxpbmUgYm9vbAogZ2VuOF9wcGd0dF9pbnNlcnRfNjRLX3B0ZV9lbnRy aWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkgIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKIAkJCQkgIHN0cnVjdCBzZ3RfZG1hICppdGVyLApAQCAt MTAxNyw2ICsxMDY3LDkgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAljYXNlIEk5MTVfR1RUX1BBR0VfU0laRV82NEs6 CiAJCWluc2VydF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfNjRLX3B0ZV9lbnRyaWVzOwog CQlicmVhazsKKwljYXNlIEk5MTVfR1RUX1BBR0VfU0laRV8yTToKKwkJaW5zZXJ0X2VudHJpZXMg PSBnZW44X3BwZ3R0X2luc2VydF8yTV9wZGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoK IAkJTUlTU0lOR19DQVNFKHBhZ2Vfc2l6ZSk7CiAJCXJldHVybjsKLS0gCjIuOS4zCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK