From: Michel Thierry Subject: [PATCH 4/5] drm/i915: Track page table reload need Date: Mon, 16 Mar 2015 16:00:57 +0000 Message-ID: <1426521658-28408-5-git-send-email-michel.thierry@intel.com> References: <1426521658-28408-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id D99EA6E578 for ; Mon, 16 Mar 2015 09:00:51 -0700 (PDT) In-Reply-To: <1426521658-28408-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 RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpUaGlzIHBh dGNoIHdhcyBmb3JtZXJseSBrbm93biBhcywgIkZvcmNlIHBkIHJlc3RvcmUgd2hlbiBQREVzIGNo YW5nZSwKZ2VuNi03LiIgSSBoYWQgdG8gY2hhbmdlIHRoZSBuYW1lIGJlY2F1c2UgaXQgaXMgbmVl ZGVkIGZvciBHRU44IHRvby4KClRoZSByZWFsIGlzc3VlIHRoaXMgaXMgdHJ5aW5nIHRvIHNvbHZl IGlzIHdoZW4gYSBuZXcgb2JqZWN0IGlzIG1hcHBlZAppbnRvIHRoZSBjdXJyZW50IGFkZHJlc3Mg c3BhY2UuIFRoZSBHUFUgZG9lcyBub3Qgc25vb3AgdGhlIG5ldyBtYXBwaW5nCnNvIHdlIG11c3Qg ZG8gdGhlIGdlbiBzcGVjaWZpYyBhY3Rpb24gdG8gcmVsb2FkIHRoZSBwYWdlIHRhYmxlcy4KCkdF TjggYW5kIEdFTjcgZG8gZGlmZmVyIGluIHRoZSB3YXkgdGhleSBsb2FkIHBhZ2UgdGFibGVzIGZv ciB0aGUgUkNTLgpHRU44IGRvZXMgc28gd2l0aCB0aGUgY29udGV4dCByZXN0b3JlLCB3aGlsZSBH RU43IHJlcXVpcmVzIHRoZSBwcm9wZXIKbG9hZCBjb21tYW5kcyBpbiB0aGUgY29tbWFuZCBzdHJl YW1lci4gTm9uLXJlbmRlciBpcyBzaW1pbGFyIGZvciBib3RoLgoKQ2F2ZWF0IGZvciBHRU43ClRo ZSBkb2NzIHNheSB5b3UgY2Fubm90IGNoYW5nZSB0aGUgUERFcyBvZiBhIGN1cnJlbnRseSBydW5u aW5nIGNvbnRleHQuCldlIG5ldmVyIG1hcCBuZXcgUERFcyBvZiBhIHJ1bm5pbmcgY29udGV4dCwg YW5kIGV4cGVjdCB0aGVtIHRvIGJlCnByZXNlbnQgLSBzbyBJIHRoaW5rIHRoaXMgaXMgb2theS4g KFdlIGNhbiB1bm1hcCwgYnV0IHRoaXMgc2hvdWxkIGFsc28KYmUgb2theSBzaW5jZSB3ZSBvbmx5 IHVubWFwIHVucmVmZXJlbmNlZCBvYmplY3RzIHRoYXQgdGhlIEdQVSBzaG91bGRuJ3QKYmUgdHJ5 aW5ndG8gdmEtPnBhIHhsYXRlLikgVGhlIE1JX1NFVF9DT05URVhUIGNvbW1hbmQgZG9lcyBoYXZl IGEgZmxhZwp0byBzaWduYWwgdGhhdCBldmVuIGlmIHRoZSBjb250ZXh0IGlzIHRoZSBzYW1lLCBm b3JjZSBhIHJlbG9hZC4gSXQncwp1bmNsZWFyIGV4YWN0bHkgd2hhdCB0aGlzIGRvZXMsIGJ1dCBJ IGhhdmUgYSBodW5jaCBpdCdzIHRoZSByaWdodCB0aGluZwp0byBkby4KClRoZSBsb2dpYyBhc3N1 bWVzIHRoYXQgd2UgYWx3YXlzIGVtaXQgYSBjb250ZXh0IHN3aXRjaCBhZnRlciBtYXBwaW5nIG5l dwpQREVzLCBhbmQgYmVmb3JlIHdlIHN1Ym1pdCBhIGJhdGNoLiBUaGlzIGlzIHRoZSBjYXNlIHRv ZGF5LCBhbmQgaGFzIGJlZW4KdGhlIGNhc2Ugc2luY2UgdGhlIGluY2VwdGlvbiBvZiBoYXJkd2Fy ZSBjb250ZXh0cy4gQSBub3RlIGluIHRoZSBjb21tZW50CmxldCdzIHRoZSB1c2VyIGtub3cuCgpJ dCdzIG5vdCBqdXN0IGZvciBnZW44LiBJZiB0aGUgY3VycmVudCBjb250ZXh0IGhhcyBtYXBwaW5n cyBjaGFuZ2UsIHdlCm5lZWQgYSBjb250ZXh0IHJlbG9hZCB0byBzd2l0Y2gKCnYyOiBSZWJhc2Vk IGFmdGVyIHBwZ3R0IGNsZWFuIHVwIHBhdGNoZXMuIFNwbGl0IHRoZSB3YXJuaW5nIGZvciBhbGlh c2luZwphbmQgdHJ1ZSBwcGd0dCBvcHRpb25zLiBBbmQgZG8gbm90IGJyZWFrIGFsaWFzaW5nIHBw Z3R0LCB3aGVyZSB0by0+cHBndHQKaXMgYWx3YXlzIG51bGwuCgp2MzogSW52YWxpZGF0ZSBQUEdU VCBUTEJzIGluc2lkZSBhbGxvY192YV9yYW5nZS4KCnY0OiBSZW5hbWUgcHBndHRfaW52YWxpZGF0 ZV90bGJzIHRvIG1hcmtfdGxic19kaXJ0eSBhbmQgbW92ZQpwZF9kaXJ0eV9yaW5ncyBmcm9tIGk5 MTVfYWRkcmVzc19zcGFjZSB0byBpOTE1X2h3X3BwZ3R0LiBGaXhlcyB3aGVuCm5laXRoZXIgY3R4 LT5wcGd0dCBhbmQgYWxpYXNpbmdfcHBndHQgZXhpc3QuCgp2NTogUmVtb3ZlZCByZWZlcmVuY2Vz IHRvIHRlYXJkb3duX3ZhX3JhbmdlLgoKdjY6IFVwZGF0ZWQgbmVlZHNfcGRfbG9hZF9wcmUvcG9z dC4KClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVk LW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYyKykK LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAyNiArKysr KysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jIHwgMTEgKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jICAgICAgICB8IDExICsrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaCAgICAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMo KyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j CmluZGV4IGI2ZWE4NWQuLjkxOTdmZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKQEAgLTU3Myw4ICs1NzMsMjAgQEAgc3RhdGljIGlubGluZSBib29sIHNob3VsZF9z a2lwX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAgICAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpmcm9tLAogCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0 bykKIHsKLQlpZiAoZnJvbSA9PSB0byAmJiAhdG8tPnJlbWFwX3NsaWNlKQotCQlyZXR1cm4gdHJ1 ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9w cml2YXRlOworCisJaWYgKHRvLT5yZW1hcF9zbGljZSkKKwkJcmV0dXJuIGZhbHNlOworCisJaWYg KHRvLT5wcGd0dCkgeworCQlpZiAoZnJvbSA9PSB0byAmJiAhdGVzdF9iaXQocmluZy0+aWQsCisJ CQkJJnRvLT5wcGd0dC0+cGRfZGlydHlfcmluZ3MpKQorCQkJcmV0dXJuIHRydWU7CisJfSBlbHNl IGlmIChkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQpIHsKKwkJaWYgKGZyb20gPT0gdG8gJiYg IXRlc3RfYml0KHJpbmctPmlkLAorCQkJCSZkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQtPnBk X2RpcnR5X3JpbmdzKSkKKwkJCXJldHVybiB0cnVlOworCX0KIAogCXJldHVybiBmYWxzZTsKIH0K QEAgLTYxMCwxMCArNjIyLDcgQEAgbmVlZHNfcGRfbG9hZF9wb3N0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsIHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0bykKIAlpZiAocmluZyAhPSAmZGV2 X3ByaXYtPnJpbmdbUkNTXSkKIAkJcmV0dXJuIGZhbHNlOwogCi0JaWYgKCF0by0+bGVnYWN5X2h3 X2N0eC5pbml0aWFsaXplZCkKLQkJcmV0dXJuIHRydWU7Ci0KLQlpZiAoaTkxNV9nZW1fY29udGV4 dF9pc19kZWZhdWx0KHRvKSkKKwlpZiAoJnRvLT5wcGd0dC0+cGRfZGlydHlfcmluZ3MpCiAJCXJl dHVybiB0cnVlOwogCiAJcmV0dXJuIGZhbHNlOwpAQCAtNjY0LDYgKzY3Myw5IEBAIHN0YXRpYyBp bnQgZG9fc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJldCA9IHRvLT5w cGd0dC0+c3dpdGNoX21tKHRvLT5wcGd0dCwgcmluZyk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIHVu cGluX291dDsKKworCQkvKiBEb2luZyBhIFBEIGxvYWQgYWx3YXlzIHJlbG9hZHMgdGhlIHBhZ2Ug ZGlycyAqLworCQljbGVhcl9iaXQocmluZy0+aWQsICZ0by0+cHBndHQtPnBkX2RpcnR5X3Jpbmdz KTsKIAl9CiAKIAlpZiAocmluZyAhPSAmZGV2X3ByaXYtPnJpbmdbUkNTXSkgewpAQCAtNjk2LDYg KzcwOCw4IEBAIHN0YXRpYyBpbnQgZG9fc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAKIAlpZiAoIXRvLT5sZWdhY3lfaHdfY3R4LmluaXRpYWxpemVkIHx8IGk5MTVfZ2VtX2Nv bnRleHRfaXNfZGVmYXVsdCh0bykpCiAJCWh3X2ZsYWdzIHw9IE1JX1JFU1RPUkVfSU5ISUJJVDsK KwllbHNlIGlmICh0by0+cHBndHQgJiYgdGVzdF9hbmRfY2xlYXJfYml0KHJpbmctPmlkLCAmdG8t PnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncykpCisJCWh3X2ZsYWdzIHw9IE1JX0ZPUkNFX1JFU1RPUkU7 CiAKIAlyZXQgPSBtaV9zZXRfY29udGV4dChyaW5nLCB0bywgaHdfZmxhZ3MpOwogCWlmIChyZXQp CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZGMxMGJj NC4uZmQwMjQxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YwpAQCAtMTE4Nyw2ICsxMTg3LDEzIEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJaWYgKHJldCkK IAkJZ290byBlcnJvcjsKIAorCWlmIChjdHgtPnBwZ3R0KQorCQlXQVJOKGN0eC0+cHBndHQtPnBk X2RpcnR5X3JpbmdzICYgKDE8PHJpbmctPmlkKSwKKwkJCSIlcyBkaWRuJ3QgY2xlYXIgcmVsb2Fk XG4iLCByaW5nLT5uYW1lKTsKKwllbHNlIGlmIChkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQp CisJCVdBUk4oZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0LT5wZF9kaXJ0eV9yaW5ncyAmCisJ CQkoMTw8cmluZy0+aWQpLCAiJXMgZGlkbid0IGNsZWFyIHJlbG9hZFxuIiwgcmluZy0+bmFtZSk7 CisKIAlpbnN0cF9tb2RlID0gYXJncy0+ZmxhZ3MgJiBJOTE1X0VYRUNfQ09OU1RBTlRTX01BU0s7 CiAJaW5zdHBfbWFzayA9IEk5MTVfRVhFQ19DT05TVEFOVFNfTUFTSzsKIAlzd2l0Y2ggKGluc3Rw X21vZGUpIHsKQEAgLTE0NTYsNiArMTQ2MywxMCBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKHJldCkKIAkJZ290byBlcnI7 CiAKKwkvKiBYWFg6IFJlc2VydmUgaGFzIHBvc3NpYmx5IGNoYW5nZSBQREVzIHdoaWNoIG1lYW5z IHdlIG11c3QgZG8gYQorCSAqIGNvbnRleHQgc3dpdGNoIGJlZm9yZSB3ZSBjYW4gY29oZXJlbnRs eSByZWFkIHNvbWUgb2YgdGhlIHJlc2VydmVkCisJICogVk1Bcy4gKi8KKwogCS8qIFRoZSBvYmpl Y3RzIGFyZSBpbiB0aGVpciBmaW5hbCBsb2NhdGlvbnMsIGFwcGx5IHRoZSByZWxvY2F0aW9ucy4g Ki8KIAlpZiAobmVlZF9yZWxvY3MpCiAJCXJldCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVsb2Nh dGUoZWIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBjNTBiNGFiLi4xNzU4 ZmQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTE2MSw2ICsxMTYxLDE2 IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfdW5tYXBfcGFnZXMoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0KQogCQkJICAgICAgIDQwOTYsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7CiB9CiAK Ky8qIFBERSBUTEJzIGFyZSBhIHBhaW4gaW52YWxpZGF0ZSBwcmUgR0VOOC4gSXQgcmVxdWlyZXMg YSBjb250ZXh0IHJlbG9hZC4gSWYgd2UKKyAqIGFyZSBzd2l0Y2hpbmcgYmV0d2VlbiBjb250ZXh0 cyB3aXRoIHRoZSBzYW1lIExSQ0EsIHdlIGFsc28gbXVzdCBkbyBhIGZvcmNlCisgKiByZXN0b3Jl LgorICovCitzdGF0aWMgaW5saW5lIHZvaWQgbWFya190bGJzX2RpcnR5KHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKK3sKKwkvKiBJZiBjdXJyZW50IHZtICE9IHZtLCAqLworCXBwZ3R0LT5w ZF9kaXJ0eV9yaW5ncyA9IElOVEVMX0lORk8ocHBndHQtPmJhc2UuZGV2KS0+cmluZ19tYXNrOwor fQorCiBzdGF0aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsK QEAgLTExODAsNiArMTE5MCw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9hbGxvY192YV9yYW5nZShzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQlHRU42X1BURVMpOwogCX0KIAorCW1hcmtf dGxic19kaXJ0eShwcGd0dCk7CiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmgKaW5kZXggYzMwYWY2Mi4uMDc0YjFmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmgKQEAgLTMwMCw2ICszMDAsNyBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSBiYXNlOwogCXN0cnVjdCBrcmVmIHJlZjsKIAlzdHJ1Y3Qg ZHJtX21tX25vZGUgbm9kZTsKKwl1bnNpZ25lZCBsb25nIHBkX2RpcnR5X3JpbmdzOwogCXVuc2ln bmVkIG51bV9wZF9lbnRyaWVzOwogCXVuc2lnbmVkIG51bV9wZF9wYWdlczsgLyogZ2VuOCsgKi8K IAl1bmlvbiB7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK