From: Michel Thierry Subject: [PATCH 07/16] drm/i915/gen8: Generalize PTE writing for GEN8 PPGTT Date: Tue, 26 May 2015 15:21:14 +0100 Message-ID: <1432650084-24491-8-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 3EBB772073 for ; Tue, 26 May 2015 07:21:27 -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 VGhlIGluc2VydF9lbnRyaWVzIGZ1bmN0aW9uIHdhcyB0aGUgZnVuY3Rpb24gdXNlZCB0byB3cml0 ZSBQVEVzLiBGb3IgdGhlClBQR1RUIGl0IHdhcyAiaGFyZGNvZGVkIiB0byBvbmx5IHVuZGVyc3Rh bmQgdHdvIGxldmVsIHBhZ2UgdGFibGVzLCB3aGljaAp3YXMgdGhlIGNhc2UgZm9yIEdFTjcuIFdl IGNhbiByZXVzZSB0aGlzIGZvciA0IGxldmVsIHBhZ2UgdGFibGVzLCBhbmQKcmVtb3ZlIHRoZSBj b25jZXB0IG9mIGluc2VydF9lbnRyaWVzLCB3aGljaCB3YXMgbmV2ZXIgdmlhYmxlIHBhc3QgMgps ZXZlbCBwYWdlIHRhYmxlcyBhbnl3YXksIGJ1dCBpdCByZXF1aXJlcyBhIGJpdCBvZiByZXdvcmsg dG8gbWFrZSB0aGUKZnVuY3Rpb24gYSBiaXQgbW9yZSBnZW5lcmljLgoKVGhpcyBwYXRjaCBiZWdp bnMgdGhlIGdlbmVyYWxpemF0aW9uIHdvcmssIGFuZCBpdCB3aWxsIGJlIGhlYXZpbHkgdXNlZAp1 cG9uIHdoZW4gdGhlIDQ4YiBjb2RlIGlzIGNvbXBsZXRlLiBUaGUgcGF0Y2ggc2VyaWVzIGF0dGVt cHRzIHRvIG1ha2UKZWFjaCBmdW5jdGlvbiB3aGljaCB0b3VjaGVzIGEgcGFydCBvZiBjb2RlIHNw ZWNpZmljIHRvIHRoZSBwYWdlIHRhYmxlCmxldmVsIGFuZCBoZXJlIGlzIG5vIGV4Y2VwdGlvbi4K ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9m Zi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDU2ICsrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAxNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGZlMjkyMTYu LmU3MWRiZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC01ODcsMjMgKzU4 NywxOSBAQCBzdGF0aWMgaW50IGdlbjhfNDhiX21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQsCiAJcmV0dXJuIGdlbjhfd3JpdGVfcGRwKHJpbmcsIDAsIHBwZ3R0LT5wbWw0LmRh ZGRyKTsKIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkgICB1aW50NjRfdCBzdGFydCwKLQkJCQkgICB1aW50 NjRfdCBsZW5ndGgsCi0JCQkJICAgYm9vbCB1c2Vfc2NyYXRjaCkKK3N0YXRpYyB2b2lkIGdlbjhf cHBndHRfY2xlYXJfcHRlX3JhbmdlKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIg KnBkcCwKKwkJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAgICAgIHVpbnQ2NF90IGxl bmd0aCwKKwkJCQkgICAgICAgZ2VuOF9wdGVfdCBzY3JhdGNoX3B0ZSwKKwkJCQkgICAgICAgY29u c3QgYm9vbCBmbHVzaCkKIHsKLQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQotCQljb250 YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKLQlzdHJ1Y3QgaTkxNV9w YWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSAmcHBndHQtPnBkcDsgLyogRklYTUU6IDQ4YiAq LwotCWdlbjhfcHRlX3QgKnB0X3ZhZGRyLCBzY3JhdGNoX3B0ZTsKKwlnZW44X3B0ZV90ICpwdF92 YWRkcjsKIAl1bnNpZ25lZCBwZHBlID0gc3RhcnQgPj4gR0VOOF9QRFBFX1NISUZUICYgR0VOOF9Q RFBFX01BU0s7CiAJdW5zaWduZWQgcGRlID0gc3RhcnQgPj4gR0VOOF9QREVfU0hJRlQgJiBHRU44 X1BERV9NQVNLOwogCXVuc2lnbmVkIHB0ZSA9IHN0YXJ0ID4+IEdFTjhfUFRFX1NISUZUICYgR0VO OF9QVEVfTUFTSzsKIAl1bnNpZ25lZCBudW1fZW50cmllcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZU OwogCXVuc2lnbmVkIGxhc3RfcHRlLCBpOwogCi0Jc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNv ZGUocHBndHQtPmJhc2Uuc2NyYXRjaC5hZGRyLAotCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDLCB1 c2Vfc2NyYXRjaCk7CiAKIAl3aGlsZSAobnVtX2VudHJpZXMpIHsKIAkJc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnkgKnBkOwpAQCAtNjM2LDcgKzYzMiw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBn dHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQludW1fZW50 cmllcy0tOwogCQl9CiAKLQkJaWYgKCFIQVNfTExDKHBwZ3R0LT5iYXNlLmRldikpCisJCWlmIChm bHVzaCkKIAkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocHRfdmFkZHIsIFBBR0VfU0laRSk7CiAJ CWt1bm1hcF9hdG9taWMocHRfdmFkZHIpOwogCkBAIC02NDgsMTQgKzY0NCwyOCBAQCBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKLQkJCQkgICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2Vz LAotCQkJCSAgICAgIHVpbnQ2NF90IHN0YXJ0LAotCQkJCSAgICAgIGVudW0gaTkxNV9jYWNoZV9s ZXZlbCBjYWNoZV9sZXZlbCwgdTMyIHVudXNlZCkKK3N0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xl YXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgdWludDY0X3Qg c3RhcnQsCisJCQkJICAgdWludDY0X3QgbGVuZ3RoLAorCQkJCSAgIGJvb2wgdXNlX3NjcmF0Y2gp CiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBz dHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KKworCWdlbjhfcHRl X3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHBndHQtPmJhc2Uuc2NyYXRjaC5hZGRy LAorCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB1c2Vfc2NyYXRjaCk7CisKKwlnZW44X3BwZ3R0X2Ns ZWFyX3B0ZV9yYW5nZShwZHAsIHN0YXJ0LCBsZW5ndGgsIHNjcmF0Y2hfcHRlLCAhSEFTX0xMQyh2 bS0+ZGV2KSk7Cit9CisKK3N0YXRpYyB2b2lkCitnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmll cyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJCQkgICAgICBzdHJ1 Y3Qgc2dfdGFibGUgKnBhZ2VzLAorCQkJICAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkgICAgICBl bnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCisJCQkgICAgICBjb25zdCBib29sIGZs dXNoKQorewogCWdlbjhfcHRlX3QgKnB0X3ZhZGRyOwogCXVuc2lnbmVkIHBkcGUgPSBzdGFydCA+ PiBHRU44X1BEUEVfU0hJRlQgJiBHRU44X1BEUEVfTUFTSzsKIAl1bnNpZ25lZCBwZGUgPSBzdGFy dCA+PiBHRU44X1BERV9TSElGVCAmIEdFTjhfUERFX01BU0s7CkBAIC02NzcsNyArNjg3LDcgQEAg c3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKIAkJCWdlbjhfcHRlX2VuY29kZShzZ19wYWdlX2l0ZXJfZG1hX2FkZHJlc3Mo JnNnX2l0ZXIpLAogCQkJCQljYWNoZV9sZXZlbCwgdHJ1ZSk7CiAJCWlmICgrK3B0ZSA9PSBHRU44 X1BURVMpIHsKLQkJCWlmICghSEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKQorCQkJaWYgKGZsdXNo KQogCQkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocHRfdmFkZHIsIFBBR0VfU0laRSk7CiAJCQlr dW5tYXBfYXRvbWljKHB0X3ZhZGRyKTsKIAkJCXB0X3ZhZGRyID0gTlVMTDsKQEAgLTY4OSwxMiAr Njk5LDI0IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCX0KIAl9CiAJaWYgKHB0X3ZhZGRyKSB7Ci0JCWlmICgh SEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKQorCQlpZiAoZmx1c2gpCiAJCQlkcm1fY2xmbHVzaF92 aXJ0X3JhbmdlKHB0X3ZhZGRyLCBQQUdFX1NJWkUpOwogCQlrdW5tYXBfYXRvbWljKHB0X3ZhZGRy KTsKIAl9CiB9CiAKK3N0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgc3RydWN0IHNnX3RhYmxlICpwYWdl cywKKwkJCQkgICAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkgICAgICBlbnVtIGk5MTVfY2FjaGVf bGV2ZWwgY2FjaGVfbGV2ZWwsCisJCQkJICAgICAgdTMyIHVudXNlZCkKK3sKKwlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPSBjb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0 LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSAmcHBn dHQtPnBkcDsgLyogRklYTUU6IDQ4YiAqLworCisJZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJp ZXMocGRwLCBwYWdlcywgc3RhcnQsIGNhY2hlX2xldmVsLCAhSEFTX0xMQyh2bS0+ZGV2KSk7Cit9 CisKIHN0YXRpYyB2b2lkIF9fZ2VuOF9kb19tYXBfcHQoZ2VuOF9wZGVfdCAqIGNvbnN0IHBkZSwK IAkJCSAgICAgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQsCiAJCQkgICAgIHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCi0tIAoyLjQuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK