From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH v2 26/37] drm/i915: error capture with no ggtt slot Date: Thu, 27 Jun 2019 21:56:22 +0100 Message-ID: <20190627205633.1143-27-matthew.auld@intel.com> References: <20190627205633.1143-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F7866E843 for ; Thu, 27 Jun 2019 20:57:06 +0000 (UTC) In-Reply-To: <20190627205633.1143-1-matthew.auld@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 RnJvbTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KCklmIHRoZSBhcGVydHVyZSBpcyBub3QgYXZhaWxhYmxlIGluIEhXIHdlIGNhbid0IHVz ZSBhIGdndHQgc2xvdCBhbmQgd2MKY29weSwgc28gZmFsbCBiYWNrIHRvIHJlZ3VsYXIga21hcC4K ClNpZ25lZC1vZmYtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3Nw dXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFiZGllbCBKYW51bGd1ZSA8YWJkaWVsLmph bnVsZ3VlQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYyAgIHwgMTYgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJy b3IuYyB8IDYzICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1 NyBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDQzYjk5MTM2YTNhZS4uM2E4OTY1MDQ4YTA2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYwpAQCAtMjg1MCwxMyArMjg1MCwxNSBAQCBzdGF0aWMgaW50IGluaXRf Z2d0dChzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0KQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK LQkvKiBSZXNlcnZlIGEgbWFwcGFibGUgc2xvdCBmb3Igb3VyIGxvY2tsZXNzIGVycm9yIGNhcHR1 cmUgKi8KLQlyZXQgPSBkcm1fbW1faW5zZXJ0X25vZGVfaW5fcmFuZ2UoJmdndHQtPnZtLm1tLCAm Z2d0dC0+ZXJyb3JfY2FwdHVyZSwKLQkJCQkJICBQQUdFX1NJWkUsIDAsIEk5MTVfQ09MT1JfVU5F VklDVEFCTEUsCi0JCQkJCSAgMCwgZ2d0dC0+bWFwcGFibGVfZW5kLAotCQkJCQkgIERSTV9NTV9J TlNFUlRfTE9XKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCWlmIChIQVNfTUFQUEFCTEVf QVBFUlRVUkUoZ2d0dC0+dm0uaTkxNSkpIHsKKwkJLyogUmVzZXJ2ZSBhIG1hcHBhYmxlIHNsb3Qg Zm9yIG91ciBsb2NrbGVzcyBlcnJvciBjYXB0dXJlICovCisJCXJldCA9IGRybV9tbV9pbnNlcnRf bm9kZV9pbl9yYW5nZSgmZ2d0dC0+dm0ubW0sICZnZ3R0LT5lcnJvcl9jYXB0dXJlLAorCQkJCQkJ ICBQQUdFX1NJWkUsIDAsIEk5MTVfQ09MT1JfVU5FVklDVEFCTEUsCisJCQkJCQkgIDAsIGdndHQt Pm1hcHBhYmxlX2VuZCwKKwkJCQkJCSAgRFJNX01NX0lOU0VSVF9MT1cpOworCQlpZiAocmV0KQor CQkJcmV0dXJuIHJldDsKKwl9CiAKIAkvKgogCSAqIFRoZSB1cHBlciBwb3J0aW9uIG9mIHRoZSBH dUMgYWRkcmVzcyBzcGFjZSBoYXMgYSBzaXplYWJsZSBob2xlCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYwppbmRleCA1NDg5Y2Q4NzkzMTUuLmJlOTIwZGViN2VkNyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0yMTgsNyArMjE4LDcgQEAgc3RydWN0IGNv bXByZXNzIHsKIAl2b2lkICp0bXA7CiB9OwogCi1zdGF0aWMgYm9vbCBjb21wcmVzc19pbml0KHN0 cnVjdCBjb21wcmVzcyAqYykKK3N0YXRpYyBib29sIGNvbXByZXNzX2luaXQoc3RydWN0IGNvbXBy ZXNzICpjLCBib29sIHdjKQogewogCXN0cnVjdCB6X3N0cmVhbV9zICp6c3RyZWFtID0gbWVtc2V0 KCZjLT56c3RyZWFtLCAwLCBzaXplb2YoYy0+enN0cmVhbSkpOwogCkBAIC0yMzQsNyArMjM0LDcg QEAgc3RhdGljIGJvb2wgY29tcHJlc3NfaW5pdChzdHJ1Y3QgY29tcHJlc3MgKmMpCiAJfQogCiAJ Yy0+dG1wID0gTlVMTDsKLQlpZiAoaTkxNV9oYXNfbWVtY3B5X2Zyb21fd2MoKSkKKwlpZiAod2Mg JiYgaTkxNV9oYXNfbWVtY3B5X2Zyb21fd2MoKSkKIAkJYy0+dG1wID0gKHZvaWQgKilfX2dldF9m cmVlX3BhZ2UoR0ZQX0FUT01JQyB8IF9fR0ZQX05PV0FSTik7CiAKIAlyZXR1cm4gdHJ1ZTsKQEAg LTMzNSwxMCArMzM1LDEyIEBAIHN0YXRpYyB2b2lkIGVycl9jb21wcmVzc2lvbl9tYXJrZXIoc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSkKICNlbHNlCiAKIHN0cnVjdCBjb21wcmVz cyB7CisJYm9vbCB3YzsKIH07CiAKLXN0YXRpYyBib29sIGNvbXByZXNzX2luaXQoc3RydWN0IGNv bXByZXNzICpjKQorc3RhdGljIGJvb2wgY29tcHJlc3NfaW5pdChzdHJ1Y3QgY29tcHJlc3MgKmMs IGJvb2wgd2MpCiB7CisJYy0+d2MgPSB3YzsKIAlyZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMzU0LDcg KzM1Niw3IEBAIHN0YXRpYyBpbnQgY29tcHJlc3NfcGFnZShzdHJ1Y3QgY29tcHJlc3MgKmMsCiAJ CXJldHVybiAtRU5PTUVNOwogCiAJcHRyID0gKHZvaWQgKilwYWdlOwotCWlmICghaTkxNV9tZW1j cHlfZnJvbV93YyhwdHIsIHNyYywgUEFHRV9TSVpFKSkKKwlpZiAoIShjLT53YyAmJiBpOTE1X21l bWNweV9mcm9tX3djKHB0ciwgc3JjLCBQQUdFX1NJWkUpKSkKIAkJbWVtY3B5KHB0ciwgc3JjLCBQ QUdFX1NJWkUpOwogCWRzdC0+cGFnZXNbZHN0LT5wYWdlX2NvdW50KytdID0gcHRyOwogCkBAIC05 OTgsNyArMTAwMCw2IEBAIGk5MTVfZXJyb3Jfb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSwKIAlzdHJ1Y3QgY29tcHJlc3MgY29tcHJlc3M7CiAJdW5zaWduZWQgbG9u ZyBudW1fcGFnZXM7CiAJc3RydWN0IHNndF9pdGVyIGl0ZXI7Ci0JZG1hX2FkZHJfdCBkbWE7CiAJ aW50IHJldDsKIAogCWlmICghdm1hIHx8ICF2bWEtPnBhZ2VzKQpAQCAtMTAxNywyMiArMTAxOCw1 MiBAQCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUsCiAJZHN0LT5wYWdlX2NvdW50ID0gMDsKIAlkc3QtPnVudXNlZCA9IDA7CiAKLQlpZiAoIWNv bXByZXNzX2luaXQoJmNvbXByZXNzKSkgeworCWlmICghY29tcHJlc3NfaW5pdCgmY29tcHJlc3Ms IGRybV9tbV9ub2RlX2FsbG9jYXRlZCgmZ2d0dC0+ZXJyb3JfY2FwdHVyZSkpKSB7CiAJCWtmcmVl KGRzdCk7CiAJCXJldHVybiBOVUxMOwogCX0KIAogCXJldCA9IC1FSU5WQUw7Ci0JZm9yX2VhY2hf c2d0X2RtYShkbWEsIGl0ZXIsIHZtYS0+cGFnZXMpIHsKKwlpZiAoZHJtX21tX25vZGVfYWxsb2Nh dGVkKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKSkgewogCQl2b2lkIF9faW9tZW0gKnM7CisJCWRtYV9h ZGRyX3QgZG1hOwogCi0JCWdndHQtPnZtLmluc2VydF9wYWdlKCZnZ3R0LT52bSwgZG1hLCBzbG90 LCBJOTE1X0NBQ0hFX05PTkUsIDApOworCQlmb3JfZWFjaF9zZ3RfZG1hKGRtYSwgaXRlciwgdm1h LT5wYWdlcykgeworCQkJZ2d0dC0+dm0uaW5zZXJ0X3BhZ2UoJmdndHQtPnZtLCBkbWEsIHNsb3Qs CisJCQkJCSAgICAgSTkxNV9DQUNIRV9OT05FLCAwKTsKIAotCQlzID0gaW9fbWFwcGluZ19tYXBf YXRvbWljX3djKCZnZ3R0LT5pb21hcCwgc2xvdCk7Ci0JCXJldCA9IGNvbXByZXNzX3BhZ2UoJmNv bXByZXNzLCAodm9pZCAgX19mb3JjZSAqKXMsIGRzdCk7Ci0JCWlvX21hcHBpbmdfdW5tYXBfYXRv bWljKHMpOwotCQlpZiAocmV0KQotCQkJYnJlYWs7CisJCQlzID0gaW9fbWFwcGluZ19tYXBfYXRv bWljX3djKCZnZ3R0LT5pb21hcCwgc2xvdCk7CisJCQlyZXQgPSBjb21wcmVzc19wYWdlKCZjb21w cmVzcywgKHZvaWQgIF9fZm9yY2UgKilzLCBkc3QpOworCQkJaW9fbWFwcGluZ191bm1hcF9hdG9t aWMocyk7CisKKwkJCWlmIChyZXQpCisJCQkJYnJlYWs7CisJCX0KKwl9IGVsc2UgaWYgKGk5MTVf Z2VtX29iamVjdF9pc19sbWVtKHZtYS0+b2JqKSkgeworCQl2b2lkICpzOworCQlkbWFfYWRkcl90 IGRtYTsKKwkJc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24gKm1lbSA9IHZtYS0+b2JqLT5tZW1v cnlfcmVnaW9uOworCisJCWZvcl9lYWNoX3NndF9kbWEoZG1hLCBpdGVyLCB2bWEtPnBhZ2VzKSB7 CisJCQlzID0gaW9fbWFwcGluZ19tYXBfYXRvbWljX3djKCZtZW0tPmlvbWFwLCBkbWEpOworCQkJ cmV0ID0gY29tcHJlc3NfcGFnZSgmY29tcHJlc3MsIHMsIGRzdCk7CisJCQlpb19tYXBwaW5nX3Vu bWFwX2F0b21pYyhzKTsKKworCQkJaWYgKHJldCkKKwkJCQlicmVhazsKKwkJfQorCX0gZWxzZSB7 CisJCXZvaWQgKnM7CisJCXN0cnVjdCBwYWdlICpwYWdlOworCisJCWZvcl9lYWNoX3NndF9wYWdl KHBhZ2UsIGl0ZXIsIHZtYS0+cGFnZXMpIHsKKwkJCXMgPSBrbWFwX2F0b21pYyhwYWdlKTsKKwkJ CXJldCA9IGNvbXByZXNzX3BhZ2UoJmNvbXByZXNzLCBzLCBkc3QpOworCQkJa3VubWFwX2F0b21p YyhzKTsKKworCQkJaWYgKHJldCkKKwkJCQlicmVhazsKKwkJfQogCX0KIAogCWlmIChyZXQgfHwg Y29tcHJlc3NfZmx1c2goJmNvbXByZXNzLCBkc3QpKSB7CkBAIC0xNzQ1LDkgKzE3NzYsMTEgQEAg c3RhdGljIHVuc2lnbmVkIGxvbmcgY2FwdHVyZV9maW5kX2Vwb2NoKGNvbnN0IHN0cnVjdCBpOTE1 X2dwdV9zdGF0ZSAqZXJyb3IpCiBzdGF0aWMgdm9pZCBjYXB0dXJlX2ZpbmlzaChzdHJ1Y3QgaTkx NV9ncHVfc3RhdGUgKmVycm9yKQogewogCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZXJyb3It Pmk5MTUtPmdndHQ7Ci0JY29uc3QgdTY0IHNsb3QgPSBnZ3R0LT5lcnJvcl9jYXB0dXJlLnN0YXJ0 OwogCi0JZ2d0dC0+dm0uY2xlYXJfcmFuZ2UoJmdndHQtPnZtLCBzbG90LCBQQUdFX1NJWkUpOwor CWlmIChkcm1fbW1fbm9kZV9hbGxvY2F0ZWQoJmdndHQtPmVycm9yX2NhcHR1cmUpKSB7CisJCWNv bnN0IHU2NCBzbG90ID0gZ2d0dC0+ZXJyb3JfY2FwdHVyZS5zdGFydDsKKwkJZ2d0dC0+dm0uY2xl YXJfcmFuZ2UoJmdndHQtPnZtLCBzbG90LCBQQUdFX1NJWkUpOworCX0KIH0KIAogc3RhdGljIGlu dCBjYXB0dXJlKHZvaWQgKmRhdGEpCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeA==