From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 19/22] drm/i915: error capture with no ggtt slot Date: Fri, 27 Sep 2019 18:34:06 +0100 Message-ID: <20190927173409.31175-20-matthew.auld@intel.com> References: <20190927173409.31175-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90D61890AF for ; Fri, 27 Sep 2019 17:34:42 +0000 (UTC) In-Reply-To: <20190927173409.31175-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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KCklmIHRoZSBhcGVydHVyZSBpcyBub3QgYXZhaWxhYmxlIGluIEhXIHdlIGNhbid0IHVz ZSBhIGdndHQgc2xvdCBhbmQgd2MKY29weSwgc28gZmFsbCBiYWNrIHRvIHJlZ3VsYXIga21hcC4K ClNpZ25lZC1vZmYtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3Nw dXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFiZGllbCBKYW51bGd1ZSA8YWJkaWVsLmph bnVsZ3VlQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0 aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jICAgfCAxOSArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YyB8IDY1ICsrKysrKysrKysrKysrKysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2NCBp bnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IDFiZTdiMjM2ZjIzNC4uMjlmOWM0M2IyYzY4IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYwpAQCAtMjY2MSw3ICsyNjYxLDggQEAgc3RhdGljIHZvaWQgZ2d0dF9yZWxl YXNlX2d1Y190b3Aoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIHN0YXRpYyB2b2lkIGNsZWFudXBf aW5pdF9nZ3R0KHN0cnVjdCBpOTE1X2dndHQgKmdndHQpCiB7CiAJZ2d0dF9yZWxlYXNlX2d1Y190 b3AoZ2d0dCk7Ci0JZHJtX21tX3JlbW92ZV9ub2RlKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKTsKKwlp ZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKSkKKwkJZHJtX21t X3JlbW92ZV9ub2RlKCZnZ3R0LT5lcnJvcl9jYXB0dXJlKTsKIH0KIAogc3RhdGljIGludCBpbml0 X2dndHQoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKQEAgLTI2OTIsMTMgKzI2OTMsMTUgQEAgc3Rh dGljIGludCBpbml0X2dndHQoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwogCi0JLyogUmVzZXJ2ZSBhIG1hcHBhYmxlIHNsb3QgZm9yIG91ciBsb2NrbGVz cyBlcnJvciBjYXB0dXJlICovCi0JcmV0ID0gZHJtX21tX2luc2VydF9ub2RlX2luX3JhbmdlKCZn Z3R0LT52bS5tbSwgJmdndHQtPmVycm9yX2NhcHR1cmUsCi0JCQkJCSAgUEFHRV9TSVpFLCAwLCBJ OTE1X0NPTE9SX1VORVZJQ1RBQkxFLAotCQkJCQkgIDAsIGdndHQtPm1hcHBhYmxlX2VuZCwKLQkJ CQkJICBEUk1fTU1fSU5TRVJUX0xPVyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlpZiAo SEFTX01BUFBBQkxFX0FQRVJUVVJFKGdndHQtPnZtLmk5MTUpKSB7CisJCS8qIFJlc2VydmUgYSBt YXBwYWJsZSBzbG90IGZvciBvdXIgbG9ja2xlc3MgZXJyb3IgY2FwdHVyZSAqLworCQlyZXQgPSBk cm1fbW1faW5zZXJ0X25vZGVfaW5fcmFuZ2UoJmdndHQtPnZtLm1tLCAmZ2d0dC0+ZXJyb3JfY2Fw dHVyZSwKKwkJCQkJCSAgUEFHRV9TSVpFLCAwLCBJOTE1X0NPTE9SX1VORVZJQ1RBQkxFLAorCQkJ CQkJICAwLCBnZ3R0LT5tYXBwYWJsZV9lbmQsCisJCQkJCQkgIERSTV9NTV9JTlNFUlRfTE9XKTsK KwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQogCiAJLyoKIAkgKiBUaGUgdXBwZXIgcG9y dGlvbiBvZiB0aGUgR3VDIGFkZHJlc3Mgc3BhY2UgaGFzIGEgc2l6ZWFibGUgaG9sZQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNjM4NGEwNmFhNWJmLi5jNmM5NmYwYzZi MjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNDAsNiArNDAsNyBA QAogI2luY2x1ZGUgImRpc3BsYXkvaW50ZWxfb3ZlcmxheS5oIgogCiAjaW5jbHVkZSAiZ2VtL2k5 MTVfZ2VtX2NvbnRleHQuaCIKKyNpbmNsdWRlICJnZW0vaTkxNV9nZW1fbG1lbS5oIgogCiAjaW5j bHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJpOTE1X2dwdV9lcnJvci5oIgpAQCAtMjM1LDYg KzIzNiw3IEBAIHN0cnVjdCBjb21wcmVzcyB7CiAJc3RydWN0IHBhZ2V2ZWMgcG9vbDsKIAlzdHJ1 Y3Qgel9zdHJlYW1fcyB6c3RyZWFtOwogCXZvaWQgKnRtcDsKKwlib29sIHdjOwogfTsKIAogc3Rh dGljIGJvb2wgY29tcHJlc3NfaW5pdChzdHJ1Y3QgY29tcHJlc3MgKmMpCkBAIC0yOTIsNyArMjk0 LDcgQEAgc3RhdGljIGludCBjb21wcmVzc19wYWdlKHN0cnVjdCBjb21wcmVzcyAqYywKIAlzdHJ1 Y3Qgel9zdHJlYW1fcyAqenN0cmVhbSA9ICZjLT56c3RyZWFtOwogCiAJenN0cmVhbS0+bmV4dF9p biA9IHNyYzsKLQlpZiAoYy0+dG1wICYmIGk5MTVfbWVtY3B5X2Zyb21fd2MoYy0+dG1wLCBzcmMs IFBBR0VfU0laRSkpCisJaWYgKGMtPndjICYmIGMtPnRtcCAmJiBpOTE1X21lbWNweV9mcm9tX3dj KGMtPnRtcCwgc3JjLCBQQUdFX1NJWkUpKQogCQl6c3RyZWFtLT5uZXh0X2luID0gYy0+dG1wOwog CXpzdHJlYW0tPmF2YWlsX2luID0gUEFHRV9TSVpFOwogCkBAIC0zNjcsNiArMzY5LDcgQEAgc3Rh dGljIHZvaWQgZXJyX2NvbXByZXNzaW9uX21hcmtlcihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3Rh dGVfYnVmICptKQogCiBzdHJ1Y3QgY29tcHJlc3MgewogCXN0cnVjdCBwYWdldmVjIHBvb2w7CisJ Ym9vbCB3YzsKIH07CiAKIHN0YXRpYyBib29sIGNvbXByZXNzX2luaXQoc3RydWN0IGNvbXByZXNz ICpjKQpAQCAtMzg5LDcgKzM5Miw3IEBAIHN0YXRpYyBpbnQgY29tcHJlc3NfcGFnZShzdHJ1Y3Qg Y29tcHJlc3MgKmMsCiAJaWYgKCFwdHIpCiAJCXJldHVybiAtRU5PTUVNOwogCi0JaWYgKCFpOTE1 X21lbWNweV9mcm9tX3djKHB0ciwgc3JjLCBQQUdFX1NJWkUpKQorCWlmICghKGMtPndjICYmIGk5 MTVfbWVtY3B5X2Zyb21fd2MocHRyLCBzcmMsIFBBR0VfU0laRSkpKQogCQltZW1jcHkocHRyLCBz cmMsIFBBR0VfU0laRSk7CiAJZHN0LT5wYWdlc1tkc3QtPnBhZ2VfY291bnQrK10gPSBwdHI7CiAK QEAgLTk3MCw3ICs5NzMsNiBAQCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUsCiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX29iamVjdCAqZHN0Owog CXVuc2lnbmVkIGxvbmcgbnVtX3BhZ2VzOwogCXN0cnVjdCBzZ3RfaXRlciBpdGVyOwotCWRtYV9h ZGRyX3QgZG1hOwogCWludCByZXQ7CiAKIAltaWdodF9zbGVlcCgpOwpAQCAtOTk2LDE3ICs5OTgs NTQgQEAgaTkxNV9lcnJvcl9vYmplY3RfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LAogCWRzdC0+cGFnZV9jb3VudCA9IDA7CiAJZHN0LT51bnVzZWQgPSAwOwogCisJY29tcHJl c3MtPndjID0gaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0odm1hLT5vYmopIHx8CisJCSAgICAgICBk cm1fbW1fbm9kZV9hbGxvY2F0ZWQoJmdndHQtPmVycm9yX2NhcHR1cmUpOworCiAJcmV0ID0gLUVJ TlZBTDsKLQlmb3JfZWFjaF9zZ3RfZGFkZHIoZG1hLCBpdGVyLCB2bWEtPnBhZ2VzKSB7CisJaWYg KGRybV9tbV9ub2RlX2FsbG9jYXRlZCgmZ2d0dC0+ZXJyb3JfY2FwdHVyZSkpIHsKIAkJdm9pZCBf X2lvbWVtICpzOworCQlkbWFfYWRkcl90IGRtYTsKIAotCQlnZ3R0LT52bS5pbnNlcnRfcGFnZSgm Z2d0dC0+dm0sIGRtYSwgc2xvdCwgSTkxNV9DQUNIRV9OT05FLCAwKTsKKwkJZm9yX2VhY2hfc2d0 X2RhZGRyKGRtYSwgaXRlciwgdm1hLT5wYWdlcykgeworCQkJZ2d0dC0+dm0uaW5zZXJ0X3BhZ2Uo JmdndHQtPnZtLCBkbWEsIHNsb3QsCisJCQkJCSAgICAgSTkxNV9DQUNIRV9OT05FLCAwKTsKIAot CQlzID0gaW9fbWFwcGluZ19tYXBfd2MoJmdndHQtPmlvbWFwLCBzbG90LCBQQUdFX1NJWkUpOwot CQlyZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCAodm9pZCAgX19mb3JjZSAqKXMsIGRzdCk7 Ci0JCWlvX21hcHBpbmdfdW5tYXAocyk7Ci0JCWlmIChyZXQpCi0JCQlicmVhazsKKwkJCXMgPSBp b19tYXBwaW5nX21hcF93YygmZ2d0dC0+aW9tYXAsIHNsb3QsIFBBR0VfU0laRSk7CisJCQlyZXQg PSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCAodm9pZCAgX19mb3JjZSAqKXMsIGRzdCk7CisJCQlp b19tYXBwaW5nX3VubWFwKHMpOworCQkJaWYgKHJldCkKKwkJCQlicmVhazsKKwkJfQorCX0gZWxz ZSBpZiAoaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0odm1hLT5vYmopKSB7CisJCXN0cnVjdCBpbnRl bF9tZW1vcnlfcmVnaW9uICptZW0gPSB2bWEtPm9iai0+bW0ucmVnaW9uOworCQlkbWFfYWRkcl90 IGRtYTsKKworCQlmb3JfZWFjaF9zZ3RfZGFkZHIoZG1hLCBpdGVyLCB2bWEtPnBhZ2VzKSB7CisJ CQl2b2lkIF9faW9tZW0gKnM7CisKKwkJCXMgPSBpb19tYXBwaW5nX21hcF9hdG9taWNfd2MoJm1l bS0+aW9tYXAsIGRtYSk7CisJCQlyZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCBzLCBkc3Qp OworCQkJaW9fbWFwcGluZ191bm1hcF9hdG9taWMocyk7CisJCQlpZiAocmV0KQorCQkJCWJyZWFr OworCQl9CisJfSBlbHNlIHsKKwkJc3RydWN0IHBhZ2UgKnBhZ2U7CisKKwkJZm9yX2VhY2hfc2d0 X3BhZ2UocGFnZSwgaXRlciwgdm1hLT5wYWdlcykgeworCQkJdm9pZCAqczsKKworCQkJZHJtX2Ns Zmx1c2hfcGFnZXMoJnBhZ2UsIDEpOworCisJCQlzID0ga21hcF9hdG9taWMocGFnZSk7CisJCQly ZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCBzLCBkc3QpOworCQkJa3VubWFwX2F0b21pYyhz KTsKKworCQkJZHJtX2NsZmx1c2hfcGFnZXMoJnBhZ2UsIDEpOworCisJCQlpZiAocmV0KQorCQkJ CWJyZWFrOworCQl9CiAJfQogCiAJaWYgKHJldCB8fCBjb21wcmVzc19mbHVzaChjb21wcmVzcywg ZHN0KSkgewpAQCAtMTY3NSw5ICsxNzE0LDExIEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIGNhcHR1 cmVfZmluZF9lcG9jaChjb25zdCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yKQogc3RhdGlj IHZvaWQgY2FwdHVyZV9maW5pc2goc3RydWN0IGk5MTVfZ3B1X3N0YXRlICplcnJvcikKIHsKIAlz dHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmVycm9yLT5pOTE1LT5nZ3R0OwotCWNvbnN0IHU2NCBz bG90ID0gZ2d0dC0+ZXJyb3JfY2FwdHVyZS5zdGFydDsKIAotCWdndHQtPnZtLmNsZWFyX3Jhbmdl KCZnZ3R0LT52bSwgc2xvdCwgUEFHRV9TSVpFKTsKKwlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVk KCZnZ3R0LT5lcnJvcl9jYXB0dXJlKSkgeworCQljb25zdCB1NjQgc2xvdCA9IGdndHQtPmVycm9y X2NhcHR1cmUuc3RhcnQ7CisJCWdndHQtPnZtLmNsZWFyX3JhbmdlKCZnZ3R0LT52bSwgc2xvdCwg UEFHRV9TSVpFKTsKKwl9CiB9CiAKICNkZWZpbmUgREFZX0FTX1NFQ09ORFMoeCkgKDI0ICogNjAg KiA2MCAqICh4KSkKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4