From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 07/20] drm/i915: Watchdog timeout: Hang detection integration into error handler Date: Fri, 23 Oct 2015 02:32:29 +0100 Message-ID: <1445563962-20753-8-git-send-email-tomas.elf@intel.com> References: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 333BD6E7D4 for ; Thu, 22 Oct 2015 18:33:20 -0700 (PDT) In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@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: Ian Lister List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBlbmFibGVzIHdhdGNoZG9nIHRpbWVvdXQgaGFuZyBkZXRlY3Rpb24gYXMgYW4g ZW50cnlwb2ludCBpbnRvIHRoZQpkcml2ZXIgZXJyb3IgaGFuZGxlci4gVGhpcyBmb3JtIG9mIGhh bmcgZGV0ZWN0aW9uIG92ZXJyaWRlcyB0aGUgcHJvbW90aW9uIGxvZ2ljCm5vcm1hbGx5IHVzZWQg YnkgdGhlIHBlcmlvZGljIGhhbmcgY2hlY2tlciBhbmQgaW5zdGVhZCBhbGxvd3MgZm9yIGRpcmVj dCBhY2Nlc3MKdG8gdGhlIHBlci1lbmdpbmUgaGFuZyByZWNvdmVyeSBwYXRoLgoKTk9URTogSSBk b24ndCBrbm93IGlmIEJlbiBXaWRhd3NreSBoYWQgYW55IHBhcnQgaW4gdGhpcyBjb2RlIGZyb20g MyB5ZWFycwphZ28uIFRoZXJlIGhhdmUgYmVlbiBzbyBtYW55IHBlb3BsZSBpbnZvbHZlZCBpbiB0 aGlzIGFscmVhZHkgdGhhdCBJIGFtIGluIG5vCnBvc2l0aW9uIHRvIGtub3cuIElmIEkndmUgbWlz c2VkIGFueW9uZSdzIHNvYiBsaW5lIHBsZWFzZSBsZXQgbWUga25vdy4KClNpZ25lZC1vZmYtYnk6 IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1 dmVyeSA8YXJ1bi5zaWx1dmVyeUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IElhbiBMaXN0ZXIg PGlhbi5saXN0ZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgIDYg KysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICB8IDQzICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0 aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpp bmRleCA2OGY4NmNkLi5hYTA1OTg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpA QCAtNDU4Nyw3ICs0NTg3LDcgQEAgaTkxNV93ZWRnZWRfc2V0KHZvaWQgKmRhdGEsIHU2NCB2YWwp CiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKLQlpOTE1X2hhbmRsZV9lcnJv cihkZXYsIDB4MCwgdmFsLAorCWk5MTVfaGFuZGxlX2Vycm9yKGRldiwgMHgwLCBmYWxzZSwgdmFs LAogCQkJICAiTWFudWFsbHkgc2V0dGluZyB3ZWRnZWQgdG8gJWxsdSIsIHZhbCk7CiAKIAlpbnRl bF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBi YmMxOGNjLi5iODZkMzRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3NTYsOSArMjc1 Niw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpOTE1X2hhbmdjaGVja19yZWluaXQoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAvKiBpOTE1X2lycS5jICovCiB2b2lkIGk5MTVfcXVl dWVfaGFuZ2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotX19wcmludGYoNCwgNSkKLXZv aWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9t YXNrLCBib29sIHdlZGdlZCwKLQkJICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4uKTsKK19fcHJp bnRmKDUsIDYpCit2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHUzMiBlbmdpbmVfbWFzaywKKwkJICAgICAgIGJvb2wgd2F0Y2hkb2csIGJvb2wgd2VkZ2VkLCBj b25zdCBjaGFyICpmbXQsIC4uLik7CiAKIGV4dGVybiB2b2lkIGludGVsX2lycV9pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfaXJxX2luc3RhbGwoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmlu ZGV4IGMzNDc4M2EuLjE5YWI3OWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjY2Myw2 ICsyNjYzLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXBvcnRfYW5kX2NsZWFyX2VpcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogICoJCQlJZiBhIHByZXZpb3VzIGVuZ2luZSByZXNldCB3YXMgYXR0 ZW1wdGVkIHRvbyByZWNlbnRseQogICoJCQlvciBpZiBvbmUgb2YgdGhlIGN1cnJlbnQgZW5naW5l IHJlc2V0cyBmYWlscyB3ZSBmYWxsCiAgKgkJCWJhY2sgdG8gbGVnYWN5IGZ1bGwgR1BVIHJlc2V0 LgorICogQHdhdGNoZG9nOiAJCXRydWUgPSBFbmdpbmUgaGFuZyBkZXRlY3RlZCBieSBoYXJkd2Fy ZSB3YXRjaGRvZy4KICAqIEB3ZWRnZWQ6IAkJdHJ1ZSA9IEhhbmcgZGV0ZWN0ZWQsIGludm9rZSBo YW5nIHJlY292ZXJ5LgogICogQGZtdCwgLi4uOiAJCUVycm9yIG1lc3NhZ2UgZGVzY3JpYmluZyBy ZWFzb24gZm9yIGVycm9yLgogICoKQEAgLTI2NzQsOCArMjY3NSw4IEBAIHN0YXRpYyB2b2lkIGk5 MTVfcmVwb3J0X2FuZF9jbGVhcl9laXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIHJlc2V0 IHRoZSBhc3NvY2lhdGVkIGVuZ2luZS4gRmFpbGluZyB0aGF0LCB0cnkgdG8gZmFsbCBiYWNrIHRv IGxlZ2FjeQogICogZnVsbCBHUFUgcmVzZXQgcmVjb3ZlcnkgbW9kZS4KICAqLwotdm9pZCBpOTE1 X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZW5naW5lX21hc2ssIGJv b2wgd2VkZ2VkLAotCQkgICAgICAgY29uc3QgY2hhciAqZm10LCAuLi4pCit2b2lkIGk5MTVfaGFu ZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzaywKKyAgICAg ICAgICAgICAgICAgICAgICAgYm9vbCB3YXRjaGRvZywgYm9vbCB3ZWRnZWQsIGNvbnN0IGNoYXIg KmZtdCwgLi4uKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJdmFfbGlzdCBhcmdzOwpAQCAtMjcxMywyMCArMjcxNCwyNyBAQCB2b2lk IGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFz aywgYm9vbCB3ZWRnZWQsCiAJCQl1MzIgaTsKIAogCQkJZm9yX2VhY2hfcmluZyhlbmdpbmUsIGRl dl9wcml2LCBpKSB7Ci0JCQkJdTMyIG5vdywgbGFzdF9lbmdpbmVfcmVzZXRfdGltZWRpZmY7CiAK IAkJCQlpZiAoIShpbnRlbF9yaW5nX2ZsYWcoZW5naW5lKSAmIGVuZ2luZV9tYXNrKSkKIAkJCQkJ Y29udGludWU7CiAKLQkJCQkvKiBNZWFzdXJlIHRoZSB0aW1lIHNpbmNlIHRoaXMgZW5naW5lIHdh cyBsYXN0IHJlc2V0ICovCi0JCQkJbm93ID0gZ2V0X3NlY29uZHMoKTsKLQkJCQlsYXN0X2VuZ2lu ZV9yZXNldF90aW1lZGlmZiA9Ci0JCQkJCW5vdyAtIGVuZ2luZS0+aGFuZ2NoZWNrLmxhc3RfZW5n aW5lX3Jlc2V0X3RpbWU7Ci0KLQkJCQlmdWxsX3Jlc2V0ID0gbGFzdF9lbmdpbmVfcmVzZXRfdGlt ZWRpZmYgPAotCQkJCQlpOTE1LmdwdV9yZXNldF9wcm9tb3Rpb25fdGltZTsKLQotCQkJCWVuZ2lu ZS0+aGFuZ2NoZWNrLmxhc3RfZW5naW5lX3Jlc2V0X3RpbWUgPSBub3c7CisJCQkJaWYgKCF3YXRj aGRvZykgeworCQkJCQkvKiBNZWFzdXJlIHRoZSB0aW1lIHNpbmNlIHRoaXMgZW5naW5lIHdhcyBs YXN0IHJlc2V0ICovCisJCQkJCXUzMiBub3cgPSBnZXRfc2Vjb25kcygpOworCQkJCQl1MzIgbGFz dF9lbmdpbmVfcmVzZXRfdGltZWRpZmYgPQorCQkJCQkJbm93IC0gZW5naW5lLT5oYW5nY2hlY2su bGFzdF9lbmdpbmVfcmVzZXRfdGltZTsKKworCQkJCQlmdWxsX3Jlc2V0ID0gbGFzdF9lbmdpbmVf cmVzZXRfdGltZWRpZmYgPAorCQkJCQkJaTkxNS5ncHVfcmVzZXRfcHJvbW90aW9uX3RpbWU7CisK KwkJCQkJZW5naW5lLT5oYW5nY2hlY2subGFzdF9lbmdpbmVfcmVzZXRfdGltZSA9IG5vdzsKKwkJ CQl9IGVsc2UgeworCQkJCQkvKgorCQkJCQkgKiBXYXRjaGRvZyB0aW1lb3V0IGFsd2F5cyByZXN1 bHRzCisJCQkJCSAqIGluIGVuZ2luZSByZXNldC4KKwkJCQkJICovCisJCQkJCWZ1bGxfcmVzZXQg PSBmYWxzZTsKKwkJCQl9CiAKIAkJCQkvKgogCQkJCSAqIFRoaXMgZW5naW5lIHdhcyBub3QgcmVz ZXQgdG9vIHJlY2VudGx5IC0gZ28gYWhlYWQKQEAgLTI3MzcsMTAgKzI3NDUsMTEgQEAgdm9pZCBp OTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZW5naW5lX21hc2ss IGJvb2wgd2VkZ2VkLAogCQkJCSAqIFRoaXMgY2FuIHN0aWxsIGJlIG92ZXJyaWRkZW4gYnkgYSBn bG9iYWwKIAkJCQkgKiByZXNldCBlLmcuIGlmIHBlci1lbmdpbmUgcmVzZXQgZmFpbHMuCiAJCQkJ ICovCi0JCQkJaWYgKCFmdWxsX3Jlc2V0KQorCQkJCWlmICh3YXRjaGRvZyB8fCAhZnVsbF9yZXNl dCkKIAkJCQkJYXRvbWljX29yKEk5MTVfRU5HSU5FX1JFU0VUX0lOX1BST0dSRVNTLAogCQkJCQkJ JmVuZ2luZS0+aGFuZ2NoZWNrLmZsYWdzKTsKLQkJCQllbHNlCisKKwkJCQlpZiAoZnVsbF9yZXNl dCkKIAkJCQkJYnJlYWs7CiAKIAkJCX0gLyogZm9yX2VhY2hfcmluZyAqLwpAQCAtMzA3OSw3ICsz MDg4LDcgQEAgcmluZ19zdHVjayhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1NjQgYWN0 aGQpCiAJICovCiAJdG1wID0gSTkxNV9SRUFEX0NUTChyaW5nKTsKIAlpZiAodG1wICYgUklOR19X QUlUKSB7Ci0JCWk5MTVfaGFuZGxlX2Vycm9yKGRldiwgaW50ZWxfcmluZ19mbGFnKHJpbmcpLCBm YWxzZSwKKwkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZh bHNlLCBmYWxzZSwKIAkJCQkgICJLaWNraW5nIHN0dWNrIHdhaXQgb24gJXMiLAogCQkJCSAgcmlu Zy0+bmFtZSk7CiAJCUk5MTVfV1JJVEVfQ1RMKHJpbmcsIHRtcCk7CkBAIC0zMDkxLDcgKzMxMDAs NyBAQCByaW5nX3N0dWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHU2NCBhY3RoZCkK IAkJZGVmYXVsdDoKIAkJCXJldHVybiBIQU5HQ0hFQ0tfSFVORzsKIAkJY2FzZSAxOgotCQkJaTkx NV9oYW5kbGVfZXJyb3IoZGV2LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZhbHNlLAorCQkJaTkx NV9oYW5kbGVfZXJyb3IoZGV2LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZhbHNlLCBmYWxzZSwK IAkJCQkJICAiS2lja2luZyBzdHVjayBzZW1hcGhvcmUgb24gJXMiLAogCQkJCQkgIHJpbmctPm5h bWUpOwogCQkJSTkxNV9XUklURV9DVEwocmluZywgdG1wKTsKQEAgLTMyMjQsNyArMzIzMyw3IEBA IHN0YXRpYyB2b2lkIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3RydWN0ICp3 b3JrKQogCX0KIAogCWlmIChlbmdpbmVfbWFzaykKLQkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2LCBl bmdpbmVfbWFzaywgdHJ1ZSwgIlJpbmcgaHVuZyAoMHglMDJ4KSIsIGVuZ2luZV9tYXNrKTsKKwkJ aTkxNV9oYW5kbGVfZXJyb3IoZGV2LCBlbmdpbmVfbWFzaywgZmFsc2UsIHRydWUsICJSaW5nIGh1 bmcgKDB4JTAyeCkiLCBlbmdpbmVfbWFzayk7CiAKIAlpZiAoYnVzeV9jb3VudCkKIAkJLyogUmVz ZXQgdGltZXIgY2FzZSBjaGlwIGhhbmdzIHdpdGhvdXQgYW5vdGhlciByZXF1ZXN0Ci0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK