From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915: Convert hangcheck from a timer into a delayed work item Date: Fri, 23 Jan 2015 14:44:07 +0200 Message-ID: <1422017048-4792-1-git-send-email-mika.kuoppala@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 A6D396E8CC for ; Fri, 23 Jan 2015 04:44:13 -0800 (PST) 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: Jani Nikula , Daniel Vetter , miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpXaGVuIHJ1biBh cyBhIHRpbWVyLCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKCkgbXVzdCBhZGhlcmUgdG8gYWxsIHRo ZQpydWxlcyBvZiBydW5uaW5nIGluIGEgc29mdGlycSBjb250ZXh0LiBUaGlzIGlzIGFkdmFudGFn ZW91cyB0byB1cyBhcyB3ZQp3YW50IHRvIG1pbmltaXNlIHRoZSByaXNrIHRoYXQgYSBkcml2ZXIg YnVnIHdpbGwgcHJldmVudCB1cyBmcm9tCmRldGVjdGluZyBhIGh1bmcgR1BVLiBIb3dldmVyLCB0 aGF0IGlzIGlycmVsZXZhbnQgaWYgdGhlIGRyaXZlciBidWcKcHJldmVudHMgdXMgZnJvbSByZXNl dHRpbmcgYW5kIHJlY292ZXJpbmcuIFN0aWxsIGl0IGlzIHBydWRlbnQgbm90IHRvCnJlbHkgb24g bXV0ZXhlcyBpbnNpZGUgdGhlIGNoZWNrZXIsIGJ1dCBnaXZlbiB0aGUgY29hcnNlbmVzcyBvZgpk ZXYtPnN0cnVjdF9tdXRleCBkb2luZyBzbyBpcyBleHRyZW1lbHkgaGFyZC4KCkdpdmUgaW4gYW5k IHJ1biBmcm9tIGEgd29yayBxdWV1ZSwgaS5lLiBvdXRzaWRlIG9mIHNvZnRpcnEuCgp2MjoKClRo ZSBjb252ZXJzaW9uIGRvZXMgaGF2ZSBvbmUgc2lnbmlmaWNhbnQgY2hhbmdlLCBmcm9tIHRoZSB1 c2Ugb2YKbW9kX3RpbWVyIHRvIHNjaGVkdWxlX2RlbGF5ZWRfd29yaywgbWVhbnMgdGhhdCB0aGUg dGltZSB0aGF0IHdlIGV4ZWN1dGUKdGhlIGZpcnN0IGhhbmdjaGVjayBpcyBmaXhlZCBhbmQgbm90 IGNvbnRpbnVhbGx5IGRlZmVycmVkIGJ5IGxhdGVyIHdvcmsuClRoaXMgaGFzIHRoZSBhZHZhbnRh Z2Ugb2Ygbm90IGFsbG93aW5nIHVzZXJzcGFjZSB0byBmaWxsIHRoZSByaW5nIGJlZm9yZQpoYW5n Y2hlY2sgY2FuIGZpbmFsbHkgcnVuLiBBdCB0aGUgc2FtZSB0aW1lLCBpdCByZW1vdmVzIHRoZSBh YmlsaXR5IGZvcgp0aGUgaW50ZXJydXB0IHRvIGRlZmVyIHRoZSBoYW5nY2hlY2sgYXMgd2VsbC4g VGhpcyBpcyBzZW5zaWJsZSBmb3IgdGhhdAphbiBpbnRlcnJ1cHQgaXMgb25seSBmb3IgYSBzaW5n bGUgZW5naW5lLCB3aGVyZWFzIHdlIHBlcmZvcm0gaGFuZ2NoZWNrCmdsb2JhbGx5LCBzbyB3aGls c3Qgb25lIHJpbmcgbWF5IGhhdmUgaHVuZywgdGhlIG90aGVyIGNvdWxkIGJlIHJ1bm5pbmcKbm9y bWFsbHkgYW5kIHByZXZlbnRpbmcgdGhlIGhhbmdjaGVjayBmcm9tIGZpcmluZy4KCkNjOiBKYW5p IE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZG5haWVs LnZldHRlckBmZndsbC5jaG0+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPiAodjIpClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eu a3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8ICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8IDIzICsr KysrKysrKy0tLS0tLS0tLS0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyks IDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IDUxZThmZTUuLjdj NjQ2NjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtOTM0LDcgKzkzNCw3IEBAIGludCBp OTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiAKIAkvKiBGcmVl IGVycm9yIHN0YXRlIGFmdGVyIGludGVycnVwdHMgYXJlIGZ1bGx5IGRpc2FibGVkLiAqLwotCWRl bF90aW1lcl9zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmhhbmdjaGVja190aW1lcik7CisJY2Fu Y2VsX2RlbGF5ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmhhbmdjaGVja193b3Jr KTsKIAljYW5jZWxfd29ya19zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmspOwogCWk5MTVf ZGVzdHJveV9lcnJvcl9zdGF0ZShkZXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA2 NmM3MmJkLi5jYjE0NjhkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTEzOTYsNyArMTM5 Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfcnVudGltZV9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRl dmljZSkKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlkZWxfdGltZXJfc3luYygmZGV2X3ByaXYtPmdw dV9lcnJvci5oYW5nY2hlY2tfdGltZXIpOworCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmZGV2 X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yayk7CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2Fr ZV9yZXNldChkZXYsIGZhbHNlKTsKIAlkZXZfcHJpdi0+cG0uc3VzcGVuZGVkID0gdHJ1ZTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMGQ2N2IxNy4uY2UyYWNkZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC0xMzQ1LDcgKzEzNDUsNyBAQCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig ewogCS8qIEhhbmcgZ3B1IHR3aWNlIGluIHRoaXMgd2luZG93IGFuZCB5b3VyIGNvbnRleHQgZ2V0 cyBiYW5uZWQgKi8KICNkZWZpbmUgRFJNX0k5MTVfQ1RYX0JBTl9QRVJJT0QgRElWX1JPVU5EX1VQ KDgqRFJNX0k5MTVfSEFOR0NIRUNLX1BFUklPRCwgMTAwMCkKIAotCXN0cnVjdCB0aW1lcl9saXN0 IGhhbmdjaGVja190aW1lcjsKKwlzdHJ1Y3QgZGVsYXllZF93b3JrIGhhbmdjaGVja193b3JrOwog CiAJLyogRm9yIHJlc2V0IGFuZCBlcnJvcl9zdGF0ZSBoYW5kbGluZy4gKi8KIAlzcGlubG9ja190 IGxvY2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmYzgxODg5Li44YTE3OGNkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ2MTUsNyArNDYxNSw3IEBAIGk5MTVfZ2VtX3N1c3Bl bmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9zdG9wX3JpbmdidWZmZXJzKGRl dik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKLQlkZWxfdGltZXJfc3lu YygmZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfdGltZXIpOworCWNhbmNlbF9kZWxheWVk X3dvcmtfc3luYygmZGV2X3ByaXYtPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yayk7CiAJY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+bW0ucmV0aXJlX3dvcmspOwogCWZsdXNoX2Rl bGF5ZWRfd29yaygmZGV2X3ByaXYtPm1tLmlkbGVfd29yayk7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCmluZGV4IDI1YjIyOTkuLmExODhjN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAt Mjk4MCwxMCArMjk4MCwxMiBAQCByaW5nX3N0dWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsIHU2NCBhY3RoZCkKICAqIHdlIGtpY2sgdGhlIHJpbmcuIElmIHdlIHNlZSBubyBwcm9ncmVz cyBvbiB0aHJlZSBzdWJzZXF1ZW50IGNhbGxzCiAgKiB3ZSBhc3N1bWUgY2hpcCBpcyB3ZWRnZWQg YW5kIHRyeSB0byBmaXggaXQgYnkgcmVzZXR0aW5nIHRoZSBjaGlwLgogICovCi1zdGF0aWMgdm9p ZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHVuc2lnbmVkIGxvbmcgZGF0YSkKK3N0YXRpYyB2b2lk IGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewotCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAoc3RydWN0IGRybV9kZXZpY2UgKilkYXRhOwotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KKwkJY29udGFpbmVyX29mKHdvcmssIHR5cGVv ZigqZGV2X3ByaXYpLAorCQkJICAgICBncHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmsud29yayk7CisJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZzsKIAlpbnQgaTsKIAlpbnQgYnVzeV9jb3VudCA9IDAsIHJpbmdzX2h1bmcg PSAwOwpAQCAtMzA5NywxNyArMzA5OSwxMSBAQCBzdGF0aWMgdm9pZCBpOTE1X2hhbmdjaGVja19l bGFwc2VkKHVuc2lnbmVkIGxvbmcgZGF0YSkKIAogdm9pZCBpOTE1X3F1ZXVlX2hhbmdjaGVjayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IHRpbWVyX2xpc3QgKnRpbWVyID0gJmRl dl9wcml2LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3RpbWVyOwotCiAJaWYgKCFpOTE1LmVuYWJsZV9o YW5nY2hlY2spCiAJCXJldHVybjsKIAotCS8qIERvbid0IGNvbnRpbnVhbGx5IGRlZmVyIHRoZSBo YW5nY2hlY2ssIGJ1dCBtYWtlIHN1cmUgaXQgaXMgYWN0aXZlICovCi0JaWYgKHRpbWVyX3BlbmRp bmcodGltZXIpKQotCQlyZXR1cm47Ci0JbW9kX3RpbWVyKHRpbWVyLAotCQkgIHJvdW5kX2ppZmZp ZXNfdXAoamlmZmllcyArIERSTV9JOTE1X0hBTkdDSEVDS19KSUZGSUVTKSk7CisJc2NoZWR1bGVf ZGVsYXllZF93b3JrKCZ0b19pOTE1KGRldiktPmdwdV9lcnJvci5oYW5nY2hlY2tfd29yaywKKwkJ CSAgICAgIHJvdW5kX2ppZmZpZXNfdXBfcmVsYXRpdmUoRFJNX0k5MTVfSEFOR0NIRUNLX0pJRkZJ RVMpKTsKIH0KIAogc3RhdGljIHZvaWQgaWJ4X2lycV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQpAQCAtNDM1MSw5ICs0MzQ3LDggQEAgdm9pZCBpbnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZWxzZQogCQlkZXZfcHJpdi0+cG1fcnBzX2V2ZW50 cyA9IEdFTjZfUE1fUlBTX0VWRU5UUzsKIAotCXNldHVwX3RpbWVyKCZkZXZfcHJpdi0+Z3B1X2Vy cm9yLmhhbmdjaGVja190aW1lciwKLQkJICAgIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQsCi0JCSAg ICAodW5zaWduZWQgbG9uZykgZGV2KTsKKwlJTklUX0RFTEFZRURfV09SSygmZGV2X3ByaXYtPmdw dV9lcnJvci5oYW5nY2hlY2tfd29yaywKKwkJCSAgaTkxNV9oYW5nY2hlY2tfZWxhcHNlZCk7CiAJ SU5JVF9ERUxBWUVEX1dPUksoJmRldl9wcml2LT5ob3RwbHVnX3JlZW5hYmxlX3dvcmssCiAJCQkg IGludGVsX2hwZF9pcnFfcmVlbmFibGVfd29yayk7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=