From: Michel Thierry Subject: [PATCH v4 16/24] drm/i915/bdw: page directories rework allocation Date: Thu, 22 Jan 2015 17:01:38 +0000 Message-ID: <1421946106-7921-17-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A2AB720A3 for ; Thu, 22 Jan 2015 09:01:41 -0800 (PST) In-Reply-To: <1421946106-7921-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 b3JpZXMuCgp2MjogUmViYXNlZCBhZnRlciBzL2ZyZWVfcHRfKi91bm1hcF9hbmRfZnJlZV9wdC8g Y2hhbmdlLgp2MzogUmViYXNlZCBhZnRlciB0ZWFyZG93biB2YSByYW5nZSBsb2dpYyB3YXMgcmVt b3ZlZC4KClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2ln bmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYy KykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDQzICsrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRp b25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmlu ZGV4IDU2ZGIxMzIuLjViNmI2NjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBA IC02NzgsMjUgKzY3OCwzOSBAQCB1bndpbmRfb3V0OgogCXJldHVybiAtRU5PTUVNOwogfQogCi1z dGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQsCi0JCQkJCQljb25zdCBpbnQgbWF4X3BkcCkKK3N0YXRpYyBpbnQg Z2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0 b3J5X3BvaW50ZXJfZW50cnkgKnBkcCwKKwkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAg ICAgdWludDY0X3QgbGVuZ3RoKQogewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IG1heF9w ZHA7IGkrKykgewotCQlwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldID0gYWxsb2NfcGRfc2lu Z2xlKCk7Ci0JCWlmIChJU19FUlIocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSkpCisJc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KKwkJY29udGFpbmVyX29mKHBkcCwgc3RydWN0IGk5 MTVfaHdfcHBndHQsIHBkcCk7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKnVu dXNlZDsKKwl1aW50NjRfdCB0ZW1wOworCXVpbnQzMl90IHBkcGU7CisKKwkvKiBGSVhNRTogUFBH VFQgY29udGFpbmVyX29mIHdvbid0IHdvcmsgZm9yIDY0YiAqLworCUJVR19PTigoc3RhcnQgKyBs ZW5ndGgpID4gMHg4MDAwMDAwMDBVTEwpOworCisJZ2VuOF9mb3JfZWFjaF9wZHBlKHVudXNlZCwg cGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CisJCUJVR19PTih1bnVzZWQpOworCQlw ZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdID0gYWxsb2NfcGRfc2luZ2xlKCk7CisJCWlmIChJU19F UlIocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXSkpCiAJCQlnb3RvIHVud2luZF9vdXQ7 CisKKwkJcHBndHQtPm51bV9wZF9wYWdlcysrOwogCX0KIAotCXBwZ3R0LT5udW1fcGRfcGFnZXMg PSBtYXhfcGRwOwogCUJVR19PTihwcGd0dC0+bnVtX3BkX3BhZ2VzID4gR0VOOF9MRUdBQ1lfUERQ RVMpOwogCiAJcmV0dXJuIDA7CiAKIHVud2luZF9vdXQ6Ci0Jd2hpbGUgKGktLSkKLQkJdW5tYXBf YW5kX2ZyZWVfcGQocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7CisJd2hpbGUgKHBkcGUt LSkgeworCQl1bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVd KTsKKwkJcHBndHQtPm51bV9wZF9wYWdlcy0tOworCX0KKworCVdBUk5fT04ocHBndHQtPm51bV9w ZF9wYWdlcyk7CiAKIAlyZXR1cm4gLUVOT01FTTsKIH0KQEAgLTcwNiw3ICs3MjAsOCBAQCBzdGF0 aWMgaW50IGdlbjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogewog CWludCByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfZGlyZWN0b3JpZXMo cHBndHQsIG1heF9wZHApOworCXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmll cygmcHBndHQtPnBkcCwgcHBndHQtPmJhc2Uuc3RhcnQsCisJCQkJCXBwZ3R0LT5iYXNlLnRvdGFs KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC03ODMsNiArNzk4LDEwIEBAIHN0YXRp YyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0 X3Qgc2l6ZSkKIAlpZiAoc2l6ZSAlICgxPDwzMCkpCiAJCURSTV9JTkZPKCJQYWdlcyB3aWxsIGJl IHdhc3RlZCB1bmxlc3MgR1RUIHNpemUgKCVsbHUpIGlzIGRpdmlzaWJsZSBieSAxR0JcbiIsIHNp emUpOwogCisJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOworCXBwZ3R0LT5iYXNlLnRvdGFsID0gc2l6 ZTsKKwlCVUdfT04ocHBndHQtPmJhc2UudG90YWwgPT0gMCk7CisKIAkvKiAxLiBEbyBhbGwgb3Vy IGFsbG9jYXRpb25zIGZvciBwYWdlIGRpcmVjdG9yaWVzIGFuZCBwYWdlIHRhYmxlcy4gKi8KIAly ZXQgPSBnZW44X3BwZ3R0X2FsbG9jKHBwZ3R0LCBtYXhfcGRwKTsKIAlpZiAocmV0KQpAQCAtODMw LDggKzg0OSw2IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdl bjhfcHBndHRfY2xlYXJfcmFuZ2U7CiAJcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44 X3BwZ3R0X2luc2VydF9lbnRyaWVzOwogCXBwZ3R0LT5iYXNlLmNsZWFudXAgPSBnZW44X3BwZ3R0 X2NsZWFudXA7Ci0JcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwotCXBwZ3R0LT5iYXNlLnRvdGFsID0g cHBndHQtPm51bV9wZF9lbnRyaWVzICogR0VOOF9QVEVTX1BFUl9QQUdFICogUEFHRV9TSVpFOwog CiAJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UoJnBwZ3R0LT5iYXNlLCAwLCBwcGd0dC0+YmFzZS50 b3RhbCwgdHJ1ZSk7CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=