From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [RFC 07/11] drm/i915: Reinstate hang recovery work queue. Date: Mon, 8 Jun 2015 18:03:25 +0100 Message-ID: <1433783009-17251-8-git-send-email-tomas.elf@intel.com> References: <1433783009-17251-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id AF0866E67D for ; Mon, 8 Jun 2015 10:06:48 -0700 (PDT) In-Reply-To: <1433783009-17251-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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgdXNlZCB0byBiZSBhIHdvcmsgcXVldWUgc2VwYXJhdGluZyB0aGUgZXJyb3IgaGFuZGxl ciBmcm9tIHRoZSBoYW5nCnJlY292ZXJ5IHBhdGgsIHdoaWNoIHdhcyByZW1vdmVkIGEgd2hpbGUg YmFjayBpbiB0aGlzIGNvbW1pdDoKCgljb21taXQgYjhkMjRhMDY1NjgzNjgwNzZlYmQ1YTg1OGEw MTE2OTlhOTdiZmE0MgoJQXV0aG9yOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4 LmludGVsLmNvbT4KCURhdGU6ICAgV2VkIEphbiAyOCAxNzowMzoxNCAyMDE1ICswMjAwCgoJICAg IGRybS9pOTE1OiBSZW1vdmUgbmVzdGVkIHdvcmsgaW4gZ3B1IGVycm9yIGhhbmRsaW5nCgpOb3cg d2UgbmVlZCB0byByZXZlcnQgbW9zdCBvZiB0aGF0IGNvbW1pdCBzaW5jZSB0aGUgd29yayBxdWV1 ZSBzZXBhcmF0aW5nIGhhbmcKZGV0ZWN0aW9uIGZyb20gaGFuZyByZWNvdmVyeSBpcyBuZWVkZWQg aW4gcHJlcGFyYXRpb24gZm9yIHRoZSB1cGNvbWluZyB3YXRjaGRvZwp0aW1lb3V0IGZlYXR1cmUu IFRoZSB3YXRjaGRvZyBpbnRlcnJ1cHQgc2VydmljZSByb3V0aW5lIHdpbGwgYmUgYSBzZWNvbmQK Y2FsbHNpdGUgb2YgdGhlIGVycm9yIGhhbmRsZXIgYWxvbmdzaWRlIHRoZSBwZXJpb2RpYyBoYW5n IGNoZWNrZXIsIHdoaWNoIHJ1bnMKaW4gYSB3b3JrIHF1ZXVlIGNvbnRleHQuIFNlZWluZyBhcyB0 aGUgZXJyb3IgaGFuZGxlciB3aWxsIGJlIHNlcnZpbmcgYSBjYWxsZXIKaW4gYSBoYXJkIGludGVy cnVwdCBleGVjdXRpb24gY29udGV4dCB0aGF0IG1lYW5zIHRoYXQgdGhlIGVycm9yIGhhbmRsZXIg bXVzdApuZXZlciBlbmQgdXAgaW4gYSBzaXR1YXRpb24gd2hlcmUgaXQgbmVlZHMgdG8gZ3JhYiB0 aGUgc3RydWN0X211dGV4LgpVbmZvcnR1bmF0ZWx5LCB0aGF0IGlzIGV4YWN0bHkgd2hhdCB3ZSBu ZWVkIHRvIGRvIGZpcnN0IGF0IHRoZSBzdGFydCBvZiB0aGUKaGFuZyByZWNvdmVyeSBwYXRoLCB3 aGljaCBtaWdodCBwb3RlbnRpYWxseSBzbGVlcCBpZiB0aGUgc3RydWN0X211dGV4IGlzCmFscmVh ZHkgaGVsZCBieSBhbm90aGVyIHRocmVhZC4gTm90IGdvb2Qgd2hlbiB5b3UncmUgaW4gYSBoYXJk IGludGVycnVwdApjb250ZXh0LgoKU2lnbmVkLW9mZi1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZA aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgICAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgICAgMSArCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jIHwgICAyOCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiAzIGZp bGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZG1hLmMKaW5kZXggOGY0OWU3Zi4uYjk4YWJmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rt YS5jCkBAIC0xMTE1LDYgKzExMTUsNyBAQCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJLyogRnJlZSBlcnJvciBzdGF0ZSBhZnRlciBpbnRlcnJ1cHRzIGFy ZSBmdWxseSBkaXNhYmxlZC4gKi8KIAljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmRldl9wcml2 LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmspOwogCWk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShk ZXYpOworCWNhbmNlbF93b3JrX3N5bmMoJmRldl9wcml2LT5ncHVfZXJyb3Iud29yayk7CiAKIAlp ZiAoZGV2LT5wZGV2LT5tc2lfZW5hYmxlZCkKIAkJcGNpX2Rpc2FibGVfbXNpKGRldi0+cGRldik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBkMDkyY2I4Li5lZmE0M2MzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTEyNDUsNiArMTI0NSw3IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJv ciB7CiAJc3BpbmxvY2tfdCBsb2NrOwogCS8qIFByb3RlY3RlZCBieSB0aGUgYWJvdmUgZGV2LT5n cHVfZXJyb3IubG9jay4gKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmZpcnN0X2Vy cm9yOworCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCiAJdW5zaWduZWQgbG9uZyBtaXNzZWRf aXJxX3JpbmdzOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA2YTQwZTI1Li45OTEzYzhm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTIzMDAsMTUgKzIzMDAsMTggQEAgc3RhdGlj IHZvaWQgaTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIH0KIAogLyoqCi0gKiBpOTE1X3Jlc2V0X2FuZF93YWtldXAgLSBkbyBwcm9jZXNzIGNvbnRl eHQgZXJyb3IgaGFuZGxpbmcgd29yaworICogaTkxNV9lcnJvcl93b3JrX2Z1bmMgLSBkbyBwcm9j ZXNzIGNvbnRleHQgZXJyb3IgaGFuZGxpbmcgd29yawogICoKICAqIEZpcmUgYW4gZXJyb3IgdWV2 ZW50IHNvIHVzZXJzcGFjZSBjYW4gc2VlIHRoYXQgYSBoYW5nIG9yIGVycm9yCiAgKiB3YXMgZGV0 ZWN0ZWQuCiAgKi8KLXN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93b3JrX2Z1bmMoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2 LT5ncHVfZXJyb3I7CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9IGNvbnRhaW5lcl9v Zih3b3JrLCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IsCisJICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB3b3JrKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPQorCSAgICAgICAgY29udGFpbmVyX29mKGVycm9yLCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSwgZ3B1X2Vycm9yKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRl djsKIAljaGFyICplcnJvcl9ldmVudFtdID0geyBJOTE1X0VSUk9SX1VFVkVOVCAiPTEiLCBOVUxM IH07CiAJY2hhciAqcmVzZXRfZXZlbnRbXSA9IHsgSTkxNV9SRVNFVF9VRVZFTlQgIj0xIiwgTlVM TCB9OwogCWNoYXIgKnJlc2V0X2RvbmVfZXZlbnRbXSA9IHsgSTkxNV9FUlJPUl9VRVZFTlQgIj0w IiwgTlVMTCB9OwpAQCAtMjY1OCw3ICsyNjYxLDIxIEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Io c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9tYXNrLCBib29sIHdlZGdlZCwKIAkJ aTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2LCBmYWxzZSk7CiAJfQogCi0JaTkxNV9yZXNldF9h bmRfd2FrZXVwKGRldik7CisJLyoKKwkgKiBHZW4gNzoKKwkgKgorCSAqIE91ciByZXNldCB3b3Jr IGNhbiBncmFiIG1vZGVzZXQgbG9ja3MgKHNpbmNlIGl0IG5lZWRzIHRvIHJlc2V0IHRoZQorCSAq IHN0YXRlIG9mIG91dHN0YW5kaW5nIHBhZ2VmbGlwcykuIEhlbmNlIGl0IG11c3Qgbm90IGJlIHJ1 biBvbiBvdXIgb3duCisJICogZGV2LXByaXYtPndxIHdvcmsgcXVldWUgZm9yIG90aGVyd2lzZSB0 aGUgZmx1c2hfd29yayBpbiB0aGUgcGFnZWZsaXAKKwkgKiBjb2RlIHdpbGwgZGVhZGxvY2suCisJ ICogSWYgZXJyb3Jfd29yayBpcyBhbHJlYWR5IGluIHRoZSB3b3JrIHF1ZXVlIHRoZW4gaXQgd2ls bCBub3QgYmUgYWRkZWQKKwkgKiBhZ2Fpbi4gSXQgaGFzbid0IHlldCBleGVjdXRlZCBzbyBpdCB3 aWxsIHNlZSB0aGUgcmVzZXQgZmxhZ3Mgd2hlbgorCSAqIGl0IGlzIHNjaGVkdWxlZC4gSWYgaXQg aXNuJ3QgaW4gdGhlIHF1ZXVlIG9yIGl0IGlzIGN1cnJlbnRseQorCSAqIGV4ZWN1dGluZyB0aGVu IHRoaXMgY2FsbCB3aWxsIGFkZCBpdCB0byB0aGUgcXVldWUgYWdhaW4gc28gdGhhdAorCSAqIGV2 ZW4gaWYgaXQgbWlzc2VzIHRoZSByZXNldCBmbGFncyBkdXJpbmcgdGhlIGN1cnJlbnQgY2FsbCBp dCBpcworCSAqIGd1YXJhbnRlZWQgdG8gc2VlIHRoZW0gb24gdGhlIG5leHQgY2FsbC4KKwkgKi8K KwlzY2hlZHVsZV93b3JrKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmspOwogfQogCiAvKiBDYWxs ZWQgZnJvbSBkcm0gZ2VuZXJpYyBjb2RlLCBwYXNzZWQgJ2NydGMnIHdoaWNoCkBAIC00MzkxLDYg KzQ0MDgsNyBAQCB2b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAogCUlO SVRfV09SSygmZGV2X3ByaXYtPmhvdHBsdWdfd29yaywgaTkxNV9ob3RwbHVnX3dvcmtfZnVuYyk7 CisJSU5JVF9XT1JLKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmssIGk5MTVfZXJyb3Jfd29ya19m dW5jKTsKIAlJTklUX1dPUksoJmRldl9wcml2LT5kaWdfcG9ydF93b3JrLCBpOTE1X2RpZ3BvcnRf d29ya19mdW5jKTsKIAlJTklUX1dPUksoJmRldl9wcml2LT5ycHMud29yaywgZ2VuNl9wbV9ycHNf d29yayk7CiAJSU5JVF9XT1JLKCZkZXZfcHJpdi0+bDNfcGFyaXR5LmVycm9yX3dvcmssIGl2eWJy aWRnZV9wYXJpdHlfd29yayk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=