From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [RFCv2 05/12] drm/i915: Reinstate hang recovery work queue. Date: Tue, 21 Jul 2015 14:58:48 +0100 Message-ID: <1437487135-32520-6-git-send-email-tomas.elf@intel.com> References: <1437487135-32520-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id BB5067208D for ; Tue, 21 Jul 2015 06:59:52 -0700 (PDT) In-Reply-To: <1437487135-32520-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 dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgIDEgKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMgfCAyOCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZG1hLmMKaW5kZXggY2YwMWU4NC4uMzliOGY1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCkBA IC0xMTE2LDYgKzExMTYsNyBAQCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJLyogRnJlZSBlcnJvciBzdGF0ZSBhZnRlciBpbnRlcnJ1cHRzIGFyZSBmdWxs eSBkaXNhYmxlZC4gKi8KIAljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmRldl9wcml2LT5ncHVf ZXJyb3IuaGFuZ2NoZWNrX3dvcmspOwogCWk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShkZXYpOwor CWNhbmNlbF93b3JrX3N5bmMoJmRldl9wcml2LT5ncHVfZXJyb3Iud29yayk7CiAKIAlpZiAoZGV2 LT5wZGV2LT5tc2lfZW5hYmxlZCkKIAkJcGNpX2Rpc2FibGVfbXNpKGRldi0+cGRldik7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCBmNGQwYzFmLi5lZjdjMTI5IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTEyNDUsNiArMTI0NSw3IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJvciB7CiAJ c3BpbmxvY2tfdCBsb2NrOwogCS8qIFByb3RlY3RlZCBieSB0aGUgYWJvdmUgZGV2LT5ncHVfZXJy b3IubG9jay4gKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmZpcnN0X2Vycm9yOwor CXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCiAJdW5zaWduZWQgbG9uZyBtaXNzZWRfaXJxX3Jp bmdzOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBlODY5ODIzLi40OTczODI2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTIzMDAsMTUgKzIzMDAsMTggQEAgc3RhdGljIHZvaWQg aTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0K IAogLyoqCi0gKiBpOTE1X3Jlc2V0X2FuZF93YWtldXAgLSBkbyBwcm9jZXNzIGNvbnRleHQgZXJy b3IgaGFuZGxpbmcgd29yaworICogaTkxNV9lcnJvcl93b3JrX2Z1bmMgLSBkbyBwcm9jZXNzIGNv bnRleHQgZXJyb3IgaGFuZGxpbmcgd29yawogICoKICAqIEZpcmUgYW4gZXJyb3IgdWV2ZW50IHNv IHVzZXJzcGFjZSBjYW4gc2VlIHRoYXQgYSBoYW5nIG9yIGVycm9yCiAgKiB3YXMgZGV0ZWN0ZWQu CiAgKi8KLXN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQorc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKLQlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVf ZXJyb3I7CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9IGNvbnRhaW5lcl9vZih3b3Jr LCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IsCisJICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB3b3JrKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PQorCSAgICAgICAgY29udGFpbmVyX29mKGVycm9yLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwg Z3B1X2Vycm9yKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAlj aGFyICplcnJvcl9ldmVudFtdID0geyBJOTE1X0VSUk9SX1VFVkVOVCAiPTEiLCBOVUxMIH07CiAJ Y2hhciAqcmVzZXRfZXZlbnRbXSA9IHsgSTkxNV9SRVNFVF9VRVZFTlQgIj0xIiwgTlVMTCB9Owog CWNoYXIgKnJlc2V0X2RvbmVfZXZlbnRbXSA9IHsgSTkxNV9FUlJPUl9VRVZFTlQgIj0wIiwgTlVM TCB9OwpAQCAtMjY2OCw3ICsyNjcxLDIxIEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9tYXNrLCBib29sIHdlZGdlZCwKIAkJaTkxNV9l cnJvcl93YWtlX3VwKGRldl9wcml2LCBmYWxzZSk7CiAJfQogCi0JaTkxNV9yZXNldF9hbmRfd2Fr ZXVwKGRldik7CisJLyoKKwkgKiBHZW4gNzoKKwkgKgorCSAqIE91ciByZXNldCB3b3JrIGNhbiBn cmFiIG1vZGVzZXQgbG9ja3MgKHNpbmNlIGl0IG5lZWRzIHRvIHJlc2V0IHRoZQorCSAqIHN0YXRl IG9mIG91dHN0YW5kaW5nIHBhZ2VmbGlwcykuIEhlbmNlIGl0IG11c3Qgbm90IGJlIHJ1biBvbiBv dXIgb3duCisJICogZGV2LXByaXYtPndxIHdvcmsgcXVldWUgZm9yIG90aGVyd2lzZSB0aGUgZmx1 c2hfd29yayBpbiB0aGUgcGFnZWZsaXAKKwkgKiBjb2RlIHdpbGwgZGVhZGxvY2suCisJICogSWYg ZXJyb3Jfd29yayBpcyBhbHJlYWR5IGluIHRoZSB3b3JrIHF1ZXVlIHRoZW4gaXQgd2lsbCBub3Qg YmUgYWRkZWQKKwkgKiBhZ2Fpbi4gSXQgaGFzbid0IHlldCBleGVjdXRlZCBzbyBpdCB3aWxsIHNl ZSB0aGUgcmVzZXQgZmxhZ3Mgd2hlbgorCSAqIGl0IGlzIHNjaGVkdWxlZC4gSWYgaXQgaXNuJ3Qg aW4gdGhlIHF1ZXVlIG9yIGl0IGlzIGN1cnJlbnRseQorCSAqIGV4ZWN1dGluZyB0aGVuIHRoaXMg Y2FsbCB3aWxsIGFkZCBpdCB0byB0aGUgcXVldWUgYWdhaW4gc28gdGhhdAorCSAqIGV2ZW4gaWYg aXQgbWlzc2VzIHRoZSByZXNldCBmbGFncyBkdXJpbmcgdGhlIGN1cnJlbnQgY2FsbCBpdCBpcwor CSAqIGd1YXJhbnRlZWQgdG8gc2VlIHRoZW0gb24gdGhlIG5leHQgY2FsbC4KKwkgKi8KKwlzY2hl ZHVsZV93b3JrKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmspOwogfQogCiAvKiBDYWxsZWQgZnJv bSBkcm0gZ2VuZXJpYyBjb2RlLCBwYXNzZWQgJ2NydGMnIHdoaWNoCkBAIC00Mzg5LDYgKzQ0MDYs NyBAQCB2b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAogCUlOSVRfV09S SygmZGV2X3ByaXYtPmhvdHBsdWdfd29yaywgaTkxNV9ob3RwbHVnX3dvcmtfZnVuYyk7CisJSU5J VF9XT1JLKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmssIGk5MTVfZXJyb3Jfd29ya19mdW5jKTsK IAlJTklUX1dPUksoJmRldl9wcml2LT5kaWdfcG9ydF93b3JrLCBpOTE1X2RpZ3BvcnRfd29ya19m dW5jKTsKIAlJTklUX1dPUksoJmRldl9wcml2LT5ycHMud29yaywgZ2VuNl9wbV9ycHNfd29yayk7 CiAJSU5JVF9XT1JLKCZkZXZfcHJpdi0+bDNfcGFyaXR5LmVycm9yX3dvcmssIGl2eWJyaWRnZV9w YXJpdHlfd29yayk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK