From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 10/18] drm/i915: support inserting 2M pages in the ppgtt Date: Tue, 4 Apr 2017 23:11:20 +0100 Message-ID: <20170404221128.3943-11-matthew.auld@intel.com> References: <20170404221128.3943-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 466E96E6E9 for ; Tue, 4 Apr 2017 22:11:41 +0000 (UTC) In-Reply-To: <20170404221128.3943-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 KysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggfCAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGZiODIyYzBiZDk3My4uOWRjMTI5NTVmNTU3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtODQ4LDYgKzg0OCw1NiBAQCBzdGF0aWMg X19hbHdheXNfaW5saW5lIHN0cnVjdCBnZW44X2luc2VydF9wdGUgZ2VuOF9pbnNlcnRfcHRlKHU2 NCBzdGFydCkKIH0KIAogc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sCitnZW44X3BwZ3R0X2lu c2VydF8yTV9wZGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkJIHN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKKwkJCQkgc3RydWN0IHNndF9k bWEgKml0ZXIsCisJCQkJIHN0cnVjdCBnZW44X2luc2VydF9wdGUgKmlkeCwKKwkJCQkgZW51bSBp OTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsKQoreworCWNvbnN0IGdlbjhfcHRlX3QgcGRlX2Vu Y29kZSA9IGdlbjhfcHRlX2VuY29kZShHRU44X1BERV9QU18yTSwKKwkJCQkJCSAgICAgIGNhY2hl X2xldmVsKTsKKwlnZW44X3B0ZV90ICp2YWRkcjsKKwlib29sIHJldDsKKworCUdFTV9CVUdfT04o aWR4LT5wdGUpOworCUdFTV9CVUdfT04oaWR4LT5wZHBlID49IGk5MTVfcGRwZXNfcGVyX3BkcCgm cHBndHQtPmJhc2UpKTsKKwl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkcC0+cGFnZV9kaXJlY3Rv cnlbaWR4LT5wZHBlXSk7CisJZG8geworCQl2YWRkcltpZHgtPnBkZV0gPSBwZGVfZW5jb2RlIHwg aXRlci0+ZG1hOworCQlpdGVyLT5kbWEgKz0gSTkxNV9HVFRfUEFHRV9TSVpFXzJNOworCQlpZiAo aXRlci0+ZG1hID49IGl0ZXItPm1heCkgeworCQkJaXRlci0+c2cgPSBfX3NnX25leHQoaXRlci0+ c2cpOworCQkJaWYgKCFpdGVyLT5zZykgeworCQkJCXJldCA9IGZhbHNlOworCQkJCWJyZWFrOwor CQkJfQorCisJCQlpdGVyLT5kbWEgPSBzZ19kbWFfYWRkcmVzcyhpdGVyLT5zZyk7CisJCQlpdGVy LT5tYXggPSBpdGVyLT5kbWEgKyBpdGVyLT5zZy0+bGVuZ3RoOworCQl9CisKKwkJaWYgKCsraWR4 LT5wZGUgPT0gSTkxNV9QREVTKSB7CisJCQlpZHgtPnBkZSA9IDA7CisKKwkJCWlmICgrK2lkeC0+ cGRwZSA9PSBHRU44X1BNTDRFU19QRVJfUE1MNCkgeworCQkJCWlkeC0+cGRwZSA9IDA7CisJCQkJ cmV0ID0gdHJ1ZTsKKwkJCQlicmVhazsKKwkJCX0KKworCQkJa3VubWFwX2F0b21pYyh2YWRkcik7 CisJCQl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkcC0+cGFnZV9kaXJlY3RvcnlbaWR4LT5wZHBl XSk7CisJCX0KKworCX0gd2hpbGUgKDEpOworCWt1bm1hcF9hdG9taWModmFkZHIpOworCisJbWFy a190bGJzX2RpcnR5KHBwZ3R0KTsKKworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBfX2Fsd2F5 c19pbmxpbmUgYm9vbAogZ2VuOF9wcGd0dF9pbnNlcnRfNjRLX3B0ZV9lbnRyaWVzKHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3Bv aW50ZXIgKnBkcCwKIAkJCQkgIHN0cnVjdCBzZ3RfZG1hICppdGVyLApAQCAtMTAxOCw2ICsxMDY4 LDkgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKIAljYXNlIEk5MTVfR1RUX1BBR0VfU0laRV82NEs6CiAJCWluc2VydF9l bnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfNjRLX3B0ZV9lbnRyaWVzOwogCQlicmVhazsKKwlj YXNlIEk5MTVfR1RUX1BBR0VfU0laRV8yTToKKwkJaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0 X2luc2VydF8yTV9wZGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJTUlTU0lOR19D QVNFKHBhZ2Vfc2l6ZSk7CiAJCXJldHVybjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgK aW5kZXggZDk0ODgwOGZjZjZhLi5jZmUzMWRiNmI0MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5oCkBAIC0xNTksNiArMTU5LDcgQEAgdHlwZWRlZiB1NjQgZ2VuOF9wcGd0dF9wbWw0 ZV90OwogI2RlZmluZSBHRU44X1BQQVQoaSwgeCkJCQkoKHU2NCkoeCkgPDwgKChpKSAqIDgpKQog CiAjZGVmaW5lIEdFTjhfUERFX0lQU182NEsgQklUKDExKQorI2RlZmluZSBHRU44X1BERV9QU18y TSAgIEJJVCg3KQogCiBzdHJ1Y3Qgc2dfdGFibGU7CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK