From: Michel Thierry Subject: [PATCH v3 18/25] drm/i915/bdw: pagetable allocation rework Date: Tue, 13 Jan 2015 11:52:32 +0000 Message-ID: <1421149959-30383-19-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 8E2766E5D9 for ; Tue, 13 Jan 2015 03:52:31 -0800 (PST) In-Reply-To: <1421149959-30383-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 aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDM3Nzk2NTMuLjFhMDcwYjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC02MDIsMTQgKzYwMiw2IEBAIHN0 YXRpYyB2b2lkIGdlbjhfdGVhcmRvd25fdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJfQogfQogCi0vKiBUaGlzIGZ1bmN0aW9uIHdpbGwgZGllIHNvb24gKi8KLXN0YXRp YyB2b2lkIGdlbjhfZnJlZV9mdWxsX3BhZ2VfZGlyZWN0b3J5KHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCwgaW50IGkpCi17Ci0JZ2VuOF90ZWFyZG93bl92YV9yYW5nZSgmcHBndHQtPmJhc2Us Ci0JCQkgICAgICAgaSA8PCBHRU44X1BEUEVfU0hJRlQsCi0JCQkgICAgICAgKDEgPDwgR0VOOF9Q RFBFX1NISUZUKSk7Ci19Ci0KIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfdW5tYXBfcGFnZXMoc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewogCXN0cnVjdCBwY2lfZGV2ICpod2RldiA9IHBw Z3R0LT5iYXNlLmRldi0+cGRldjsKQEAgLTY1MywyMiArNjQ1LDI3IEBAIHN0YXRpYyB2b2lkIGdl bjhfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAlnZW44X3Bw Z3R0X2ZyZWUocHBndHQpOwogfQogCi1zdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFn ZV90YWJsZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQorc3RhdGljIGludCBnZW44X3Bw Z3R0X2FsbG9jX3BhZ2V0YWJzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCwK KwkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgICAgdWludDY0X3QgbGVuZ3RoLAorCQkJ CSAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKLQlpbnQgaSwgcmV0OworCXN0cnVjdCBp OTE1X3BhZ2VfdGFibGVfZW50cnkgKnVudXNlZDsKKwl1aW50NjRfdCB0ZW1wOworCXVpbnQzMl90 IHBkZTsKIAotCWZvciAoaSA9IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKLQkJ cmV0ID0gYWxsb2NfcHRfcmFuZ2UocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSwKLQkJCQkg ICAgIDAsIEdFTjhfUERFU19QRVJfUEFHRSwgcHBndHQtPmJhc2UuZGV2KTsKLQkJaWYgKHJldCkK KwlnZW44X2Zvcl9lYWNoX3BkZSh1bnVzZWQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUp IHsKKwkJQlVHX09OKHVudXNlZCk7CisJCXBkLT5wYWdlX3RhYmxlc1twZGVdID0gYWxsb2NfcHRf c2luZ2xlKGRldik7CisJCWlmIChJU19FUlIocGQtPnBhZ2VfdGFibGVzW3BkZV0pKQogCQkJZ290 byB1bndpbmRfb3V0OwogCX0KIAogCXJldHVybiAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChp LS0pCi0JCWdlbjhfZnJlZV9mdWxsX3BhZ2VfZGlyZWN0b3J5KHBwZ3R0LCBpKTsKKwl3aGlsZSAo cGRlLS0pCisJCXVubWFwX2FuZF9mcmVlX3B0KHBkLT5wYWdlX3RhYmxlc1twZGVdLCBkZXYpOwog CiAJcmV0dXJuIC1FTk9NRU07CiB9CkBAIC03MTEsMjAgKzcwOCwyOCBAQCB1bndpbmRfb3V0Ogog fQogCiBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LAotCQkJICAgIGNvbnN0IGludCBtYXhfcGRwKQorCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAor CQkJICAgIHVpbnQ2NF90IGxlbmd0aCkKIHsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9l bnRyeSAqcGQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJfdCBwZHBlOwogCWludCByZXQ7CiAK LQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoJnBwZ3R0LT5wZHAsIHBw Z3R0LT5iYXNlLnN0YXJ0LAotCQkJCQlwcGd0dC0+YmFzZS50b3RhbCk7CisJcmV0ID0gZ2VuOF9w cGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKCZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsK IAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9w YWdlX3RhYmxlcyhwcGd0dCk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfb3V0OworCWdlbjhfZm9y X2VhY2hfcGRwZShwZCwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsK KwkJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhwZCwgc3RhcnQsIGxlbmd0aCwKKwkJ CQkJCXBwZ3R0LT5iYXNlLmRldik7CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl9vdXQ7CisKKwkJ cHBndHQtPm51bV9wZF9lbnRyaWVzICs9IEdFTjhfUERFU19QRVJfUEFHRTsKKwl9CiAKLQlwcGd0 dC0+bnVtX3BkX2VudHJpZXMgPSBtYXhfcGRwICogR0VOOF9QREVTX1BFUl9QQUdFOworCUJVR19P TihwZHBlID4gcHBndHQtPm51bV9wZF9wYWdlcyk7CiAKIAlyZXR1cm4gMDsKIApAQCAtNzk1LDEw ICs4MDAsOSBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiAKIAlwcGd0dC0+YmFzZS5zdGFydCA9IDA7CiAJcHBn dHQtPmJhc2UudG90YWwgPSBzaXplOwotCUJVR19PTihwcGd0dC0+YmFzZS50b3RhbCA9PSAwKTsK IAogCS8qIDEuIERvIGFsbCBvdXIgYWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5k IHBhZ2UgdGFibGVzLiAqLwotCXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIG1heF9wZHAp OworCXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0 dC0+YmFzZS50b3RhbCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaAppbmRleCBjODJhMDI5Li5mNDE2ZTAxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaApAQCAtNDAxLDYgKzQwMSwxNiBAQCBzdGF0aWMgaW5saW5lIHVpbnQz Ml90IGdlbjZfcGRlX2luZGV4KHVpbnQzMl90IGFkZHIpCiAJICAgICB0ZW1wID0gbWluKHRlbXAs IGxlbmd0aCksCQkJCQlcCiAJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKIAor LyogQ2xhbXAgbGVuZ3RoIHRvIHRoZSBuZXh0IHBhZ2V0YWIgYm91bmRhcnkgKi8KK3N0YXRpYyBp bmxpbmUgdWludDY0X3QgZ2VuOF9jbGFtcF9wdCh1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVu Z3RoKQoreworCXVpbnQ2NF90IG5leHRfcHQgPSBBTElHTihzdGFydCArIDEsIDEgPDwgR0VOOF9Q REVfU0hJRlQpOworCWlmIChuZXh0X3B0ID4gKHN0YXJ0ICsgbGVuZ3RoKSkKKwkJcmV0dXJuIGxl bmd0aDsKKworCXJldHVybiBuZXh0X3B0IC0gc3RhcnQ7Cit9CisKIC8qIENsYW1wIGxlbmd0aCB0 byB0aGUgbmV4dCBwYWdlX2RpcmVjdG9yeSBib3VuZGFyeSAqLwogc3RhdGljIGlubGluZSB1aW50 NjRfdCBnZW44X2NsYW1wX3BkKHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgpCiB7Ci0t IAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK