From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 06/20] drm/i915: Reinstate hang recovery work queue. Date: Fri, 23 Oct 2015 02:32:28 +0100 Message-ID: <1445563962-20753-7-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 E7C906E780 for ; Thu, 22 Oct 2015 18:33:17 -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: 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 L2k5MTVfaXJxLmMgfCAzMSArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZG1hLmMKaW5kZXggYTFjYzgyZi4uMTQ3OTY0ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5j CkBAIC0xMjAyLDYgKzEyMDIsNyBAQCBpbnQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJLyogRnJlZSBlcnJvciBzdGF0ZSBhZnRlciBpbnRlcnJ1cHRzIGFyZSBm dWxseSBkaXNhYmxlZC4gKi8KIAljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmRldl9wcml2LT5n cHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmspOwogCWk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShkZXYp OworCWNhbmNlbF93b3JrX3N5bmMoJmRldl9wcml2LT5ncHVfZXJyb3Iud29yayk7CiAKIAlpZiAo ZGV2LT5wZGV2LT5tc2lfZW5hYmxlZCkKIAkJcGNpX2Rpc2FibGVfbXNpKGRldi0+cGRldik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA2MmM1OWU3Li5iYmMxOGNjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTEzNTcsNiArMTM1Nyw3IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJvciB7 CiAJc3BpbmxvY2tfdCBsb2NrOwogCS8qIFByb3RlY3RlZCBieSB0aGUgYWJvdmUgZGV2LT5ncHVf ZXJyb3IubG9jay4gKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmZpcnN0X2Vycm9y OworCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCiAJdW5zaWduZWQgbG9uZyBtaXNzZWRfaXJx X3JpbmdzOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAzOTY4YjA3Li5jMzQ3ODNhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTIzOTQsMTYgKzIzOTQsMTkgQEAgc3RhdGljIHZv aWQgaTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IH0KIAogLyoqCi0gKiBpOTE1X3Jlc2V0X2FuZF93YWtldXAgLSBkbyBwcm9jZXNzIGNvbnRleHQg ZXJyb3IgaGFuZGxpbmcgd29yawotICogQGRldjogZHJtIGRldmljZQorICogaTkxNV9lcnJvcl93 b3JrX2Z1bmMgLSBkbyBwcm9jZXNzIGNvbnRleHQgZXJyb3IgaGFuZGxpbmcgd29yaworICogQHdv cms6IHdvcmsgaXRlbSBjb250YWluaW5nIGVycm9yIHN0cnVjdCwgcGFzc2VkIGJ5IHRoZSBlcnJv ciBoYW5kbGVyCiAgKgogICogRmlyZSBhbiBlcnJvciB1ZXZlbnQgc28gdXNlcnNwYWNlIGNhbiBz ZWUgdGhhdCBhIGhhbmcgb3IgZXJyb3IKICAqIHdhcyBkZXRlY3RlZC4KICAqLwotc3RhdGljIHZv aWQgaTkxNV9yZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMg dm9pZCBpOTE1X2Vycm9yX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVj dCBpOTE1X2dwdV9lcnJvciAqZXJyb3IgPSAmZGV2X3ByaXYtPmdwdV9lcnJvcjsKKwlzdHJ1Y3Qg aTkxNV9ncHVfZXJyb3IgKmVycm9yID0gY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBpOTE1X2dw dV9lcnJvciwKKwkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdv cmspOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CisJICAgICAgICBjb250 YWluZXJfb2YoZXJyb3IsIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBncHVfZXJyb3IpOworCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCWNoYXIgKmVycm9yX2V2ZW50 W10gPSB7IEk5MTVfRVJST1JfVUVWRU5UICI9MSIsIE5VTEwgfTsKIAljaGFyICpyZXNldF9ldmVu dFtdID0geyBJOTE1X1JFU0VUX1VFVkVOVCAiPTEiLCBOVUxMIH07CiAJY2hhciAqcmVzZXRfZG9u ZV9ldmVudFtdID0geyBJOTE1X0VSUk9SX1VFVkVOVCAiPTAiLCBOVUxMIH07CkBAIC0yNzY0LDcg KzI3NjcsMjEgQEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB1MzIgZW5naW5lX21hc2ssIGJvb2wgd2VkZ2VkLAogCQlpOTE1X2Vycm9yX3dha2VfdXAoZGV2 X3ByaXYsIGZhbHNlKTsKIAl9CiAKLQlpOTE1X3Jlc2V0X2FuZF93YWtldXAoZGV2KTsKKwkvKgor CSAqIEdlbiA3OgorCSAqCisJICogT3VyIHJlc2V0IHdvcmsgY2FuIGdyYWIgbW9kZXNldCBsb2Nr cyAoc2luY2UgaXQgbmVlZHMgdG8gcmVzZXQgdGhlCisJICogc3RhdGUgb2Ygb3V0c3RhbmRpbmcg cGFnZWZsaXBzKS4gSGVuY2UgaXQgbXVzdCBub3QgYmUgcnVuIG9uIG91ciBvd24KKwkgKiBkZXYt cHJpdi0+d3Egd29yayBxdWV1ZSBmb3Igb3RoZXJ3aXNlIHRoZSBmbHVzaF93b3JrIGluIHRoZSBw YWdlZmxpcAorCSAqIGNvZGUgd2lsbCBkZWFkbG9jay4KKwkgKiBJZiBlcnJvcl93b3JrIGlzIGFs cmVhZHkgaW4gdGhlIHdvcmsgcXVldWUgdGhlbiBpdCB3aWxsIG5vdCBiZSBhZGRlZAorCSAqIGFn YWluLiBJdCBoYXNuJ3QgeWV0IGV4ZWN1dGVkIHNvIGl0IHdpbGwgc2VlIHRoZSByZXNldCBmbGFn cyB3aGVuCisJICogaXQgaXMgc2NoZWR1bGVkLiBJZiBpdCBpc24ndCBpbiB0aGUgcXVldWUgb3Ig aXQgaXMgY3VycmVudGx5CisJICogZXhlY3V0aW5nIHRoZW4gdGhpcyBjYWxsIHdpbGwgYWRkIGl0 IHRvIHRoZSBxdWV1ZSBhZ2FpbiBzbyB0aGF0CisJICogZXZlbiBpZiBpdCBtaXNzZXMgdGhlIHJl c2V0IGZsYWdzIGR1cmluZyB0aGUgY3VycmVudCBjYWxsIGl0IGlzCisJICogZ3VhcmFudGVlZCB0 byBzZWUgdGhlbSBvbiB0aGUgbmV4dCBjYWxsLgorCSAqLworCXNjaGVkdWxlX3dvcmsoJmRldl9w cml2LT5ncHVfZXJyb3Iud29yayk7CiB9CiAKIC8qIENhbGxlZCBmcm9tIGRybSBnZW5lcmljIGNv ZGUsIHBhc3NlZCAnY3J0Yycgd2hpY2gKQEAgLTQ1MzIsNyArNDU0OSw3IEBAIHZvaWQgaW50ZWxf aXJxX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCiAJaW50ZWxfaHBkX2luaXRfd29yayhkZXZf cHJpdik7Ci0KKwlJTklUX1dPUksoJmRldl9wcml2LT5ncHVfZXJyb3Iud29yaywgaTkxNV9lcnJv cl93b3JrX2Z1bmMpOwogCUlOSVRfV09SSygmZGV2X3ByaXYtPnJwcy53b3JrLCBnZW42X3BtX3Jw c193b3JrKTsKIAlJTklUX1dPUksoJmRldl9wcml2LT5sM19wYXJpdHkuZXJyb3Jfd29yaywgaXZ5 YnJpZGdlX3Bhcml0eV93b3JrKTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==