From: Michel Thierry Subject: [PATCH v3 12/25] drm/i915: Track page table reload need Date: Tue, 13 Jan 2015 11:52:26 +0000 Message-ID: <1421149959-30383-13-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 7BFA16E5D5 for ; Tue, 13 Jan 2015 03:52:26 -0800 (PST) In-Reply-To: <1421149959-30383-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 ZSBjb250ZXh0cy4gQSBub3RlIGluIHRoZSBjb21tZW50CmxldCdzIHRoZSB1c2VyIGtub3cuCgpT aWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+CgpzcXVhc2ghIGRy bS9pOTE1OiBGb3JjZSBwZCByZXN0b3JlIHdoZW4gUERFcyBjaGFuZ2UsIGdlbjYtNwoKSXQncyBu b3QganVzdCBmb3IgZ2VuOC4gSWYgdGhlIGN1cnJlbnQgY29udGV4dCBoYXMgbWFwcGluZ3MgY2hh bmdlLCB3ZQpuZWVkIGEgY29udGV4dCByZWxvYWQgdG8gc3dpdGNoCgp2MjogUmViYXNlZCBhZnRl ciBwcGd0dCBjbGVhbiB1cCBwYXRjaGVzLiBTcGxpdCB0aGUgd2FybmluZyBmb3IgYWxpYXNpbmcK YW5kIHRydWUgcHBndHQgb3B0aW9ucy4gQW5kIGRvIG5vdCBicmVhayBhbGlhc2luZyBwcGd0dCwg d2hlcmUgdG8tPnBwZ3R0CmlzIGFsd2F5cyBudWxsLgoKdjM6IEludmFsaWRhdGUgUFBHVFQgVExC cyBpbnNpZGUgYWxsb2NfdmFfcmFuZ2UgYW5kIHRlYXJkb3duX3ZhX3JhbmdlLgoKdjQ6IFJlbmFt ZSBwcGd0dF9pbnZhbGlkYXRlX3RsYnMgdG8gbWFya190bGJzX2RpcnR5IGFuZCBtb3ZlCnBkX2Rp cnR5X3JpbmdzIGZyb20gaTkxNV9hZGRyZXNzX3NwYWNlIHRvIGk5MTVfaHdfcHBndHQuCgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIr KQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICB8IDI3ICsr KysrKysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jIHwgMTEgKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jICAgICAgICB8IDEzICsrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oICAgICAgICB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0 aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMKaW5kZXggNjIwNmQyNy4uOTIzNDdhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYwpAQCAtNTY5LDggKzU2OSwxOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2hv dWxkX3NraXBfc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgICAg c3RydWN0IGludGVsX2NvbnRleHQgKmZyb20sCiAJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRl eHQgKnRvKQogewotCWlmIChmcm9tID09IHRvICYmICF0by0+cmVtYXBfc2xpY2UpCi0JCXJldHVy biB0cnVlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ ZGV2X3ByaXZhdGU7CisKKwlpZiAodG8tPnJlbWFwX3NsaWNlKQorCQlyZXR1cm4gZmFsc2U7CisK KwlpZiAodG8tPnBwZ3R0KSB7CisJCWlmIChmcm9tID09IHRvICYmICF0ZXN0X2JpdChyaW5nLT5p ZCwgJnRvLT5wcGd0dC0+cGRfZGlydHlfcmluZ3MpKQorCQkJcmV0dXJuIHRydWU7CisJfSBlbHNl IHsKKwkJaWYgKGZyb20gPT0gdG8gJiYgIXRlc3RfYml0KHJpbmctPmlkLCAmZGV2X3ByaXYtPm1t LmFsaWFzaW5nX3BwZ3R0LT5wZF9kaXJ0eV9yaW5ncykpCisJCQlyZXR1cm4gdHJ1ZTsKKwl9CiAK IAlyZXR1cm4gZmFsc2U7CiB9CkBAIC01ODcsOSArNTk3LDggQEAgbmVlZHNfcGRfbG9hZF9wcmUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQog c3RhdGljIGJvb2wKIG5lZWRzX3BkX2xvYWRfcG9zdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLCBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqdG8pCiB7Ci0JcmV0dXJuICghdG8tPmxlZ2FjeV9o d19jdHguaW5pdGlhbGl6ZWQgfHwKLQkJCWk5MTVfZ2VtX2NvbnRleHRfaXNfZGVmYXVsdCh0bykp ICYmCi0JCQl0by0+cHBndHQgJiYgSVNfR0VOOChyaW5nLT5kZXYpOworCXJldHVybiBJU19HRU44 KHJpbmctPmRldikgJiYKKwkJCSh0by0+cHBndHQgfHwgJnRvLT5wcGd0dC0+cGRfZGlydHlfcmlu Z3MpOwogfQogCiBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLApAQCAtNjM0LDYgKzY0MywxMiBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXQgPSB0by0+cHBndHQtPnN3aXRjaF9tbSh0by0+cHBn dHQsIHJpbmcpOwogCQlpZiAocmV0KQogCQkJZ290byB1bnBpbl9vdXQ7CisKKwkJLyogRG9pbmcg YSBQRCBsb2FkIGFsd2F5cyByZWxvYWRzIHRoZSBwYWdlIGRpcnMgKi8KKwkJaWYgKHRvLT5wcGd0 dCkKKwkJCWNsZWFyX2JpdChyaW5nLT5pZCwgJnRvLT5wcGd0dC0+cGRfZGlydHlfcmluZ3MpOwor CQllbHNlCisJCQljbGVhcl9iaXQocmluZy0+aWQsICZkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBn dHQtPnBkX2RpcnR5X3JpbmdzKTsKIAl9CiAKIAlpZiAocmluZyAhPSAmZGV2X3ByaXYtPnJpbmdb UkNTXSkgewpAQCAtNjcyLDYgKzY4Nyw4IEBAIHN0YXRpYyBpbnQgZG9fc3dpdGNoKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJICovCiAJaWYgKCF0by0+bGVnYWN5X2h3X2N0eC5pbml0 aWFsaXplZCB8fCBpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQodG8pKQogCQlod19mbGFncyB8 PSBNSV9SRVNUT1JFX0lOSElCSVQ7CisJZWxzZSBpZiAodG8tPnBwZ3R0ICYmIHRlc3RfYW5kX2Ns ZWFyX2JpdChyaW5nLT5pZCwgJnRvLT5wcGd0dC0+cGRfZGlydHlfcmluZ3MpKQorCQlod19mbGFn cyB8PSBNSV9GT1JDRV9SRVNUT1JFOwogCiAJcmV0ID0gbWlfc2V0X2NvbnRleHQocmluZywgdG8s IGh3X2ZsYWdzKTsKIAlpZiAocmV0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCmluZGV4IGUzZWYxNzcuLjEwZTZhMjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTExOTgsNiArMTE5OCwxMyBAQCBpOTE1X2dlbV9y aW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9m aWxlICpmaWxlLAogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAKKwlpZiAoY3R4LT5wcGd0dCkK KwkJV0FSTihjdHgtPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyAmICgxPDxyaW5nLT5pZCksCisJCQki JXMgZGlkbid0IGNsZWFyIHJlbG9hZFxuIiwgcmluZy0+bmFtZSk7CisJZWxzZQorCQlXQVJOKGRl dl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dC0+cGRfZGlydHlfcmluZ3MgJgorCQkJKDE8PHJpbmct PmlkKSwgIiVzIGRpZG4ndCBjbGVhciByZWxvYWRcbiIsIHJpbmctPm5hbWUpOworCiAJaW5zdHBf bW9kZSA9IGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX0NPTlNUQU5UU19NQVNLOwogCWluc3RwX21h c2sgPSBJOTE1X0VYRUNfQ09OU1RBTlRTX01BU0s7CiAJc3dpdGNoIChpbnN0cF9tb2RlKSB7CkBA IC0xNDQ1LDYgKzE0NTIsMTAgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCisJLyogWFhY OiBSZXNlcnZlIGhhcyBwb3NzaWJseSBjaGFuZ2UgUERFcyB3aGljaCBtZWFucyB3ZSBtdXN0IGRv IGEKKwkgKiBjb250ZXh0IHN3aXRjaCBiZWZvcmUgd2UgY2FuIGNvaGVyZW50bHkgcmVhZCBzb21l IG9mIHRoZSByZXNlcnZlZAorCSAqIFZNQXMuICovCisKIAkvKiBUaGUgb2JqZWN0cyBhcmUgaW4g dGhlaXIgZmluYWwgbG9jYXRpb25zLCBhcHBseSB0aGUgcmVsb2NhdGlvbnMuICovCiAJaWYgKG5l ZWRfcmVsb2NzKQogCQlyZXQgPSBpOTE1X2dlbV9leGVjYnVmZmVyX3JlbG9jYXRlKGViKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggOTU5MzRhNy4uNjJmNDkyZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTExMTAsNiArMTExMCwxNiBAQCBzdGF0aWMg dm9pZCBnZW42X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkK IAkJCSAgICAgICA0MDk2LCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwogfQogCisvKiBQREUgVExC cyBhcmUgYSBwYWluIGludmFsaWRhdGUgcHJlIEdFTjguIEl0IHJlcXVpcmVzIGEgY29udGV4dCBy ZWxvYWQuIElmIHdlCisgKiBhcmUgc3dpdGNoaW5nIGJldHdlZW4gY29udGV4dHMgd2l0aCB0aGUg c2FtZSBMUkNBLCB3ZSBhbHNvIG11c3QgZG8gYSBmb3JjZQorICogcmVzdG9yZS4KKyAqLworc3Rh dGljIGlubGluZSB2b2lkIG1hcmtfdGxic19kaXJ0eShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBn dHQpCit7CisJLyogSWYgY3VycmVudCB2bSAhPSB2bSwgKi8gXAorCXBwZ3R0LT5wZF9kaXJ0eV9y aW5ncyA9IElOVEVMX0lORk8ocHBndHQtPmJhc2UuZGV2KS0+cmluZ19tYXNrOworfQorCiBzdGF0 aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiAJCQkgICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsKQEAgLTExMjgs NiArMTEzOCw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlICp2bSwKIAkJCQlJOTE1X1BQR1RUX1BUX0VOVFJJRVMpOwogCX0KIAorCW1h cmtfdGxic19kaXJ0eShwcGd0dCk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTExNDMsNiArMTE1NCw4 IEBAIHN0YXRpYyB2b2lkIGdlbjZfdGVhcmRvd25fdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0sCiAJCWJpdG1hcF9jbGVhcihwdC0+dXNlZF9wdGVzLCBnZW42X3B0ZV9pbmRl eChzdGFydCksCiAJCQkgICAgIGdlbjZfcHRlX2NvdW50KHN0YXJ0LCBsZW5ndGgpKTsKIAl9CisK KwltYXJrX3RsYnNfZGlydHkocHBndHQpOwogfQogCiBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2Zy ZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaAppbmRleCBjYWExYWE5Li4xYWU3MGJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaApAQCAtMzAwLDYgKzMwMCw3IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAlzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlIGJhc2U7CiAJc3RydWN0IGtyZWYgcmVmOwogCXN0cnVjdCBkcm1f bW1fbm9kZSBub2RlOworCXVuc2lnbmVkIGxvbmcgcGRfZGlydHlfcmluZ3M7CiAJdW5zaWduZWQg bnVtX3BkX2VudHJpZXM7CiAJdW5zaWduZWQgbnVtX3BkX3BhZ2VzOyAvKiBnZW44KyAqLwogCXVu aW9uIHsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=