From: Michel Thierry Subject: [PATCH 09/16] drm/i915/gen8: Add 4 level support in insert_entries and clear_range Date: Tue, 26 May 2015 15:21:16 +0100 Message-ID: <1432650084-24491-10-git-send-email-michel.thierry@intel.com> References: <1432650084-24491-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B271B72073 for ; Tue, 26 May 2015 07:21:29 -0700 (PDT) In-Reply-To: <1432650084-24491-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 Cc: akash.goel@intel.com List-Id: intel-gfx@lists.freedesktop.org V2hlbiA0OGIgaXMgZW5hYmxlZCwgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyBuZWVkcyB0byBy ZWFkIHRoZSBQYWdlIE1hcApMZXZlbCA0IChQTUw0KSwgYmVmb3JlIGl0IHNlbGVjdHMgd2hpY2gg UGFnZSBEaXJlY3RvcnkgUG9pbnRlciAoUERQKQppdCB3aWxsIHdyaXRlIHRvLgoKU2ltaWxhcmx5 LCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlIG5lZWRzIHRvIGdldCB0aGUgY29ycmVjdCBQRFAvUEQg cmFuZ2UuCgpUaGlzIHBhdGNoIHdhcyBpbnNwaXJlZCBieSBCZW4ncyAiRGVwZW5kIGV4Y2x1c2l2 ZWx5IG9uIG1hcCBhbmQKdW5tYXBfdm1hIi4KCnYyOiBSZWJhc2UgYWZ0ZXIgcy9wYWdlX3RhYmxl cy9wYWdlX3RhYmxlLy4KdjM6IFJlbW92ZSB1bm5lY2Vzc2FyeSBwZHBlIGxvb3AgaW4gZ2VuOF9w cGd0dF9jbGVhcl9yYW5nZV80bHZsIGFuZCB1c2UKY2xhbXBfcGRwIGluIGdlbjhfcHBndHRfaW5z ZXJ0X2VudHJpZXMgKEFrYXNoKS4KdjQ6IE1lcmdlIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2VfNGx2 bCBpbnRvIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2UgdG8KbWFpbnRhaW4gc3ltbWV0cnkgd2l0aCBn ZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzIChBa2FzaCkuCnY1OiBEbyBub3QgbWl4IHBhZ2VzIGFu ZCBieXRlcyBpbiBpbnNlcnRfZW50cmllcyAoQWthc2gpLgoKQ2M6IEFrYXNoIEdvZWwgPGFrYXNo LmdvZWxAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRo aWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j IHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAxMSArKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA1 NCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKaW5kZXggMmI2ZWU4ZS4uZGJiZjM2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKQEAgLTY1MSwxOCArNjUxLDMzIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYXJf cmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiB7CiAJc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwg YmFzZSk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwID0gJnBwZ3R0 LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KLQogCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBnZW44 X3B0ZV9lbmNvZGUocHBndHQtPmJhc2Uuc2NyYXRjaC5hZGRyLAogCQkJCQkJIEk5MTVfQ0FDSEVf TExDLCB1c2Vfc2NyYXRjaCk7CiAKLQlnZW44X3BwZ3R0X2NsZWFyX3B0ZV9yYW5nZShwZHAsIHN0 YXJ0LCBsZW5ndGgsIHNjcmF0Y2hfcHRlLCAhSEFTX0xMQyh2bS0+ZGV2KSk7CisJaWYgKCFVU0VT X0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKKwkJZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFu Z2UoJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsCisJCQkJCSAgIHNjcmF0Y2hfcHRlLAorCQkJ CQkgICAhSEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKTsKKwl9IGVsc2UgeworCQl1aW50NjRfdCB0 ZW1wbDQsIHBtbDRlOworCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHA7 CisKKwkJZ2VuOF9mb3JfZWFjaF9wbWw0ZShwZHAsICZwcGd0dC0+cG1sNCwgc3RhcnQsIGxlbmd0 aCwgdGVtcGw0LCBwbWw0ZSkgeworCQkJdWludDY0X3QgcGRwX2xlbiA9IGdlbjhfY2xhbXBfcGRw KHN0YXJ0LCBsZW5ndGgpOworCQkJdWludDY0X3QgcGRwX3N0YXJ0ID0gc3RhcnQ7CisKKwkJCWdl bjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHBkcCwgcGRwX3N0YXJ0LCBwZHBfbGVuLAorCQkJCQkJ ICAgc2NyYXRjaF9wdGUsCisJCQkJCQkgICAhSEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKTsKKwkJ fQorCX0KIH0KIAogc3RhdGljIHZvaWQKIGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKIAkJCSAgICAgIHN0cnVjdCBz Z19wYWdlX2l0ZXIgKnNnX2l0ZXIsCiAJCQkgICAgICB1aW50NjRfdCBzdGFydCwKKwkJCSAgICAg IHNpemVfdCBwYWdlcywKIAkJCSAgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZl bCwKIAkJCSAgICAgIGNvbnN0IGJvb2wgZmx1c2gpCiB7CkBAIC02NzMsNyArNjg4LDcgQEAgZ2Vu OF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9p bnRlciAqcGRwLAogCiAJcHRfdmFkZHIgPSBOVUxMOwogCi0Jd2hpbGUgKF9fc2dfcGFnZV9pdGVy X25leHQoc2dfaXRlcikpIHsKKwl3aGlsZSAocGFnZXMtLSAmJiBfX3NnX3BhZ2VfaXRlcl9uZXh0 KHNnX2l0ZXIpKSB7CiAJCWlmIChwdF92YWRkciA9PSBOVUxMKSB7CiAJCQlzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeSAqcGQgPSBwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdOwogCQkJc3RydWN0 IGk5MTVfcGFnZV90YWJsZSAqcHQgPSBwZC0+cGFnZV90YWJsZVtwZGVdOwpAQCAtNzEwLDEyICs3 MjUsMzEgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2Fj aGVfbGV2ZWwsCiAJCQkJICAgICAgdTMyIHVudXNlZCkKIHsKLQlzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQgPSBjb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsK LQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSAmcHBndHQtPnBkcDsg LyogRklYTUU6IDQ4YiAqLworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCQljb250 YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAlzdHJ1Y3Qgc2dfcGFn ZV9pdGVyIHNnX2l0ZXI7CiAKIAlfX3NnX3BhZ2VfaXRlcl9zdGFydCgmc2dfaXRlciwgcGFnZXMt PnNnbCwgc2dfbmVudHMocGFnZXMtPnNnbCksIDApOwotCWdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9l bnRyaWVzKHBkcCwgJnNnX2l0ZXIsIHN0YXJ0LCBjYWNoZV9sZXZlbCwgIUhBU19MTEModm0tPmRl dikpOworCisJaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKKwkJZ2VuOF9w cGd0dF9pbnNlcnRfcHRlX2VudHJpZXMoJnBwZ3R0LT5wZHAsICZzZ19pdGVyLCBzdGFydCwKKwkJ CQkJICAgICAgc2dfbmVudHMocGFnZXMtPnNnbCksCisJCQkJCSAgICAgIGNhY2hlX2xldmVsLCAh SEFTX0xMQyh2bS0+ZGV2KSk7CisJfSBlbHNlIHsKKwkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rv cnlfcG9pbnRlciAqcGRwOworCQl1aW50NjRfdCB0ZW1wbDQsIHBtbDRlOworCQl1aW50NjRfdCBs ZW5ndGggPSBzZ19uZW50cyhwYWdlcy0+c2dsKSA8PCBQQUdFX1NISUZUOworCisJCWdlbjhfZm9y X2VhY2hfcG1sNGUocGRwLCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1s NGUpIHsKKwkJCXVpbnQ2NF90IHBkcF9sZW4gPSBnZW44X2NsYW1wX3BkcChzdGFydCwgbGVuZ3Ro KSA+PiBQQUdFX1NISUZUOworCQkJdWludDY0X3QgcGRwX3N0YXJ0ID0gc3RhcnQ7CisKKwkJCWdl bjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHBkcCwgJnNnX2l0ZXIsCisJCQkJCQkgICAgICBw ZHBfc3RhcnQsIHBkcF9sZW4sCisJCQkJCQkgICAgICBjYWNoZV9sZXZlbCwKKwkJCQkJCSAgICAg ICFIQVNfTExDKHZtLT5kZXYpKTsKKwkJfQorCX0KIH0KIAogc3RhdGljIHZvaWQgX19nZW44X2Rv X21hcF9wdChnZW44X3BkZV90ICogY29uc3QgcGRlLApAQCAtMTEzNSw3ICsxMTY5LDggQEAgc3Rh dGljIGludCBfX2dlbjhfYWxsb2Nfdm1hX3JhbmdlXzNsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJCQlpZiAoc2dfaXRlcikgewogCQkJCVdBUk5fT04oIXNnX2l0ZXItPl9fbmVu dHMpOwogCQkJCWdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHBkcCwgc2dfaXRlciwgcGRf c3RhcnQsCi0JCQkJCQkJICAgICAgZmxhZ3MsICFIQVNfTExDKHZtLT5kZXYpKTsKKwkJCQkJCWdl bjhfcHRlX2NvdW50KHBkX3N0YXJ0LCBwZF9sZW4pLAorCQkJCQkJZmxhZ3MsICFIQVNfTExDKHZt LT5kZXYpKTsKIAkJCX0KIAkJCXNldF9iaXQocGRlLCBwZC0+dXNlZF9wZGVzKTsKIAkJfQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCA5ZDUzYjY0Li45YWYzM2IyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtNDY5LDYgKzQ2OSwxNyBAQCBzdGF0aWMgaW5s aW5lIHVpbnQzMl90IGdlbjZfcGRlX2luZGV4KHVpbnQzMl90IGFkZHIpCiAjZGVmaW5lIGdlbjhf Zm9yX2VhY2hfcGRwZShwZCwgcGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBpdGVyKQkJXAogCWdl bjhfZm9yX2VhY2hfcGRwZV9lKHBkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIGl0ZXIsIEk5 MTVfUERQRVNfUEVSX1BEUChkZXYpKQogCisvKiBDbGFtcCBsZW5ndGggdG8gdGhlIG5leHQgcGFn ZV9kaXJlY3RvcnkgcG9pbnRlciBib3VuZGFyeSAqLworc3RhdGljIGlubGluZSB1aW50NjRfdCBn ZW44X2NsYW1wX3BkcCh1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQoreworCXVpbnQ2 NF90IG5leHRfcGRwID0gQUxJR04oc3RhcnQgKyAxLCAxVUxMIDw8IEdFTjhfUE1MNEVfU0hJRlQp OworCisJaWYgKG5leHRfcGRwID4gKHN0YXJ0ICsgbGVuZ3RoKSkKKwkJcmV0dXJuIGxlbmd0aDsK KworCXJldHVybiBuZXh0X3BkcCAtIHN0YXJ0OworfQorCiBzdGF0aWMgaW5saW5lIHVpbnQzMl90 IGdlbjhfcHRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCiB7CiAJcmV0dXJuIGk5MTVfcHRlX2lu ZGV4KGFkZHJlc3MsIEdFTjhfUERFX1NISUZUKTsKLS0gCjIuNC4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=