From: Michel Thierry Subject: [PATCH 16/24] drm/i915/bdw: pagedirs rework allocation Date: Thu, 18 Dec 2014 17:10:13 +0000 Message-ID: <1418922621-25818-17-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D86436EA4E for ; Thu, 18 Dec 2014 09:17:57 -0800 (PST) In-Reply-To: <1418922621-25818-1-git-send-email-michel.thierry@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 RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpTdGFydCB1 c2luZyBnZW44X2Zvcl9lYWNoX3BkcGUgbWFjcm8gdG8gYWxsb2NhdGUgdGhlIHBhZ2UgZGlyZWN0 b3JpZXMuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNp Z25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA0MyArKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygr KSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAw N2YwZDI0Li4yNzRiMjBmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNTk0 LDggKzU5NCwxMCBAQCBzdGF0aWMgdm9pZCBnZW44X3RlYXJkb3duX3ZhX3JhbmdlKHN0cnVjdCBp OTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQl1aW50NjRfdCBwZF9zdGFydCA9IHN0YXJ0OwogCQln ZW44X2Zvcl9lYWNoX3BkZShwdCwgcGQsIHBkX3N0YXJ0LCBwZF9sZW4sIHRlbXAsIHBkZSkgewog CQkJZnJlZV9wdF9zaW5nbGUocHQsIHZtLT5kZXYpOworCQkJcGQtPnBhZ2VfdGFibGVzW3BkZV0g PSBOVUxMOwogCQl9CiAJCWZyZWVfcGRfc2luZ2xlKHBkKTsKKwkJcHBndHQtPnBkcC5wYWdlZGly W3BkcGVdID0gTlVMTDsKIAl9CiB9CiAKQEAgLTY3MCwyNSArNjcyLDM5IEBAIHVud2luZF9vdXQ6 CiAJcmV0dXJuIC1FTk9NRU07CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9w YWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJCWNvbnN0 IGludCBtYXhfcGRwKQorc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VkaXJzKHN0cnVj dCBpOTE1X3BhZ2VkaXJwbyAqcGRwLAorCQkJCSAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAg ICB1aW50NjRfdCBsZW5ndGgpCiB7Ci0JaW50IGk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0ID0KKwkJY29udGFpbmVyX29mKHBkcCwgc3RydWN0IGk5MTVfaHdfcHBndHQsIHBkcCk7CisJ c3RydWN0IGk5MTVfcGFnZWRpciAqdW51c2VkOworCXVpbnQ2NF90IHRlbXA7CisJdWludDMyX3Qg cGRwZTsKIAotCWZvciAoaSA9IDA7IGkgPCBtYXhfcGRwOyBpKyspIHsKLQkJcHBndHQtPnBkcC5w YWdlZGlyW2ldID0gYWxsb2NfcGRfc2luZ2xlKCk7Ci0JCWlmIChJU19FUlIocHBndHQtPnBkcC5w YWdlZGlyW2ldKSkKKwkvKiBGSVhNRTogUFBHVFQgY29udGFpbmVyX29mIHdvbid0IHdvcmsgZm9y IDY0YiAqLworCUJVR19PTigoc3RhcnQgKyBsZW5ndGgpID4gMHg4MDAwMDAwMDBVTEwpOworCisJ Z2VuOF9mb3JfZWFjaF9wZHBlKHVudXNlZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBl KSB7CisJCUJVR19PTih1bnVzZWQpOworCQlwZHAtPnBhZ2VkaXJbcGRwZV0gPSBhbGxvY19wZF9z aW5nbGUoKTsKKwkJaWYgKElTX0VSUihwcGd0dC0+cGRwLnBhZ2VkaXJbcGRwZV0pKQogCQkJZ290 byB1bndpbmRfb3V0OworCisJCXBwZ3R0LT5udW1fcGRfcGFnZXMrKzsKIAl9CiAKLQlwcGd0dC0+ bnVtX3BkX3BhZ2VzID0gbWF4X3BkcDsKIAlCVUdfT04ocHBndHQtPm51bV9wZF9wYWdlcyA+IEdF TjhfTEVHQUNZX1BEUEVTKTsKIAogCXJldHVybiAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChp LS0pCi0JCWZyZWVfcGRfc2luZ2xlKHBwZ3R0LT5wZHAucGFnZWRpcltpXSk7CisJd2hpbGUgKHBk cGUtLSkgeworCQlmcmVlX3BkX3NpbmdsZShwcGd0dC0+cGRwLnBhZ2VkaXJbcGRwZV0pOworCQlw cGd0dC0+bnVtX3BkX3BhZ2VzLS07CisJfQorCisJV0FSTl9PTihwcGd0dC0+bnVtX3BkX3BhZ2Vz KTsKIAogCXJldHVybiAtRU5PTUVNOwogfQpAQCAtNjk4LDcgKzcxNCw4IEBAIHN0YXRpYyBpbnQg Z2VuOF9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiB7CiAJaW50IHJl dDsKIAotCXJldCA9IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhwcGd0dCwg bWF4X3BkcCk7CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlZGlycygmcHBndHQtPnBkcCwg cHBndHQtPmJhc2Uuc3RhcnQsCisJCQkJCXBwZ3R0LT5iYXNlLnRvdGFsKTsKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCkBAIC03NzUsNiArNzkyLDEwIEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0 dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAlpZiAo c2l6ZSAlICgxPDwzMCkpCiAJCURSTV9JTkZPKCJQYWdlcyB3aWxsIGJlIHdhc3RlZCB1bmxlc3Mg R1RUIHNpemUgKCVsbHUpIGlzIGRpdmlzaWJsZSBieSAxR0JcbiIsIHNpemUpOwogCisJcHBndHQt PmJhc2Uuc3RhcnQgPSAwOworCXBwZ3R0LT5iYXNlLnRvdGFsID0gc2l6ZTsKKwlCVUdfT04ocHBn dHQtPmJhc2UudG90YWwgPT0gMCk7CisKIAkvKiAxLiBEbyBhbGwgb3VyIGFsbG9jYXRpb25zIGZv ciBwYWdlIGRpcmVjdG9yaWVzIGFuZCBwYWdlIHRhYmxlcy4gKi8KIAlyZXQgPSBnZW44X3BwZ3R0 X2FsbG9jKHBwZ3R0LCBtYXhfcGRwKTsKIAlpZiAocmV0KQpAQCAtODIyLDggKzg0Myw2IEBAIHN0 YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWlu dDY0X3Qgc2l6ZSkKIAlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjhfcHBndHRfY2xlYXJf cmFuZ2U7CiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9l bnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW44X3BwZ3R0X2NsZWFudXA7Ci0JcHBn dHQtPmJhc2Uuc3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNlLnRvdGFsID0gcHBndHQtPm51bV9wZF9l bnRyaWVzICogR0VOOF9QVEVTX1BFUl9QQUdFICogUEFHRV9TSVpFOwogCiAJRFJNX0RFQlVHX0RS SVZFUigiQWxsb2NhdGVkICVkIHBhZ2VzIGZvciBwYWdlIGRpcmVjdG9yaWVzICglZCB3YXN0ZWQp XG4iLAogCQkJIHBwZ3R0LT5udW1fcGRfcGFnZXMsIHBwZ3R0LT5udW1fcGRfcGFnZXMgLSBtYXhf cGRwKTsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=