From: Michel Thierry Subject: [PATCH v3 09/17] drm/i915/gen8: Add 4 level support in insert_entries and clear_range Date: Wed, 1 Jul 2015 16:27:25 +0100 Message-ID: <1435764453-11954-10-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-1-git-send-email-michel.thierry@intel.com> <1435764453-11954-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 8355A7A010 for ; Wed, 1 Jul 2015 08:27:45 -0700 (PDT) In-Reply-To: <1435764453-11954-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 cnkgbnVtYmVyIG9mIHBhZ2VzCnBhcmFtZXRlciBpbiBpbnNlcnRfcHRlX2VudHJpZXMuCgpDYzog QWthc2ggR29lbCA8YWthc2guZ29lbEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBU aGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8IDExICsrKysrKysrCiAy IGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNjdkMDJiOS4uZDE2ZmJjZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTcxMiw5ICs3MTIsOSBAQCBzdGF0aWMgdm9pZCBn ZW44X3BwZ3R0X2NsZWFyX3B0ZV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK IAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0cnVj dCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAlnZW44X3B0ZV90ICpwdF92YWRkcjsKLQl1bnNpZ25l ZCBwZHBlID0gc3RhcnQgPj4gR0VOOF9QRFBFX1NISUZUICYgR0VOOF9QRFBFX01BU0s7Ci0JdW5z aWduZWQgcGRlID0gc3RhcnQgPj4gR0VOOF9QREVfU0hJRlQgJiBHRU44X1BERV9NQVNLOwotCXVu c2lnbmVkIHB0ZSA9IHN0YXJ0ID4+IEdFTjhfUFRFX1NISUZUICYgR0VOOF9QVEVfTUFTSzsKKwl1 bnNpZ25lZCBwZHBlID0gZ2VuOF9wZHBlX2luZGV4KHN0YXJ0KTsKKwl1bnNpZ25lZCBwZGUgPSBn ZW44X3BkZV9pbmRleChzdGFydCk7CisJdW5zaWduZWQgcHRlID0gZ2VuOF9wdGVfaW5kZXgoc3Rh cnQpOwogCXVuc2lnbmVkIG51bV9lbnRyaWVzID0gbGVuZ3RoID4+IFBBR0VfU0hJRlQ7CiAJdW5z aWduZWQgbGFzdF9wdGUsIGk7CiAKQEAgLTc2MywxMiArNzYzLDI0IEBAIHN0YXRpYyB2b2lkIGdl bjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiB7CiAJ c3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3Qg aTkxNV9od19wcGd0dCwgYmFzZSk7Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl ciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KLQogCWdlbjhfcHRlX3Qgc2Ny YXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAogCQkJ CQkJIEk5MTVfQ0FDSEVfTExDLCB1c2Vfc2NyYXRjaCk7CiAKLQlnZW44X3BwZ3R0X2NsZWFyX3B0 ZV9yYW5nZSh2bSwgcGRwLCBzdGFydCwgbGVuZ3RoLCBzY3JhdGNoX3B0ZSk7CisJaWYgKCFVU0VT X0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpIHsKKwkJZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFu Z2Uodm0sICZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoLAorCQkJCQkgICBzY3JhdGNoX3B0ZSk7 CisJfSBlbHNlIHsKKwkJdWludDY0X3QgdGVtcGw0LCBwbWw0ZTsKKwkJc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwOworCisJCWdlbjhfZm9yX2VhY2hfcG1sNGUocGRwLCAm cHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1sNGUpIHsKKwkJCXVpbnQ2NF90 IHBkcF9sZW4gPSBnZW44X2NsYW1wX3BkcChzdGFydCwgbGVuZ3RoKTsKKwkJCXVpbnQ2NF90IHBk cF9zdGFydCA9IHN0YXJ0OworCisJCQlnZW44X3BwZ3R0X2NsZWFyX3B0ZV9yYW5nZSh2bSwgcGRw LCBwZHBfc3RhcnQsIHBkcF9sZW4sCisJCQkJCQkgICBzY3JhdGNoX3B0ZSk7CisJCX0KKwl9CiB9 CiAKIHN0YXRpYyB2b2lkCkBAIC03ODEsOSArNzkzLDkgQEAgZ2VuOF9wcGd0dF9pbnNlcnRfcHRl X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwg YmFzZSk7CiAJZ2VuOF9wdGVfdCAqcHRfdmFkZHI7Ci0JdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+ IEdFTjhfUERQRV9TSElGVCAmIEdFTjhfUERQRV9NQVNLOwotCXVuc2lnbmVkIHBkZSA9IHN0YXJ0 ID4+IEdFTjhfUERFX1NISUZUICYgR0VOOF9QREVfTUFTSzsKLQl1bnNpZ25lZCBwdGUgPSBzdGFy dCA+PiBHRU44X1BURV9TSElGVCAmIEdFTjhfUFRFX01BU0s7CisJdW5zaWduZWQgcGRwZSA9IGdl bjhfcGRwZV9pbmRleChzdGFydCk7CisJdW5zaWduZWQgcGRlID0gZ2VuOF9wZGVfaW5kZXgoc3Rh cnQpOworCXVuc2lnbmVkIHB0ZSA9IGdlbjhfcHRlX2luZGV4KHN0YXJ0KTsKIAogCXB0X3ZhZGRy ID0gTlVMTDsKIApAQCAtODAxLDcgKzgxMyw4IEBAIGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRy aWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJa3VubWFwX3B4KHBwZ3R0LCBw dF92YWRkcik7CiAJCQlwdF92YWRkciA9IE5VTEw7CiAJCQlpZiAoKytwZGUgPT0gSTkxNV9QREVT KSB7Ci0JCQkJcGRwZSsrOworCQkJCWlmICgrK3BkcGUgPT0gSTkxNV9QRFBFU19QRVJfUERQKHZt LT5kZXYpKQorCQkJCQlicmVhazsKIAkJCQlwZGUgPSAwOwogCQkJfQogCQkJcHRlID0gMDsKQEAg LTgyMCwxMSArODMzLDI1IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMo c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQg KnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7 Ci0Jc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7 IC8qIEZJWE1FOiA0OGIgKi8KIAlzdHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CiAKIAlfX3Nn X3BhZ2VfaXRlcl9zdGFydCgmc2dfaXRlciwgcGFnZXMtPnNnbCwgc2dfbmVudHMocGFnZXMtPnNn bCksIDApOwotCWdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHZtLCBwZHAsICZzZ19pdGVy LCBzdGFydCwgY2FjaGVfbGV2ZWwpOworCisJaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0t PmRldikpIHsKKwkJZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXModm0sICZwcGd0dC0+cGRw LCAmc2dfaXRlciwgc3RhcnQsCisJCQkJCSAgICAgIGNhY2hlX2xldmVsKTsKKwl9IGVsc2Ugewor CQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHA7CisJCXVpbnQ2NF90IHRl bXBsNCwgcG1sNGU7CisJCXVpbnQ2NF90IGxlbmd0aCA9ICh1aW50NjRfdClzZ19uZW50cyhwYWdl cy0+c2dsKSA8PCBQQUdFX1NISUZUOworCisJCWdlbjhfZm9yX2VhY2hfcG1sNGUocGRwLCAmcHBn dHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1sNGUpIHsKKwkJCXVpbnQ2NF90IHBk cF9zdGFydCA9IHN0YXJ0OworCisJCQlnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyh2bSwg cGRwLCAmc2dfaXRlciwKKwkJCQkJCSAgICAgIHBkcF9zdGFydCwgY2FjaGVfbGV2ZWwpOworCQl9 CisJfQogfQogCiBzdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggZmI5MzlmYi4u ZmQ2MTMyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTQ3OCw2ICs0Nzgs MTcgQEAgc3RhdGljIGlubGluZSB1aW50MzJfdCBnZW42X3BkZV9pbmRleCh1aW50MzJfdCBhZGRy KQogI2RlZmluZSBnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVt cCwgaXRlcikJCVwKIAlnZW44X2Zvcl9lYWNoX3BkcGVfZShwZCwgcGRwLCBzdGFydCwgbGVuZ3Ro LCB0ZW1wLCBpdGVyLCBJOTE1X1BEUEVTX1BFUl9QRFAoZGV2KSkKIAorLyogQ2xhbXAgbGVuZ3Ro IHRvIHRoZSBuZXh0IHBhZ2VfZGlyZWN0b3J5IHBvaW50ZXIgYm91bmRhcnkgKi8KK3N0YXRpYyBp bmxpbmUgdWludDY0X3QgZ2VuOF9jbGFtcF9wZHAodWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxl bmd0aCkKK3sKKwl1aW50NjRfdCBuZXh0X3BkcCA9IEFMSUdOKHN0YXJ0ICsgMSwgMVVMTCA8PCBH RU44X1BNTDRFX1NISUZUKTsKKworCWlmIChuZXh0X3BkcCA+IChzdGFydCArIGxlbmd0aCkpCisJ CXJldHVybiBsZW5ndGg7CisKKwlyZXR1cm4gbmV4dF9wZHAgLSBzdGFydDsKK30KKwogc3RhdGlj IGlubGluZSB1aW50MzJfdCBnZW44X3B0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQogewogCXJl dHVybiBpOTE1X3B0ZV9pbmRleChhZGRyZXNzLCBHRU44X1BERV9TSElGVCk7Ci0tIAoyLjQuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK