From: Arun Siluvery Subject: [PATCH 07/20] drm/i915: Watchdog timeout: Hang detection integration into error handler Date: Wed, 13 Jan 2016 17:28:19 +0000 Message-ID: <1452706112-8617-8-git-send-email-arun.siluvery@linux.intel.com> References: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 9F1B76E11E for ; Wed, 13 Jan 2016 09:28:46 -0800 (PST) In-Reply-To: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 , Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVGhpcyBwYXRjaCBlbmFibGVz IHdhdGNoZG9nIHRpbWVvdXQgaGFuZyBkZXRlY3Rpb24gYXMgYW4gZW50cnlwb2ludCBpbnRvIHRo ZQpkcml2ZXIgZXJyb3IgaGFuZGxlci4gVGhpcyBmb3JtIG9mIGhhbmcgZGV0ZWN0aW9uIG92ZXJy aWRlcyB0aGUgcHJvbW90aW9uIGxvZ2ljCm5vcm1hbGx5IHVzZWQgYnkgdGhlIHBlcmlvZGljIGhh bmcgY2hlY2tlciBhbmQgaW5zdGVhZCBhbGxvd3MgZm9yIGRpcmVjdCBhY2Nlc3MKdG8gdGhlIHBl ci1lbmdpbmUgaGFuZyByZWNvdmVyeSBwYXRoLgoKTk9URTogSSBkb24ndCBrbm93IGlmIEJlbiBX aWRhd3NreSBoYWQgYW55IHBhcnQgaW4gdGhpcyBjb2RlIGZyb20gMyB5ZWFycwphZ28uIFRoZXJl IGhhdmUgYmVlbiBzbyBtYW55IHBlb3BsZSBpbnZvbHZlZCBpbiB0aGlzIGFscmVhZHkgdGhhdCBJ IGFtIGluIG5vCnBvc2l0aW9uIHRvIGtub3cuIElmIEkndmUgbWlzc2VkIGFueW9uZSdzIHNvYiBs aW5lIHBsZWFzZSBsZXQgbWUga25vdy4KClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVsZiA8dG9tYXMu ZWxmQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVy eUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IElhbiBMaXN0ZXIgPGlhbi5saXN0ZXJAaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDIgKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgIDYgKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICB8IDQzICsrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA2ZDFiNmMzLi5kYWJk ZGRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNDcyMCw3ICs0NzIwLDcg QEAgaTkxNV93ZWRnZWRfc2V0KHZvaWQgKmRhdGEsIHU2NCB2YWwpCiAKIAlpbnRlbF9ydW50aW1l X3BtX2dldChkZXZfcHJpdik7CiAKLQlpOTE1X2hhbmRsZV9lcnJvcihkZXYsIDB4MCwgdmFsLAor CWk5MTVfaGFuZGxlX2Vycm9yKGRldiwgMHgwLCBmYWxzZSwgdmFsLAogCQkJICAiTWFudWFsbHkg c2V0dGluZyB3ZWRnZWQgdG8gJWxsdSIsIHZhbCk7CiAKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChk ZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwNzJjYTM3Li44MGU2ZDAxIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI3NjYsOSArMjc2Niw5IEBAIHN0YXRpYyBpbmxp bmUgdm9pZCBpOTE1X2hhbmdjaGVja19yZWluaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCiAvKiBpOTE1X2lycS5jICovCiB2b2lkIGk5MTVfcXVldWVfaGFuZ2NoZWNrKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwotX19wcmludGYoNCwgNSkKLXZvaWQgaTkxNV9oYW5kbGVfZXJy b3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9tYXNrLCBib29sIHdlZGdlZCwK LQkJICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4uKTsKK19fcHJpbnRmKDUsIDYpCit2b2lkIGk5 MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzaywK KwkJICAgICAgIGJvb2wgd2F0Y2hkb2csIGJvb2wgd2VkZ2VkLCBjb25zdCBjaGFyICpmbXQsIC4u Lik7CiAKIGV4dGVybiB2b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfaXJxX2luc3RhbGwoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDg5MzdjODIuLjA3MTA3 MjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjcyNiw2ICsyNzI2LDcgQEAgc3RhdGlj IHZvaWQgaTkxNV9yZXBvcnRfYW5kX2NsZWFyX2VpcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog ICoJCQlJZiBhIHByZXZpb3VzIGVuZ2luZSByZXNldCB3YXMgYXR0ZW1wdGVkIHRvbyByZWNlbnRs eQogICoJCQlvciBpZiBvbmUgb2YgdGhlIGN1cnJlbnQgZW5naW5lIHJlc2V0cyBmYWlscyB3ZSBm YWxsCiAgKgkJCWJhY2sgdG8gbGVnYWN5IGZ1bGwgR1BVIHJlc2V0LgorICogQHdhdGNoZG9nOiAJ CXRydWUgPSBFbmdpbmUgaGFuZyBkZXRlY3RlZCBieSBoYXJkd2FyZSB3YXRjaGRvZy4KICAqIEB3 ZWRnZWQ6IAkJdHJ1ZSA9IEhhbmcgZGV0ZWN0ZWQsIGludm9rZSBoYW5nIHJlY292ZXJ5LgogICog QGZtdCwgLi4uOiAJCUVycm9yIG1lc3NhZ2UgZGVzY3JpYmluZyByZWFzb24gZm9yIGVycm9yLgog ICoKQEAgLTI3MzcsOCArMjczOCw4IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVwb3J0X2FuZF9jbGVh cl9laXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKICAqIHJlc2V0IHRoZSBhc3NvY2lhdGVkIGVu Z2luZS4gRmFpbGluZyB0aGF0LCB0cnkgdG8gZmFsbCBiYWNrIHRvIGxlZ2FjeQogICogZnVsbCBH UFUgcmVzZXQgcmVjb3ZlcnkgbW9kZS4KICAqLwotdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZW5naW5lX21hc2ssIGJvb2wgd2VkZ2VkLAotCQkgICAg ICAgY29uc3QgY2hhciAqZm10LCAuLi4pCit2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzaywKKyAgICAgICAgICAgICAgICAgICAgICAg Ym9vbCB3YXRjaGRvZywgYm9vbCB3ZWRnZWQsIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdmFf bGlzdCBhcmdzOwpAQCAtMjc3NiwyMCArMjc3NywyNyBAQCB2b2lkIGk5MTVfaGFuZGxlX2Vycm9y KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBlbmdpbmVfbWFzaywgYm9vbCB3ZWRnZWQsCiAJ CQl1MzIgaTsKIAogCQkJZm9yX2VhY2hfcmluZyhlbmdpbmUsIGRldl9wcml2LCBpKSB7Ci0JCQkJ dTMyIG5vdywgbGFzdF9lbmdpbmVfcmVzZXRfdGltZWRpZmY7CiAKIAkJCQlpZiAoIShpbnRlbF9y aW5nX2ZsYWcoZW5naW5lKSAmIGVuZ2luZV9tYXNrKSkKIAkJCQkJY29udGludWU7CiAKLQkJCQkv KiBNZWFzdXJlIHRoZSB0aW1lIHNpbmNlIHRoaXMgZW5naW5lIHdhcyBsYXN0IHJlc2V0ICovCi0J CQkJbm93ID0gZ2V0X3NlY29uZHMoKTsKLQkJCQlsYXN0X2VuZ2luZV9yZXNldF90aW1lZGlmZiA9 Ci0JCQkJCW5vdyAtIGVuZ2luZS0+aGFuZ2NoZWNrLmxhc3RfZW5naW5lX3Jlc2V0X3RpbWU7Ci0K LQkJCQlmdWxsX3Jlc2V0ID0gbGFzdF9lbmdpbmVfcmVzZXRfdGltZWRpZmYgPAotCQkJCQlpOTE1 LmdwdV9yZXNldF9wcm9tb3Rpb25fdGltZTsKLQotCQkJCWVuZ2luZS0+aGFuZ2NoZWNrLmxhc3Rf ZW5naW5lX3Jlc2V0X3RpbWUgPSBub3c7CisJCQkJaWYgKCF3YXRjaGRvZykgeworCQkJCQkvKiBN ZWFzdXJlIHRoZSB0aW1lIHNpbmNlIHRoaXMgZW5naW5lIHdhcyBsYXN0IHJlc2V0ICovCisJCQkJ CXUzMiBub3cgPSBnZXRfc2Vjb25kcygpOworCQkJCQl1MzIgbGFzdF9lbmdpbmVfcmVzZXRfdGlt ZWRpZmYgPQorCQkJCQkJbm93IC0gZW5naW5lLT5oYW5nY2hlY2subGFzdF9lbmdpbmVfcmVzZXRf dGltZTsKKworCQkJCQlmdWxsX3Jlc2V0ID0gbGFzdF9lbmdpbmVfcmVzZXRfdGltZWRpZmYgPAor CQkJCQkJaTkxNS5ncHVfcmVzZXRfcHJvbW90aW9uX3RpbWU7CisKKwkJCQkJZW5naW5lLT5oYW5n Y2hlY2subGFzdF9lbmdpbmVfcmVzZXRfdGltZSA9IG5vdzsKKwkJCQl9IGVsc2UgeworCQkJCQkv KgorCQkJCQkgKiBXYXRjaGRvZyB0aW1lb3V0IGFsd2F5cyByZXN1bHRzCisJCQkJCSAqIGluIGVu Z2luZSByZXNldC4KKwkJCQkJICovCisJCQkJCWZ1bGxfcmVzZXQgPSBmYWxzZTsKKwkJCQl9CiAK IAkJCQkvKgogCQkJCSAqIFRoaXMgZW5naW5lIHdhcyBub3QgcmVzZXQgdG9vIHJlY2VudGx5IC0g Z28gYWhlYWQKQEAgLTI4MDAsMTAgKzI4MDgsMTEgQEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZW5naW5lX21hc2ssIGJvb2wgd2VkZ2VkLAogCQkJ CSAqIFRoaXMgY2FuIHN0aWxsIGJlIG92ZXJyaWRkZW4gYnkgYSBnbG9iYWwKIAkJCQkgKiByZXNl dCBlLmcuIGlmIHBlci1lbmdpbmUgcmVzZXQgZmFpbHMuCiAJCQkJICovCi0JCQkJaWYgKCFmdWxs X3Jlc2V0KQorCQkJCWlmICh3YXRjaGRvZyB8fCAhZnVsbF9yZXNldCkKIAkJCQkJYXRvbWljX29y KEk5MTVfRU5HSU5FX1JFU0VUX0lOX1BST0dSRVNTLAogCQkJCQkJJmVuZ2luZS0+aGFuZ2NoZWNr LmZsYWdzKTsKLQkJCQllbHNlCisKKwkJCQlpZiAoZnVsbF9yZXNldCkKIAkJCQkJYnJlYWs7CiAK IAkJCX0gLyogZm9yX2VhY2hfcmluZyAqLwpAQCAtMzE4Nyw3ICszMTk2LDcgQEAgcmluZ19zdHVj ayhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1NjQgYWN0aGQpCiAJICovCiAJdG1wID0g STkxNV9SRUFEX0NUTChyaW5nKTsKIAlpZiAodG1wICYgUklOR19XQUlUKSB7Ci0JCWk5MTVfaGFu ZGxlX2Vycm9yKGRldiwgaW50ZWxfcmluZ19mbGFnKHJpbmcpLCBmYWxzZSwKKwkJaTkxNV9oYW5k bGVfZXJyb3IoZGV2LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZhbHNlLCBmYWxzZSwKIAkJCQkg ICJLaWNraW5nIHN0dWNrIHdhaXQgb24gJXMiLAogCQkJCSAgcmluZy0+bmFtZSk7CiAJCUk5MTVf V1JJVEVfQ1RMKHJpbmcsIHRtcCk7CkBAIC0zMTk5LDcgKzMyMDgsNyBAQCByaW5nX3N0dWNrKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHU2NCBhY3RoZCkKIAkJZGVmYXVsdDoKIAkJCXJl dHVybiBIQU5HQ0hFQ0tfSFVORzsKIAkJY2FzZSAxOgotCQkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2 LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZhbHNlLAorCQkJaTkxNV9oYW5kbGVfZXJyb3IoZGV2 LCBpbnRlbF9yaW5nX2ZsYWcocmluZyksIGZhbHNlLCBmYWxzZSwKIAkJCQkJICAiS2lja2luZyBz dHVjayBzZW1hcGhvcmUgb24gJXMiLAogCQkJCQkgIHJpbmctPm5hbWUpOwogCQkJSTkxNV9XUklU RV9DVEwocmluZywgdG1wKTsKQEAgLTMzNDksNyArMzM1OCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVf aGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCX0KIAogCWlmIChl bmdpbmVfbWFzaykgewotCQlpOTE1X2hhbmRsZV9lcnJvcihkZXYsIGVuZ2luZV9tYXNrLCB0cnVl LCAiUmluZyBodW5nICgweCUwMngpIiwgZW5naW5lX21hc2spOworCQlpOTE1X2hhbmRsZV9lcnJv cihkZXYsIGVuZ2luZV9tYXNrLCBmYWxzZSwgdHJ1ZSwgIlJpbmcgaHVuZyAoMHglMDJ4KSIsIGVu Z2luZV9tYXNrKTsKIAkJZ290byBvdXQ7CiAJfQogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK