From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH v2 17/22] drm/i915: error capture with no ggtt slot Date: Thu, 3 Oct 2019 20:24:39 +0100 Message-ID: <20191003192444.10113-18-matthew.auld@intel.com> References: <20191003192444.10113-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 730DC6EA52 for ; Thu, 3 Oct 2019 19:25:14 +0000 (UTC) In-Reply-To: <20191003192444.10113-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 bnVsZ3VlQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0 aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jICAgfCAxOSArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YyB8IDY1ICsrKysrKysrKysrKysrKysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2NCBp bnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IDY0YmY0N2VhYTJhMS4uMDk2ZjUwZjFkZGE1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYwpAQCAtMjY2MSw3ICsyNjYxLDggQEAgc3RhdGljIHZvaWQgZ2d0dF9yZWxl YXNlX2d1Y190b3Aoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIHN0YXRpYyB2b2lkIGNsZWFudXBf aW5pdF9nZ3R0KHN0cnVjdCBpOTE1X2dndHQgKmdndHQpCiB7CiAJZ2d0dF9yZWxlYXNlX2d1Y190 b3AoZ2d0dCk7Ci0JZHJtX21tX3JlbW92ZV9ub2RlKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKTsKKwlp ZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKSkKKwkJZHJtX21t X3JlbW92ZV9ub2RlKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKTsKIH0KIAogc3RhdGljIGludCBpbml0 X2dndHQoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKQEAgLTI2OTIsMTMgKzI2OTMsMTUgQEAgc3Rh dGljIGludCBpbml0X2dndHQoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwogCi0JLyogUmVzZXJ2ZSBhIG1hcHBhYmxlIHNsb3QgZm9yIG91ciBsb2NrbGVz cyBlcnJvciBjYXB0dXJlICovCi0JcmV0ID0gZHJtX21tX2luc2VydF9ub2RlX2luX3JhbmdlKCZn Z3R0LT52bS5tbSwgJmdndHQtPmVycm9yX2NhcHR1cmUsCi0JCQkJCSAgUEFHRV9TSVpFLCAwLCBJ OTE1X0NPTE9SX1VORVZJQ1RBQkxFLAotCQkJCQkgIDAsIGdndHQtPm1hcHBhYmxlX2VuZCwKLQkJ CQkJICBEUk1fTU1fSU5TRVJUX0xPVyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlpZiAo Z2d0dC0+bWFwcGFibGVfZW5kKSB7CisJCS8qIFJlc2VydmUgYSBtYXBwYWJsZSBzbG90IGZvciBv dXIgbG9ja2xlc3MgZXJyb3IgY2FwdHVyZSAqLworCQlyZXQgPSBkcm1fbW1faW5zZXJ0X25vZGVf aW5fcmFuZ2UoJmdndHQtPnZtLm1tLCAmZ2d0dC0+ZXJyb3JfY2FwdHVyZSwKKwkJCQkJCSAgUEFH RV9TSVpFLCAwLCBJOTE1X0NPTE9SX1VORVZJQ1RBQkxFLAorCQkJCQkJICAwLCBnZ3R0LT5tYXBw YWJsZV9lbmQsCisJCQkJCQkgIERSTV9NTV9JTlNFUlRfTE9XKTsKKwkJaWYgKHJldCkKKwkJCXJl dHVybiByZXQ7CisJfQogCiAJLyoKIAkgKiBUaGUgdXBwZXIgcG9ydGlvbiBvZiB0aGUgR3VDIGFk ZHJlc3Mgc3BhY2UgaGFzIGEgc2l6ZWFibGUgaG9sZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1 X2Vycm9yLmMKaW5kZXggNjM4NGEwNmFhNWJmLi5jNmM5NmYwYzZiMjggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgImRpc3Bs YXkvaW50ZWxfb3ZlcmxheS5oIgogCiAjaW5jbHVkZSAiZ2VtL2k5MTVfZ2VtX2NvbnRleHQuaCIK KyNpbmNsdWRlICJnZW0vaTkxNV9nZW1fbG1lbS5oIgogCiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIK ICNpbmNsdWRlICJpOTE1X2dwdV9lcnJvci5oIgpAQCAtMjM1LDYgKzIzNiw3IEBAIHN0cnVjdCBj b21wcmVzcyB7CiAJc3RydWN0IHBhZ2V2ZWMgcG9vbDsKIAlzdHJ1Y3Qgel9zdHJlYW1fcyB6c3Ry ZWFtOwogCXZvaWQgKnRtcDsKKwlib29sIHdjOwogfTsKIAogc3RhdGljIGJvb2wgY29tcHJlc3Nf aW5pdChzdHJ1Y3QgY29tcHJlc3MgKmMpCkBAIC0yOTIsNyArMjk0LDcgQEAgc3RhdGljIGludCBj b21wcmVzc19wYWdlKHN0cnVjdCBjb21wcmVzcyAqYywKIAlzdHJ1Y3Qgel9zdHJlYW1fcyAqenN0 cmVhbSA9ICZjLT56c3RyZWFtOwogCiAJenN0cmVhbS0+bmV4dF9pbiA9IHNyYzsKLQlpZiAoYy0+ dG1wICYmIGk5MTVfbWVtY3B5X2Zyb21fd2MoYy0+dG1wLCBzcmMsIFBBR0VfU0laRSkpCisJaWYg KGMtPndjICYmIGMtPnRtcCAmJiBpOTE1X21lbWNweV9mcm9tX3djKGMtPnRtcCwgc3JjLCBQQUdF X1NJWkUpKQogCQl6c3RyZWFtLT5uZXh0X2luID0gYy0+dG1wOwogCXpzdHJlYW0tPmF2YWlsX2lu ID0gUEFHRV9TSVpFOwogCkBAIC0zNjcsNiArMzY5LDcgQEAgc3RhdGljIHZvaWQgZXJyX2NvbXBy ZXNzaW9uX21hcmtlcihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptKQogCiBzdHJ1 Y3QgY29tcHJlc3MgewogCXN0cnVjdCBwYWdldmVjIHBvb2w7CisJYm9vbCB3YzsKIH07CiAKIHN0 YXRpYyBib29sIGNvbXByZXNzX2luaXQoc3RydWN0IGNvbXByZXNzICpjKQpAQCAtMzg5LDcgKzM5 Miw3IEBAIHN0YXRpYyBpbnQgY29tcHJlc3NfcGFnZShzdHJ1Y3QgY29tcHJlc3MgKmMsCiAJaWYg KCFwdHIpCiAJCXJldHVybiAtRU5PTUVNOwogCi0JaWYgKCFpOTE1X21lbWNweV9mcm9tX3djKHB0 ciwgc3JjLCBQQUdFX1NJWkUpKQorCWlmICghKGMtPndjICYmIGk5MTVfbWVtY3B5X2Zyb21fd2Mo cHRyLCBzcmMsIFBBR0VfU0laRSkpKQogCQltZW1jcHkocHRyLCBzcmMsIFBBR0VfU0laRSk7CiAJ ZHN0LT5wYWdlc1tkc3QtPnBhZ2VfY291bnQrK10gPSBwdHI7CiAKQEAgLTk3MCw3ICs5NzMsNiBA QCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUs CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX29iamVjdCAqZHN0OwogCXVuc2lnbmVkIGxvbmcgbnVt X3BhZ2VzOwogCXN0cnVjdCBzZ3RfaXRlciBpdGVyOwotCWRtYV9hZGRyX3QgZG1hOwogCWludCBy ZXQ7CiAKIAltaWdodF9zbGVlcCgpOwpAQCAtOTk2LDE3ICs5OTgsNTQgQEAgaTkxNV9lcnJvcl9v YmplY3RfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCWRzdC0+cGFnZV9j b3VudCA9IDA7CiAJZHN0LT51bnVzZWQgPSAwOwogCisJY29tcHJlc3MtPndjID0gaTkxNV9nZW1f b2JqZWN0X2lzX2xtZW0odm1hLT5vYmopIHx8CisJCSAgICAgICBkcm1fbW1fbm9kZV9hbGxvY2F0 ZWQoJmdndHQtPmVycm9yX2NhcHR1cmUpOworCiAJcmV0ID0gLUVJTlZBTDsKLQlmb3JfZWFjaF9z Z3RfZGFkZHIoZG1hLCBpdGVyLCB2bWEtPnBhZ2VzKSB7CisJaWYgKGRybV9tbV9ub2RlX2FsbG9j YXRlZCgmZ2d0dC0+ZXJyb3JfY2FwdHVyZSkpIHsKIAkJdm9pZCBfX2lvbWVtICpzOworCQlkbWFf YWRkcl90IGRtYTsKIAotCQlnZ3R0LT52bS5pbnNlcnRfcGFnZSgmZ2d0dC0+dm0sIGRtYSwgc2xv dCwgSTkxNV9DQUNIRV9OT05FLCAwKTsKKwkJZm9yX2VhY2hfc2d0X2RhZGRyKGRtYSwgaXRlciwg dm1hLT5wYWdlcykgeworCQkJZ2d0dC0+dm0uaW5zZXJ0X3BhZ2UoJmdndHQtPnZtLCBkbWEsIHNs b3QsCisJCQkJCSAgICAgSTkxNV9DQUNIRV9OT05FLCAwKTsKIAotCQlzID0gaW9fbWFwcGluZ19t YXBfd2MoJmdndHQtPmlvbWFwLCBzbG90LCBQQUdFX1NJWkUpOwotCQlyZXQgPSBjb21wcmVzc19w YWdlKGNvbXByZXNzLCAodm9pZCAgX19mb3JjZSAqKXMsIGRzdCk7Ci0JCWlvX21hcHBpbmdfdW5t YXAocyk7Ci0JCWlmIChyZXQpCi0JCQlicmVhazsKKwkJCXMgPSBpb19tYXBwaW5nX21hcF93Yygm Z2d0dC0+aW9tYXAsIHNsb3QsIFBBR0VfU0laRSk7CisJCQlyZXQgPSBjb21wcmVzc19wYWdlKGNv bXByZXNzLCAodm9pZCAgX19mb3JjZSAqKXMsIGRzdCk7CisJCQlpb19tYXBwaW5nX3VubWFwKHMp OworCQkJaWYgKHJldCkKKwkJCQlicmVhazsKKwkJfQorCX0gZWxzZSBpZiAoaTkxNV9nZW1fb2Jq ZWN0X2lzX2xtZW0odm1hLT5vYmopKSB7CisJCXN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICpt ZW0gPSB2bWEtPm9iai0+bW0ucmVnaW9uOworCQlkbWFfYWRkcl90IGRtYTsKKworCQlmb3JfZWFj aF9zZ3RfZGFkZHIoZG1hLCBpdGVyLCB2bWEtPnBhZ2VzKSB7CisJCQl2b2lkIF9faW9tZW0gKnM7 CisKKwkJCXMgPSBpb19tYXBwaW5nX21hcF9hdG9taWNfd2MoJm1lbS0+aW9tYXAsIGRtYSk7CisJ CQlyZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCBzLCBkc3QpOworCQkJaW9fbWFwcGluZ191 bm1hcF9hdG9taWMocyk7CisJCQlpZiAocmV0KQorCQkJCWJyZWFrOworCQl9CisJfSBlbHNlIHsK KwkJc3RydWN0IHBhZ2UgKnBhZ2U7CisKKwkJZm9yX2VhY2hfc2d0X3BhZ2UocGFnZSwgaXRlciwg dm1hLT5wYWdlcykgeworCQkJdm9pZCAqczsKKworCQkJZHJtX2NsZmx1c2hfcGFnZXMoJnBhZ2Us IDEpOworCisJCQlzID0ga21hcF9hdG9taWMocGFnZSk7CisJCQlyZXQgPSBjb21wcmVzc19wYWdl KGNvbXByZXNzLCBzLCBkc3QpOworCQkJa3VubWFwX2F0b21pYyhzKTsKKworCQkJZHJtX2NsZmx1 c2hfcGFnZXMoJnBhZ2UsIDEpOworCisJCQlpZiAocmV0KQorCQkJCWJyZWFrOworCQl9CiAJfQog CiAJaWYgKHJldCB8fCBjb21wcmVzc19mbHVzaChjb21wcmVzcywgZHN0KSkgewpAQCAtMTY3NSw5 ICsxNzE0LDExIEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGNhcHR1cmVfZmluZF9lcG9jaChjb25z dCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yKQogc3RhdGljIHZvaWQgY2FwdHVyZV9maW5p c2goc3RydWN0IGk5MTVfZ3B1X3N0YXRlICplcnJvcikKIHsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpn Z3R0ID0gJmVycm9yLT5pOTE1LT5nZ3R0OwotCWNvbnN0IHU2NCBzbG90ID0gZ2d0dC0+ZXJyb3Jf Y2FwdHVyZS5zdGFydDsKIAotCWdndHQtPnZtLmNsZWFyX3JhbmdlKCZnZ3R0LT52bSwgc2xvdCwg UEFHRV9TSVpFKTsKKwlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZnZ3R0LT5lcnJvcl9jYXB0 dXJlKSkgeworCQljb25zdCB1NjQgc2xvdCA9IGdndHQtPmVycm9yX2NhcHR1cmUuc3RhcnQ7CisJ CWdndHQtPnZtLmNsZWFyX3JhbmdlKCZnZ3R0LT52bSwgc2xvdCwgUEFHRV9TSVpFKTsKKwl9CiB9 CiAKICNkZWZpbmUgREFZX0FTX1NFQ09ORFMoeCkgKDI0ICogNjAgKiA2MCAqICh4KSkKLS0gCjIu MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4