From: Michel Thierry Subject: [PATCH v2 17/24] drm/i915/bdw: pagetable allocation rework Date: Tue, 23 Dec 2014 17:16:20 +0000 Message-ID: <1419354987-4622-18-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E2C86E4F0 for ; Tue, 23 Dec 2014 09:16:27 -0800 (PST) In-Reply-To: <1419354987-4622-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 c2luZyBnZW44X2Zvcl9lYWNoX3BkZSBtYWNybyB0byBhbGxvY2F0ZSBwYWdlIHRhYmxlcy4KClNp Z25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1i eTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDU0ICsrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgMTAg KysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGU3NTlhMDMuLmY5MjhjMTAg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC02MDEsMTQgKzYwMSw2IEBAIHN0 YXRpYyB2b2lkIGdlbjhfdGVhcmRvd25fdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJfQogfQogCi0vKiBUaGlzIGZ1bmN0aW9uIHdpbGwgZGllIHNvb24gKi8KLXN0YXRp YyB2b2lkIGdlbjhfZnJlZV9mdWxsX3BhZ2VkaXIoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LCBpbnQgaSkKLXsKLQlnZW44X3RlYXJkb3duX3ZhX3JhbmdlKCZwcGd0dC0+YmFzZSwKLQkJCSAg ICAgICBpIDw8IEdFTjhfUERQRV9TSElGVCwKLQkJCSAgICAgICAoMSA8PCBHRU44X1BEUEVfU0hJ RlQpKTsKLX0KLQogc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQpCiB7CiAJc3RydWN0IHBjaV9kZXYgKmh3ZGV2ID0gcHBndHQtPmJh c2UuZGV2LT5wZGV2OwpAQCAtNjUyLDIyICs2NDQsMjcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0 dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCWdlbjhfcHBndHRfZnJl ZShwcGd0dCk7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxl cyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCitzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxs b2NfcGFnZXRhYnMoc3RydWN0IGk5MTVfcGFnZWRpciAqcGQsCisJCQkJICAgICB1aW50NjRfdCBz dGFydCwKKwkJCQkgICAgIHVpbnQ2NF90IGxlbmd0aCwKKwkJCQkgICAgIHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB7Ci0JaW50IGksIHJldDsKKwlzdHJ1Y3QgaTkxNV9wYWdldGFiICp1bnVzZWQ7 CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJfdCBwZGU7CiAKLQlmb3IgKGkgPSAwOyBpIDwgcHBn dHQtPm51bV9wZF9wYWdlczsgaSsrKSB7Ci0JCXJldCA9IGFsbG9jX3B0X3JhbmdlKHBwZ3R0LT5w ZHAucGFnZWRpcltpXSwKLQkJCQkgICAgIDAsIEdFTjhfUERFU19QRVJfUEFHRSwgcHBndHQtPmJh c2UuZGV2KTsKLQkJaWYgKHJldCkKKwlnZW44X2Zvcl9lYWNoX3BkZSh1bnVzZWQsIHBkLCBzdGFy dCwgbGVuZ3RoLCB0ZW1wLCBwZGUpIHsKKwkJQlVHX09OKHVudXNlZCk7CisJCXBkLT5wYWdlX3Rh Ymxlc1twZGVdID0gYWxsb2NfcHRfc2luZ2xlKGRldik7CisJCWlmIChJU19FUlIocGQtPnBhZ2Vf dGFibGVzW3BkZV0pKQogCQkJZ290byB1bndpbmRfb3V0OwogCX0KIAogCXJldHVybiAwOwogCiB1 bndpbmRfb3V0OgotCXdoaWxlIChpLS0pCi0JCWdlbjhfZnJlZV9mdWxsX3BhZ2VkaXIocHBndHQs IGkpOworCXdoaWxlIChwZGUtLSkKKwkJZnJlZV9wdF9zaW5nbGUocGQtPnBhZ2VfdGFibGVzW3Bk ZV0sIGRldik7CiAKIAlyZXR1cm4gLUVOT01FTTsKIH0KQEAgLTcxMCwyMCArNzA3LDI4IEBAIHVu d2luZF9vdXQ6CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvYyhzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQsCi0JCQkgICAgY29uc3QgaW50IG1heF9wZHApCisJCQkgICAgdWludDY0 X3Qgc3RhcnQsCisJCQkgICAgdWludDY0X3QgbGVuZ3RoKQogeworCXN0cnVjdCBpOTE1X3BhZ2Vk aXIgKnBkOworCXVpbnQ2NF90IHRlbXA7CisJdWludDMyX3QgcGRwZTsKIAlpbnQgcmV0OwogCi0J cmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlZGlycygmcHBndHQtPnBkcCwgcHBndHQtPmJhc2Uu c3RhcnQsCi0JCQkJCXBwZ3R0LT5iYXNlLnRvdGFsKTsKKwlyZXQgPSBnZW44X3BwZ3R0X2FsbG9j X3BhZ2VkaXJzKCZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhwcGd0dCk7 Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfb3V0OworCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBw Z3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJcmV0ID0gZ2VuOF9wcGd0 dF9hbGxvY19wYWdldGFicyhwZCwgc3RhcnQsIGxlbmd0aCwKKwkJCQkJCXBwZ3R0LT5iYXNlLmRl dik7CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl9vdXQ7CisKKwkJcHBndHQtPm51bV9wZF9lbnRy aWVzICs9IEdFTjhfUERFU19QRVJfUEFHRTsKKwl9CiAKLQlwcGd0dC0+bnVtX3BkX2VudHJpZXMg PSBtYXhfcGRwICogR0VOOF9QREVTX1BFUl9QQUdFOworCUJVR19PTihwZHBlID4gcHBndHQtPm51 bV9wZF9wYWdlcyk7CiAKIAlyZXR1cm4gMDsKIApAQCAtNzk0LDEwICs3OTksOSBAQCBzdGF0aWMg aW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90 IHNpemUpCiAKIAlwcGd0dC0+YmFzZS5zdGFydCA9IDA7CiAJcHBndHQtPmJhc2UudG90YWwgPSBz aXplOwotCUJVR19PTihwcGd0dC0+YmFzZS50b3RhbCA9PSAwKTsKIAogCS8qIDEuIERvIGFsbCBv dXIgYWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLiAqLwot CXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIG1heF9wZHApOworCXJldCA9IGdlbjhfcHBn dHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0dC0+YmFzZS50b3RhbCk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApp bmRleCA5NjIwOWMyLi43NDgzN2EzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApA QCAtNDAzLDYgKzQwMywxNiBAQCBzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdlbjZfcGRlX2luZGV4 KHVpbnQzMl90IGFkZHIpCiAJICAgICB0ZW1wID0gbWluKHRlbXAsIGxlbmd0aCksCQkJCQlcCiAJ ICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKIAorLyogQ2xhbXAgbGVuZ3RoIHRv IHRoZSBuZXh0IHBhZ2V0YWIgYm91bmRhcnkgKi8KK3N0YXRpYyBpbmxpbmUgdWludDY0X3QgZ2Vu OF9jbGFtcF9wdCh1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQoreworCXVpbnQ2NF90 IG5leHRfcHQgPSBBTElHTihzdGFydCArIDEsIDEgPDwgR0VOOF9QREVfU0hJRlQpOworCWlmIChu ZXh0X3B0ID4gKHN0YXJ0ICsgbGVuZ3RoKSkKKwkJcmV0dXJuIGxlbmd0aDsKKworCXJldHVybiBu ZXh0X3B0IC0gc3RhcnQ7Cit9CisKIC8qIENsYW1wIGxlbmd0aCB0byB0aGUgbmV4dCBwYWdlZGly IGJvdW5kYXJ5ICovCiBzdGF0aWMgaW5saW5lIHVpbnQ2NF90IGdlbjhfY2xhbXBfcGQodWludDY0 X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=