From: Michel Thierry Subject: [PATCH v5 10/19] drm/i915/gen8: Add 4 level support in insert_entries and clear_range Date: Thu, 16 Jul 2015 10:33:22 +0100 Message-ID: <1437039211-2507-11-git-send-email-michel.thierry@intel.com> References: <1437039211-2507-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C0B1B6EC0F for ; Thu, 16 Jul 2015 02:33:54 -0700 (PDT) In-Reply-To: <1437039211-2507-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 ZCBieXRlcyBpbiBpbnNlcnRfZW50cmllcyAoQWthc2gpLgp2NjogUHJldmVudCBvdmVyZmxvdyBp biBzZ19uZW50cyA8PCBQQUdFX1NISUZULCB3aGVuIGluc2VydGluZyA0R0IgYXQKb25jZS4Kdjc6 IFJlYmFzZSBhZnRlciBNaWthJ3MgcHBndHQgY2xlYW51cCAvIHNjcmF0Y2ggbWVyZ2UgcGF0Y2gg c2VyaWVzLgpVc2UgZ2VuOF9weF9pbmRleCBmdW5jdGlvbnMsIGFuZCByZW1vdmUgdW5uZWNlc3Nh cnkgbnVtYmVyIG9mIHBhZ2VzCnBhcmFtZXRlciBpbiBpbnNlcnRfcHRlX2VudHJpZXMuCnY4OiBD aGFuZ2UgZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFuZ2UgdG8gc3RvcCBhdCBQRFAgYm91bmRhcnks IGluc3RlYWQgb2YKYWRkaW5nIGFuZCBleHRyYSBjbGFtcCBmdW5jdGlvbjsgcmVtb3ZlIHVubmVj ZXNzYXJ5IHBkcF9zdGFydC9wZHBfbGVuCnZhcmlhYmxlcyAoQWthc2gpLgp2OTogVXNlIHBhZ2Vz LT5vcmlnX25lbnRzIGluc3RlYWQgb2Ygc2dfbmVudHMocGFnZXMtPnNnbCkgdG8gZ2V0IHRoZQps ZW5ndGggb2YgdGhlIGJ1ZmZlciBiZWluZyBtYXBwZWQgdG8gdGhlIFBQR1RUIChBa2FzaCkuCgpD YzogQWthc2ggR29lbCA8YWthc2guZ29lbEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hl bCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA0OSArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBlZTE5NDczLi5jM2FiOWE1IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNjg3LDkgKzY4Nyw5IEBAIHN0YXRp YyB2b2lkIGdlbjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5lcl9vZih2 bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogCWdlbjhfcHRlX3QgKnB0X3ZhZGRyOwot CXVuc2lnbmVkIHBkcGUgPSBzdGFydCA+PiBHRU44X1BEUEVfU0hJRlQgJiBHRU44X1BEUEVfTUFT SzsKLQl1bnNpZ25lZCBwZGUgPSBzdGFydCA+PiBHRU44X1BERV9TSElGVCAmIEdFTjhfUERFX01B U0s7Ci0JdW5zaWduZWQgcHRlID0gc3RhcnQgPj4gR0VOOF9QVEVfU0hJRlQgJiBHRU44X1BURV9N QVNLOworCXVuc2lnbmVkIHBkcGUgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpOworCXVuc2lnbmVk IHBkZSA9IGdlbjhfcGRlX2luZGV4KHN0YXJ0KTsKKwl1bnNpZ25lZCBwdGUgPSBnZW44X3B0ZV9p bmRleChzdGFydCk7CiAJdW5zaWduZWQgbnVtX2VudHJpZXMgPSBsZW5ndGggPj4gUEFHRV9TSElG VDsKIAl1bnNpZ25lZCBsYXN0X3B0ZSwgaTsKIApAQCAtNzI1LDcgKzcyNSw4IEBAIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCiAJCXB0ZSA9IDA7CiAJCWlmICgrK3BkZSA9PSBJOTE1X1BERVMpIHsKLQkJCXBkcGUr KzsKKwkJCWlmICgrK3BkcGUgPT0gSTkxNV9QRFBFU19QRVJfUERQKHZtLT5kZXYpKQorCQkJCWJy ZWFrOwogCQkJcGRlID0gMDsKIAkJfQogCX0KQEAgLTczOCwxMiArNzM5LDIxIEBAIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBz dHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KLQogCWdlbjhfcHRl X3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2Up LAogCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB1c2Vfc2NyYXRjaCk7CiAKLQlnZW44X3BwZ3R0X2Ns ZWFyX3B0ZV9yYW5nZSh2bSwgcGRwLCBzdGFydCwgbGVuZ3RoLCBzY3JhdGNoX3B0ZSk7CisJaWYg KCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKKwkJZ2VuOF9wcGd0dF9jbGVhcl9w dGVfcmFuZ2Uodm0sICZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoLAorCQkJCQkgICBzY3JhdGNo X3B0ZSk7CisJfSBlbHNlIHsKKwkJdWludDY0X3QgdGVtcGw0LCBwbWw0ZTsKKwkJc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwOworCisJCWdlbjhfZm9yX2VhY2hfcG1sNGUo cGRwLCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1sNGUpIHsKKwkJCWdl bjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHZtLCBwZHAsIHN0YXJ0LCBsZW5ndGgsCisJCQkJCQkg ICBzY3JhdGNoX3B0ZSk7CisJCX0KKwl9CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC03NTYsOSArNzY2 LDkgQEAgZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29m KHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAJZ2VuOF9wdGVfdCAqcHRfdmFkZHI7 Ci0JdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+IEdFTjhfUERQRV9TSElGVCAmIEdFTjhfUERQRV9N QVNLOwotCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdFTjhfUERFX1NISUZUICYgR0VOOF9QREVf TUFTSzsKLQl1bnNpZ25lZCBwdGUgPSBzdGFydCA+PiBHRU44X1BURV9TSElGVCAmIEdFTjhfUFRF X01BU0s7CisJdW5zaWduZWQgcGRwZSA9IGdlbjhfcGRwZV9pbmRleChzdGFydCk7CisJdW5zaWdu ZWQgcGRlID0gZ2VuOF9wZGVfaW5kZXgoc3RhcnQpOworCXVuc2lnbmVkIHB0ZSA9IGdlbjhfcHRl X2luZGV4KHN0YXJ0KTsKIAogCXB0X3ZhZGRyID0gTlVMTDsKIApAQCAtNzc2LDcgKzc4Niw4IEBA IGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCQkJa3VubWFwX3B4KHBwZ3R0LCBwdF92YWRkcik7CiAJCQlwdF92YWRkciA9IE5VTEw7 CiAJCQlpZiAoKytwZGUgPT0gSTkxNV9QREVTKSB7Ci0JCQkJcGRwZSsrOworCQkJCWlmICgrK3Bk cGUgPT0gSTkxNV9QRFBFU19QRVJfUERQKHZtLT5kZXYpKQorCQkJCQlicmVhazsKIAkJCQlwZGUg PSAwOwogCQkJfQogCQkJcHRlID0gMDsKQEAgLTc5NSwxMSArODA2LDIzIEBAIHN0YXRpYyB2b2lk IGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBz dHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KIAlzdHJ1Y3Qgc2df cGFnZV9pdGVyIHNnX2l0ZXI7CiAKIAlfX3NnX3BhZ2VfaXRlcl9zdGFydCgmc2dfaXRlciwgcGFn ZXMtPnNnbCwgc2dfbmVudHMocGFnZXMtPnNnbCksIDApOwotCWdlbjhfcHBndHRfaW5zZXJ0X3B0 ZV9lbnRyaWVzKHZtLCBwZHAsICZzZ19pdGVyLCBzdGFydCwgY2FjaGVfbGV2ZWwpOworCisJaWYg KCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKKwkJZ2VuOF9wcGd0dF9pbnNlcnRf cHRlX2VudHJpZXModm0sICZwcGd0dC0+cGRwLCAmc2dfaXRlciwgc3RhcnQsCisJCQkJCSAgICAg IGNhY2hlX2xldmVsKTsKKwl9IGVsc2UgeworCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9w b2ludGVyICpwZHA7CisJCXVpbnQ2NF90IHRlbXBsNCwgcG1sNGU7CisJCXVpbnQ2NF90IGxlbmd0 aCA9ICh1aW50NjRfdClwYWdlcy0+b3JpZ19uZW50cyA8PCBQQUdFX1NISUZUOworCisJCWdlbjhf Zm9yX2VhY2hfcG1sNGUocGRwLCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwg cG1sNGUpIHsKKwkJCWdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHZtLCBwZHAsICZzZ19p dGVyLAorCQkJCQkJICAgICAgc3RhcnQsIGNhY2hlX2xldmVsKTsKKwkJfQorCX0KIH0KIAogc3Rh dGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0t IAoyLjQuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK