From: Michel Thierry Subject: [PATCH] drm/i915: Track page table reload need Date: Thu, 19 Mar 2015 12:53:28 +0000 Message-ID: <1426769608-30361-1-git-send-email-michel.thierry@intel.com> References: <1426521658-28408-5-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B2576E270 for ; Thu, 19 Mar 2015 05:53:17 -0700 (PDT) In-Reply-To: <1426521658-28408-5-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 dC4KCnY3OiBGaXggcGRfZGlydHlfcmluZ3MgY2hlY2sgaW4gbmVlZHNfcGRfbG9hZF9wb3N0LCBh bmQgdXBkYXRlL21vdmUKY29tbWVudCBhYm91dCB1cGRhdGVkIFBERXMgdG8gb2JqZWN0X3Bpbi9i aW5kIChNaWthKS4KCkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIr KQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICA0ICsr KysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICB8IDI2ICsrKysr KysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyAgICAgICAgfCAxMSArKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmggICAgICAgIHwgIDEgKwogNSBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDk3OWRjYjYuLmVlZmJh OWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDI0Nyw2ICs0MjQ3LDEwIEBAIGk5MTVf Z2VtX29iamVjdF9waW5fdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiAJ Ym91bmQgPSB2bWEgPyB2bWEtPmJvdW5kIDogMDsKIAlpZiAodm1hID09IE5VTEwgfHwgIWRybV9t bV9ub2RlX2FsbG9jYXRlZCgmdm1hLT5ub2RlKSkgeworCQkvKiBJbiB0cnVlIFBQR1RULCBiaW5k IGhhcyBwb3NzaWJseSBjaGFuZ2VkIFBERXMsIHdoaWNoCisJCSAqIG1lYW5zIHdlIG11c3QgZG8g YSBjb250ZXh0IHN3aXRjaCBiZWZvcmUgdGhlIEdQVSBjYW4KKwkJICogYWNjdXJhdGVseSByZWFk IHNvbWUgb2YgdGhlIFZNQXMuCisJCSAqLwogCQl2bWEgPSBpOTE1X2dlbV9vYmplY3RfYmluZF90 b192bShvYmosIHZtLCBhbGlnbm1lbnQsCiAJCQkJCQkgZmxhZ3MsIHZpZXcpOwogCQlpZiAoSVNf RVJSKHZtYSkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggYjZl YTg1ZC4uZGQ5YWIzNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpA QCAtNTczLDggKzU3MywyMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkX3NraXBfc3dpdGNo KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgICAgc3RydWN0IGludGVsX2Nv bnRleHQgKmZyb20sCiAJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQogewotCWlm IChmcm9tID09IHRvICYmICF0by0+cmVtYXBfc2xpY2UpCi0JCXJldHVybiB0cnVlOworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisK KwlpZiAodG8tPnJlbWFwX3NsaWNlKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAodG8tPnBwZ3R0 KSB7CisJCWlmIChmcm9tID09IHRvICYmICF0ZXN0X2JpdChyaW5nLT5pZCwKKwkJCQkmdG8tPnBw Z3R0LT5wZF9kaXJ0eV9yaW5ncykpCisJCQlyZXR1cm4gdHJ1ZTsKKwl9IGVsc2UgaWYgKGRldl9w cml2LT5tbS5hbGlhc2luZ19wcGd0dCkgeworCQlpZiAoZnJvbSA9PSB0byAmJiAhdGVzdF9iaXQo cmluZy0+aWQsCisJCQkJJmRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dC0+cGRfZGlydHlfcmlu Z3MpKQorCQkJcmV0dXJuIHRydWU7CisJfQogCiAJcmV0dXJuIGZhbHNlOwogfQpAQCAtNjEwLDEw ICs2MjIsNyBAQCBuZWVkc19wZF9sb2FkX3Bvc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zywgc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQogCWlmIChyaW5nICE9ICZkZXZfcHJpdi0+cmlu Z1tSQ1NdKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAoIXRvLT5sZWdhY3lfaHdfY3R4LmluaXRp YWxpemVkKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChpOTE1X2dlbV9jb250ZXh0X2lzX2RlZmF1 bHQodG8pKQorCWlmICh0by0+cHBndHQtPnBkX2RpcnR5X3JpbmdzKQogCQlyZXR1cm4gdHJ1ZTsK IAogCXJldHVybiBmYWxzZTsKQEAgLTY2NCw2ICs2NzMsOSBAQCBzdGF0aWMgaW50IGRvX3N3aXRj aChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXQgPSB0by0+cHBndHQtPnN3aXRj aF9tbSh0by0+cHBndHQsIHJpbmcpOwogCQlpZiAocmV0KQogCQkJZ290byB1bnBpbl9vdXQ7CisK KwkJLyogRG9pbmcgYSBQRCBsb2FkIGFsd2F5cyByZWxvYWRzIHRoZSBwYWdlIGRpcnMgKi8KKwkJ Y2xlYXJfYml0KHJpbmctPmlkLCAmdG8tPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyk7CiAJfQogCiAJ aWYgKHJpbmcgIT0gJmRldl9wcml2LT5yaW5nW1JDU10pIHsKQEAgLTY5Niw2ICs3MDgsOCBAQCBz dGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJaWYg KCF0by0+bGVnYWN5X2h3X2N0eC5pbml0aWFsaXplZCB8fCBpOTE1X2dlbV9jb250ZXh0X2lzX2Rl ZmF1bHQodG8pKQogCQlod19mbGFncyB8PSBNSV9SRVNUT1JFX0lOSElCSVQ7CisJZWxzZSBpZiAo dG8tPnBwZ3R0ICYmIHRlc3RfYW5kX2NsZWFyX2JpdChyaW5nLT5pZCwgJnRvLT5wcGd0dC0+cGRf ZGlydHlfcmluZ3MpKQorCQlod19mbGFncyB8PSBNSV9GT1JDRV9SRVNUT1JFOwogCiAJcmV0ID0g bWlfc2V0X2NvbnRleHQocmluZywgdG8sIGh3X2ZsYWdzKTsKIAlpZiAocmV0KQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IGRjMTBiYzQuLjM1MTNmYjkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTExODcs NiArMTE4NywxMyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCWlmIChyZXQpCiAJCWdvdG8gZXJy b3I7CiAKKwlpZiAoY3R4LT5wcGd0dCkKKwkJV0FSTihjdHgtPnBwZ3R0LT5wZF9kaXJ0eV9yaW5n cyAmICgxPDxyaW5nLT5pZCksCisJCQkiJXMgZGlkbid0IGNsZWFyIHJlbG9hZFxuIiwgcmluZy0+ bmFtZSk7CisJZWxzZSBpZiAoZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0KQorCQlXQVJOKGRl dl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dC0+cGRfZGlydHlfcmluZ3MgJgorCQkJKDE8PHJpbmct PmlkKSwgIiVzIGRpZG4ndCBjbGVhciByZWxvYWRcbiIsIHJpbmctPm5hbWUpOworCiAJaW5zdHBf bW9kZSA9IGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX0NPTlNUQU5UU19NQVNLOwogCWluc3RwX21h c2sgPSBJOTE1X0VYRUNfQ09OU1RBTlRTX01BU0s7CiAJc3dpdGNoIChpbnN0cF9tb2RlKSB7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGM1MGI0YWIuLjE3NThmZDkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMTYxLDYgKzExNjEsMTYgQEAgc3RhdGlj IHZvaWQgZ2VuNl9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQp CiAJCQkgICAgICAgNDA5NiwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKIH0KIAorLyogUERFIFRM QnMgYXJlIGEgcGFpbiBpbnZhbGlkYXRlIHByZSBHRU44LiBJdCByZXF1aXJlcyBhIGNvbnRleHQg cmVsb2FkLiBJZiB3ZQorICogYXJlIHN3aXRjaGluZyBiZXR3ZWVuIGNvbnRleHRzIHdpdGggdGhl IHNhbWUgTFJDQSwgd2UgYWxzbyBtdXN0IGRvIGEgZm9yY2UKKyAqIHJlc3RvcmUuCisgKi8KK3N0 YXRpYyBpbmxpbmUgdm9pZCBtYXJrX3RsYnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0KQoreworCS8qIElmIGN1cnJlbnQgdm0gIT0gdm0sICovCisJcHBndHQtPnBkX2RpcnR5X3Jp bmdzID0gSU5URUxfSU5GTyhwcGd0dC0+YmFzZS5kZXYpLT5yaW5nX21hc2s7Cit9CisKIHN0YXRp YyBpbnQgZ2VuNl9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK IAkJCSAgICAgICB1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQogewpAQCAtMTE4MCw2 ICsxMTkwLDcgQEAgc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLAogCQkJCUdFTjZfUFRFUyk7CiAJfQogCisJbWFya190bGJzX2RpcnR5 KHBwZ3R0KTsKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApp bmRleCBjMzBhZjYyLi4wNzRiMWZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApA QCAtMzAwLDYgKzMwMCw3IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAlzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlIGJhc2U7CiAJc3RydWN0IGtyZWYgcmVmOwogCXN0cnVjdCBkcm1fbW1fbm9k ZSBub2RlOworCXVuc2lnbmVkIGxvbmcgcGRfZGlydHlfcmluZ3M7CiAJdW5zaWduZWQgbnVtX3Bk X2VudHJpZXM7CiAJdW5zaWduZWQgbnVtX3BkX3BhZ2VzOyAvKiBnZW44KyAqLwogCXVuaW9uIHsK LS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=