From: Michel Thierry Subject: [PATCH v2 09/18] drm/i915/gen8: Generalize PTE writing for GEN8 PPGTT Date: Wed, 10 Jun 2015 17:46:46 +0100 Message-ID: <1433954816-13787-10-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-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 079627206A for ; Wed, 10 Jun 2015 09:46:55 -0700 (PDT) In-Reply-To: <1433954816-13787-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 VGhlIGluc2VydF9lbnRyaWVzIGZ1bmN0aW9uIHdhcyB0aGUgZnVuY3Rpb24gdXNlZCB0byB3cml0 ZSBQVEVzLiBGb3IgdGhlClBQR1RUIGl0IHdhcyAiaGFyZGNvZGVkIiB0byBvbmx5IHVuZGVyc3Rh bmQgdHdvIGxldmVsIHBhZ2UgdGFibGVzLCB3aGljaAp3YXMgdGhlIGNhc2UgZm9yIEdFTjcuIFdl IGNhbiByZXVzZSB0aGlzIGZvciA0IGxldmVsIHBhZ2UgdGFibGVzLCBhbmQKcmVtb3ZlIHRoZSBj b25jZXB0IG9mIGluc2VydF9lbnRyaWVzLCB3aGljaCB3YXMgbmV2ZXIgdmlhYmxlIHBhc3QgMgps ZXZlbCBwYWdlIHRhYmxlcyBhbnl3YXksIGJ1dCBpdCByZXF1aXJlcyBhIGJpdCBvZiByZXdvcmsg dG8gbWFrZSB0aGUKZnVuY3Rpb24gYSBiaXQgbW9yZSBnZW5lcmljLgoKVGhpcyBwYXRjaCBiZWdp bnMgdGhlIGdlbmVyYWxpemF0aW9uIHdvcmssIGFuZCBpdCB3aWxsIGJlIGhlYXZpbHkgdXNlZAp1 cG9uIHdoZW4gdGhlIDQ4YiBjb2RlIGlzIGNvbXBsZXRlLiBUaGUgcGF0Y2ggc2VyaWVzIGF0dGVt cHRzIHRvIG1ha2UKZWFjaCBmdW5jdGlvbiB3aGljaCB0b3VjaGVzIGEgcGFydCBvZiBjb2RlIHNw ZWNpZmljIHRvIHRoZSBwYWdlIHRhYmxlCmxldmVsIGFuZCBoZXJlIGlzIG5vIGV4Y2VwdGlvbi4K CnYyOiBSZWJhc2UgYWZ0ZXIgTWlrYSdzIHBwZ3R0IGNsZWFudXAgLyBzY3JhdGNoIG1lcmdlIHBh dGNoIHNlcmllcy4KClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5l dD4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNv bT4gKHYyKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNTEgKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM5IGlu c2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKaW5kZXggY2JjNmFhZi4uZWEyMGU1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKQEAgLTgwOCwyMyArODA4LDIxIEBAIHN0YXRpYyBpbnQgZ2VuOF80OGJfbW1fc3dpdGNoKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAlyZXR1cm4gZ2VuOF93cml0ZV9wZHAocmluZywg MCwgcHhfZG1hKCZwcGd0dC0+cG1sNCkpOwogfQogCi1zdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2Ns ZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAotCQkJCSAgIHVpbnQ2NF90 IHN0YXJ0LAotCQkJCSAgIHVpbnQ2NF90IGxlbmd0aCwKLQkJCQkgICBib29sIHVzZV9zY3JhdGNo KQorc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3Bv aW50ZXIgKnBkcCwKKwkJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAgICAgIHVpbnQ2 NF90IGxlbmd0aCwKKwkJCQkgICAgICAgZ2VuOF9wdGVfdCBzY3JhdGNoX3B0ZSkKIHsKIAlzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1 X2h3X3BwZ3R0LCBiYXNlKTsKLQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpw ZHAgPSAmcHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAqLwotCWdlbjhfcHRlX3QgKnB0X3ZhZGRy LCBzY3JhdGNoX3B0ZTsKKwlnZW44X3B0ZV90ICpwdF92YWRkcjsKIAl1bnNpZ25lZCBwZHBlID0g c3RhcnQgPj4gR0VOOF9QRFBFX1NISUZUICYgR0VOOF9QRFBFX01BU0s7CiAJdW5zaWduZWQgcGRl ID0gc3RhcnQgPj4gR0VOOF9QREVfU0hJRlQgJiBHRU44X1BERV9NQVNLOwogCXVuc2lnbmVkIHB0 ZSA9IHN0YXJ0ID4+IEdFTjhfUFRFX1NISUZUICYgR0VOOF9QVEVfTUFTSzsKIAl1bnNpZ25lZCBu dW1fZW50cmllcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZUOwogCXVuc2lnbmVkIGxhc3RfcHRlLCBp OwogCi0Jc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3Bh Z2UpLAotCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDLCB1c2Vfc2NyYXRjaCk7CiAKIAl3aGlsZSAo bnVtX2VudHJpZXMpIHsKIAkJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkOwpAQCAtODY0 LDE0ICs4NjIsMzAgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhfcHBndHRf aW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0JCQkJICAgICAg c3RydWN0IHNnX3RhYmxlICpwYWdlcywKLQkJCQkgICAgICB1aW50NjRfdCBzdGFydCwKLQkJCQkg ICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsIHUzMiB1bnVzZWQpCitzdGF0 aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAorCQkJCSAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgIHVpbnQ2NF90IGxlbmd0aCwKKwkJ CQkgICBib29sIHVzZV9zY3JhdGNoKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9 CiAJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogCXN0cnVj dCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCA9ICZwcGd0dC0+cGRwOyAvKiBGSVhN RTogNDhiICovCisKKwlnZW44X3B0ZV90IHNjcmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2RlKHB4 X2RtYSh2bS0+c2NyYXRjaF9wYWdlKSwKKwkJCQkJCSBJOTE1X0NBQ0hFX0xMQywgdXNlX3NjcmF0 Y2gpOworCisJZ2VuOF9wcGd0dF9jbGVhcl9wdGVfcmFuZ2Uodm0sIHBkcCwgc3RhcnQsIGxlbmd0 aCwgc2NyYXRjaF9wdGUpOworfQorCitzdGF0aWMgdm9pZAorZ2VuOF9wcGd0dF9pbnNlcnRfcHRl X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkgICAgICBzdHJ1Y3Qg aTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJCQkgICAgICBzdHJ1Y3Qgc2dfdGFi bGUgKnBhZ2VzLAorCQkJICAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkgICAgICBlbnVtIGk5MTVf Y2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwpCit7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 ID0KKwkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAJZ2Vu OF9wdGVfdCAqcHRfdmFkZHI7CiAJdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+IEdFTjhfUERQRV9T SElGVCAmIEdFTjhfUERQRV9NQVNLOwogCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdFTjhfUERF X1NISUZUICYgR0VOOF9QREVfTUFTSzsKQEAgLTkwNSw2ICs5MTksMTkgQEAgc3RhdGljIHZvaWQg Z2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK IAkJa3VubWFwX3B4KHBwZ3R0LCBwdF92YWRkcik7CiB9CiAKK3N0YXRpYyB2b2lkIGdlbjhfcHBn dHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAg ICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKKwkJCQkgICAgICB1aW50NjRfdCBzdGFydCwKKwkJ CQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCisJCQkJICAgICAgdTMy IHVudXNlZCkKK3sKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQorCQljb250YWluZXJf b2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeV9wb2ludGVyICpwZHAgPSAmcHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAqLworCisJ Z2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXModm0sIHBkcCwgcGFnZXMsIHN0YXJ0LCBjYWNo ZV9sZXZlbCk7Cit9CisKIHN0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJCSAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkKQog ewotLSAKMi40LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==