From: Michel Thierry Subject: [PATCH v4 11/24] drm/i915: Track page table reload need Date: Thu, 22 Jan 2015 17:01:33 +0000 Message-ID: <1421946106-7921-12-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 15FC9720A0 for ; Thu, 22 Jan 2015 09:01:37 -0800 (PST) In-Reply-To: <1421946106-7921-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 IHRvIHRlYXJkb3duX3ZhX3JhbmdlLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5A YndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVy cnlAaW50ZWwuY29tPiAodjIrKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYyAgICB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAxMSArKysrKysrKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgICAgIHwgMTEgKysrKysrKysrKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oICAgICAgICB8ICAxICsKIDQgZmlsZXMg Y2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggNjIwNmQyNy4uNDM3Y2RjYyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtNTY5LDggKzU2OSwyMCBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgc2hvdWxkX3NraXBfc3dpdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCiAJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmZyb20sCiAJCQkJICAgICAg c3RydWN0IGludGVsX2NvbnRleHQgKnRvKQogewotCWlmIChmcm9tID09IHRvICYmICF0by0+cmVt YXBfc2xpY2UpCi0JCXJldHVybiB0cnVlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisKKwlpZiAodG8tPnJlbWFwX3NsaWNlKQor CQlyZXR1cm4gZmFsc2U7CisKKwlpZiAodG8tPnBwZ3R0KSB7CisJCWlmIChmcm9tID09IHRvICYm ICF0ZXN0X2JpdChyaW5nLT5pZCwKKwkJCQkmdG8tPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncykpCisJ CQlyZXR1cm4gdHJ1ZTsKKwl9IGVsc2UgaWYgKGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dCkg eworCQlpZiAoZnJvbSA9PSB0byAmJiAhdGVzdF9iaXQocmluZy0+aWQsCisJCQkJJmRldl9wcml2 LT5tbS5hbGlhc2luZ19wcGd0dC0+cGRfZGlydHlfcmluZ3MpKQorCQkJcmV0dXJuIHRydWU7CisJ fQogCiAJcmV0dXJuIGZhbHNlOwogfQpAQCAtNTg3LDkgKzU5OSw4IEBAIG5lZWRzX3BkX2xvYWRf cHJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHN0cnVjdCBpbnRlbF9jb250ZXh0ICp0 bykKIHN0YXRpYyBib29sCiBuZWVkc19wZF9sb2FkX3Bvc3Qoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywgc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQogewotCXJldHVybiAoIXRvLT5sZWdh Y3lfaHdfY3R4LmluaXRpYWxpemVkIHx8Ci0JCQlpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1bHQo dG8pKSAmJgotCQkJdG8tPnBwZ3R0ICYmIElTX0dFTjgocmluZy0+ZGV2KTsKKwlyZXR1cm4gSVNf R0VOOChyaW5nLT5kZXYpICYmCisJCQkodG8tPnBwZ3R0IHx8ICZ0by0+cHBndHQtPnBkX2RpcnR5 X3JpbmdzKTsKIH0KIAogc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKQEAgLTYzNCw2ICs2NDUsMTIgQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0ID0gdG8tPnBwZ3R0LT5zd2l0Y2hfbW0odG8t PnBwZ3R0LCByaW5nKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gdW5waW5fb3V0OworCisJCS8qIERv aW5nIGEgUEQgbG9hZCBhbHdheXMgcmVsb2FkcyB0aGUgcGFnZSBkaXJzICovCisJCWlmICh0by0+ cHBndHQpCisJCQljbGVhcl9iaXQocmluZy0+aWQsICZ0by0+cHBndHQtPnBkX2RpcnR5X3Jpbmdz KTsKKwkJZWxzZQorCQkJY2xlYXJfYml0KHJpbmctPmlkLCAmZGV2X3ByaXYtPm1tLmFsaWFzaW5n X3BwZ3R0LT5wZF9kaXJ0eV9yaW5ncyk7CiAJfQogCiAJaWYgKHJpbmcgIT0gJmRldl9wcml2LT5y aW5nW1JDU10pIHsKQEAgLTY3Miw2ICs2ODksOCBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAqLwogCWlmICghdG8tPmxlZ2FjeV9od19jdHgu aW5pdGlhbGl6ZWQgfHwgaTkxNV9nZW1fY29udGV4dF9pc19kZWZhdWx0KHRvKSkKIAkJaHdfZmxh Z3MgfD0gTUlfUkVTVE9SRV9JTkhJQklUOworCWVsc2UgaWYgKHRvLT5wcGd0dCAmJiB0ZXN0X2Fu ZF9jbGVhcl9iaXQocmluZy0+aWQsICZ0by0+cHBndHQtPnBkX2RpcnR5X3JpbmdzKSkKKwkJaHdf ZmxhZ3MgfD0gTUlfRk9SQ0VfUkVTVE9SRTsKIAogCXJldCA9IG1pX3NldF9jb250ZXh0KHJpbmcs IHRvLCBod19mbGFncyk7CiAJaWYgKHJldCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYwppbmRleCBlM2VmMTc3Li45NzFhMTQ5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMTk4LDYgKzExOTgsMTMgQEAgaTkxNV9n ZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSwKIAlpZiAocmV0KQogCQlnb3RvIGVycm9yOwogCisJaWYgKGN0eC0+cHBn dHQpCisJCVdBUk4oY3R4LT5wcGd0dC0+cGRfZGlydHlfcmluZ3MgJiAoMTw8cmluZy0+aWQpLAor CQkJIiVzIGRpZG4ndCBjbGVhciByZWxvYWRcbiIsIHJpbmctPm5hbWUpOworCWVsc2UgaWYgKGRl dl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dCkKKwkJV0FSTihkZXZfcHJpdi0+bW0uYWxpYXNpbmdf cHBndHQtPnBkX2RpcnR5X3JpbmdzICYKKwkJCSgxPDxyaW5nLT5pZCksICIlcyBkaWRuJ3QgY2xl YXIgcmVsb2FkXG4iLCByaW5nLT5uYW1lKTsKKwogCWluc3RwX21vZGUgPSBhcmdzLT5mbGFncyAm IEk5MTVfRVhFQ19DT05TVEFOVFNfTUFTSzsKIAlpbnN0cF9tYXNrID0gSTkxNV9FWEVDX0NPTlNU QU5UU19NQVNLOwogCXN3aXRjaCAoaW5zdHBfbW9kZSkgewpAQCAtMTQ0NSw2ICsxNDUyLDEwIEBA IGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAlpZiAocmV0KQogCQlnb3RvIGVycjsKIAorCS8qIFhYWDogUmVzZXJ2ZSBoYXMgcG9zc2li bHkgY2hhbmdlIFBERXMgd2hpY2ggbWVhbnMgd2UgbXVzdCBkbyBhCisJICogY29udGV4dCBzd2l0 Y2ggYmVmb3JlIHdlIGNhbiBjb2hlcmVudGx5IHJlYWQgc29tZSBvZiB0aGUgcmVzZXJ2ZWQKKwkg KiBWTUFzLiAqLworCiAJLyogVGhlIG9iamVjdHMgYXJlIGluIHRoZWlyIGZpbmFsIGxvY2F0aW9u cywgYXBwbHkgdGhlIHJlbG9jYXRpb25zLiAqLwogCWlmIChuZWVkX3JlbG9jcykKIAkJcmV0ID0g aTkxNV9nZW1fZXhlY2J1ZmZlcl9yZWxvY2F0ZShlYik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDc2MDU4NWUuLjc0Yzc3N2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCkBAIC0xMTQwLDYgKzExNDAsMTYgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF91bm1h cF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJCQkgICAgICAgNDA5NiwgUENJ X0RNQV9CSURJUkVDVElPTkFMKTsKIH0KIAorLyogUERFIFRMQnMgYXJlIGEgcGFpbiBpbnZhbGlk YXRlIHByZSBHRU44LiBJdCByZXF1aXJlcyBhIGNvbnRleHQgcmVsb2FkLiBJZiB3ZQorICogYXJl IHN3aXRjaGluZyBiZXR3ZWVuIGNvbnRleHRzIHdpdGggdGhlIHNhbWUgTFJDQSwgd2UgYWxzbyBt dXN0IGRvIGEgZm9yY2UKKyAqIHJlc3RvcmUuCisgKi8KK3N0YXRpYyBpbmxpbmUgdm9pZCBtYXJr X3RsYnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQoreworCS8qIElmIGN1cnJl bnQgdm0gIT0gdm0sICovCisJcHBndHQtPnBkX2RpcnR5X3JpbmdzID0gSU5URUxfSU5GTyhwcGd0 dC0+YmFzZS5kZXYpLT5yaW5nX21hc2s7Cit9CisKIHN0YXRpYyBpbnQgZ2VuNl9hbGxvY192YV9y YW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAgICAgICB1aW50NjRfdCBz dGFydCwgdWludDY0X3QgbGVuZ3RoKQogewpAQCAtMTE1OSw2ICsxMTY5LDcgQEAgc3RhdGljIGlu dCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJ CUk5MTVfUFBHVFRfUFRfRU5UUklFUyk7CiAJfQogCisJbWFya190bGJzX2RpcnR5KHBwZ3R0KTsK IAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCAxYjE1 ZmM5Li5lYWY1MzBmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMjk3LDYg KzI5Nyw3IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlIGJhc2U7CiAJc3RydWN0IGtyZWYgcmVmOwogCXN0cnVjdCBkcm1fbW1fbm9kZSBub2RlOwor CXVuc2lnbmVkIGxvbmcgcGRfZGlydHlfcmluZ3M7CiAJdW5zaWduZWQgbnVtX3BkX2VudHJpZXM7 CiAJdW5zaWduZWQgbnVtX3BkX3BhZ2VzOyAvKiBnZW44KyAqLwogCXVuaW9uIHsKLS0gCjIuMS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=