From: Michel Thierry Subject: [PATCH v2 12/24] drm/i915: Track page table reload need Date: Tue, 23 Dec 2014 17:16:15 +0000 Message-ID: <1419354987-4622-13-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A64C86E4E2 for ; Tue, 23 Dec 2014 09:16:22 -0800 (PST) In-Reply-To: <1419354987-4622-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 cyBpbnNpZGUgYWxsb2NfdmFfcmFuZ2UgYW5kIHRlYXJkb3duX3ZhX3JhbmdlLgpTaWduZWQtb2Zm LWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIrKQotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICB8IDI3ICsrKysrKysr KysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jIHwgMTEgKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jICAgICAgICB8IDEyICsrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmggICAgICAgIHwgIDIgKysKIDQgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygr KSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK aW5kZXggN2IyMGJkNC4uZmE5ZDRhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYwpAQCAtNTY3LDggKzU2NywxOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkX3Nr aXBfc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgICAgc3RydWN0 IGludGVsX2NvbnRleHQgKmZyb20sCiAJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKnRv KQogewotCWlmIChmcm9tID09IHRvICYmICF0by0+cmVtYXBfc2xpY2UpCi0JCXJldHVybiB0cnVl OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3By aXZhdGU7CisKKwlpZiAodG8tPnJlbWFwX3NsaWNlKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAo dG8tPnBwZ3R0KSB7CisJCWlmIChmcm9tID09IHRvICYmICF0ZXN0X2JpdChyaW5nLT5pZCwgJnRv LT5wcGd0dC0+YmFzZS5wZF9yZWxvYWRfbWFzaykpCisJCQlyZXR1cm4gdHJ1ZTsKKwl9IGVsc2Ug eworCQlpZiAoZnJvbSA9PSB0byAmJiAhdGVzdF9iaXQocmluZy0+aWQsICZkZXZfcHJpdi0+bW0u YWxpYXNpbmdfcHBndHQtPmJhc2UucGRfcmVsb2FkX21hc2spKQorCQkJcmV0dXJuIHRydWU7CisJ fQogCiAJcmV0dXJuIGZhbHNlOwogfQpAQCAtNTg1LDkgKzU5NSw4IEBAIG5lZWRzX3BkX2xvYWRf cHJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0 bykKIHN0YXRpYyBib29sCiBuZWVkc19wZF9sb2FkX3Bvc3Qoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywgc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQogewotCXJldHVybiAoIXRvLT5sZWdh Y3lfaHdfY3R4LmluaXRpYWxpemVkIHx8Ci0JCQlpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQo dG8pKSAmJgotCQkJdG8tPnBwZ3R0ICYmIElTX0dFTjgocmluZy0+ZGV2KTsKKwlyZXR1cm4gSVNf R0VOOChyaW5nLT5kZXYpICYmCisJCQkodG8tPnBwZ3R0IHx8ICZ0by0+cHBndHQtPmJhc2UucGRf cmVsb2FkX21hc2spOwogfQogCiBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nLApAQCAtNjMyLDYgKzY0MSwxMiBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXQgPSB0by0+cHBndHQtPnN3aXRjaF9t bSh0by0+cHBndHQsIHJpbmcpOwogCQlpZiAocmV0KQogCQkJZ290byB1bnBpbl9vdXQ7CisKKwkJ LyogRG9pbmcgYSBQRCBsb2FkIGFsd2F5cyByZWxvYWRzIHRoZSBwYWdlIGRpcnMgKi8KKwkJaWYg KHRvLT5wcGd0dCkKKwkJCWNsZWFyX2JpdChyaW5nLT5pZCwgJnRvLT5wcGd0dC0+YmFzZS5wZF9y ZWxvYWRfbWFzayk7CisJCWVsc2UKKwkJCWNsZWFyX2JpdChyaW5nLT5pZCwgJmRldl9wcml2LT5t bS5hbGlhc2luZ19wcGd0dC0+YmFzZS5wZF9yZWxvYWRfbWFzayk7CiAJfQogCiAJaWYgKHJpbmcg IT0gJmRldl9wcml2LT5yaW5nW1JDU10pIHsKQEAgLTY3MCw2ICs2ODUsOCBAQCBzdGF0aWMgaW50 IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAqLwogCWlmICghdG8t PmxlZ2FjeV9od19jdHguaW5pdGlhbGl6ZWQgfHwgaTkxNV9nZW1fY29udGV4dF9pc19kZWZhdWx0 KHRvKSkKIAkJaHdfZmxhZ3MgfD0gTUlfUkVTVE9SRV9JTkhJQklUOworCWVsc2UgaWYgKHRvLT5w cGd0dCAmJiB0ZXN0X2FuZF9jbGVhcl9iaXQocmluZy0+aWQsICZ0by0+cHBndHQtPmJhc2UucGRf cmVsb2FkX21hc2spKQorCQlod19mbGFncyB8PSBNSV9GT1JDRV9SRVNUT1JFOwogCiAJcmV0ID0g bWlfc2V0X2NvbnRleHQocmluZywgdG8sIGh3X2ZsYWdzKTsKIAlpZiAocmV0KQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDgzMzA2NjAuLjA5ZDg2NGYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTExOTks NiArMTE5OSwxMyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCWlmIChyZXQpCiAJCWdvdG8gZXJy b3I7CiAKKwlpZiAoY3R4LT5wcGd0dCkKKwkJV0FSTihjdHgtPnBwZ3R0LT5iYXNlLnBkX3JlbG9h ZF9tYXNrICYgKDE8PHJpbmctPmlkKSwKKwkJCSIlcyBkaWRuJ3QgY2xlYXIgcmVsb2FkXG4iLCBy aW5nLT5uYW1lKTsKKwllbHNlCisJCVdBUk4oZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0LT5i YXNlLnBkX3JlbG9hZF9tYXNrICYKKwkJCSgxPDxyaW5nLT5pZCksICIlcyBkaWRuJ3QgY2xlYXIg cmVsb2FkXG4iLCByaW5nLT5uYW1lKTsKKwogCWluc3RwX21vZGUgPSBhcmdzLT5mbGFncyAmIEk5 MTVfRVhFQ19DT05TVEFOVFNfTUFTSzsKIAlpbnN0cF9tYXNrID0gSTkxNV9FWEVDX0NPTlNUQU5U U19NQVNLOwogCXN3aXRjaCAoaW5zdHBfbW9kZSkgewpAQCAtMTQ0Niw2ICsxNDUzLDEwIEBAIGk5 MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwK IAlpZiAocmV0KQogCQlnb3RvIGVycjsKIAorCS8qIFhYWDogUmVzZXJ2ZSBoYXMgcG9zc2libHkg Y2hhbmdlIFBERXMgd2hpY2ggbWVhbnMgd2UgbXVzdCBkbyBhCisJICogY29udGV4dCBzd2l0Y2gg YmVmb3JlIHdlIGNhbiBjb2hlcmVudGx5IHJlYWQgc29tZSBvZiB0aGUgcmVzZXJ2ZWQKKwkgKiBW TUFzLiAqLworCiAJLyogVGhlIG9iamVjdHMgYXJlIGluIHRoZWlyIGZpbmFsIGxvY2F0aW9ucywg YXBwbHkgdGhlIHJlbG9jYXRpb25zLiAqLwogCWlmIChuZWVkX3JlbG9jcykKIAkJcmV0ID0gaTkx NV9nZW1fZXhlY2J1ZmZlcl9yZWxvY2F0ZShlYik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IDMxMzQzMmUuLjU0YzdjYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCkBAIC0xMTI2LDYgKzExMjYsMTUgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF91bm1hcF9w YWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJCQkgICAgICAgNDA5NiwgUENJX0RN QV9CSURJUkVDVElPTkFMKTsKIH0KIAorLyogUERFIFRMQnMgYXJlIGEgcGFpbiBpbnZhbGlkYXRl IHByZSBHRU44LiBJdCByZXF1aXJlcyBhIGNvbnRleHQgcmVsb2FkLiBJZiB3ZQorICogYXJlIHN3 aXRjaGluZyBiZXR3ZWVuIGNvbnRleHRzIHdpdGggdGhlIHNhbWUgTFJDQSwgd2UgYWxzbyBtdXN0 IGRvIGEgZm9yY2UKKyAqIHJlc3RvcmUuCisgKi8KKyNkZWZpbmUgcHBndHRfaW52YWxpZGF0ZV90 bGJzKHZtKSBkbyB7XAorCS8qIElmIGN1cnJlbnQgdm0gIT0gdm0sICovIFwKKwl2bS0+cGRfcmVs b2FkX21hc2sgPSBJTlRFTF9JTkZPKHZtLT5kZXYpLT5yaW5nX21hc2s7IFwKK30gd2hpbGUgKDAp CisKIHN0YXRpYyBpbnQgZ2VuNl9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAkJCSAgICAgICB1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQogewpA QCAtMTE1NCw2ICsxMTYzLDcgQEAgc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCUk5MTVfUFBHVFRfUFRfRU5UUklFUyk7CiAJ fQogCisJcHBndHRfaW52YWxpZGF0ZV90bGJzKHZtKTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtMTE2 OSw2ICsxMTc5LDggQEAgc3RhdGljIHZvaWQgZ2VuNl90ZWFyZG93bl92YV9yYW5nZShzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJYml0bWFwX2NsZWFyKHB0LT51c2VkX3B0ZXMsIGdl bjZfcHRlX2luZGV4KHN0YXJ0KSwKIAkJCSAgICAgZ2VuNl9wdGVfY291bnQoc3RhcnQsIGxlbmd0 aCkpOwogCX0KKworCXBwZ3R0X2ludmFsaWRhdGVfdGxicyh2bSk7CiB9CiAKIHN0YXRpYyB2b2lk IGdlbjZfcHBndHRfZnJlZShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGQ1NzlmNzQuLmRjNzFjYWUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0yMjYsNiArMjI2LDggQEAgc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSB7CiAJCXN0cnVjdCBwYWdlICpwYWdlOwogCX0gc2NyYXRjaDsKIAorCXVuc2lnbmVk IGxvbmcgcGRfcmVsb2FkX21hc2s7CisKIAkvKioKIAkgKiBMaXN0IG9mIG9iamVjdHMgY3VycmVu dGx5IGludm9sdmVkIGluIHJlbmRlcmluZy4KIAkgKgotLSAKMi4xLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==