From: Arun Siluvery Subject: [PATCH 06/20] drm/i915: Reinstate hang recovery work queue. Date: Wed, 13 Jan 2016 17:28:18 +0000 Message-ID: <1452706112-8617-7-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 25BFA8995F for ; Wed, 13 Jan 2016 09:28:45 -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: Mika Kuoppala , Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVGhlcmUgdXNlZCB0byBiZSBh IHdvcmsgcXVldWUgc2VwYXJhdGluZyB0aGUgZXJyb3IgaGFuZGxlciBmcm9tIHRoZSBoYW5nCnJl Y292ZXJ5IHBhdGgsIHdoaWNoIHdhcyByZW1vdmVkIGEgd2hpbGUgYmFjayBpbiB0aGlzIGNvbW1p dDoKCgljb21taXQgYjhkMjRhMDY1NjgzNjgwNzZlYmQ1YTg1OGEwMTE2OTlhOTdiZmE0MgoJQXV0 aG9yOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KCURhdGU6 ICAgV2VkIEphbiAyOCAxNzowMzoxNCAyMDE1ICswMjAwCgoJICAgIGRybS9pOTE1OiBSZW1vdmUg bmVzdGVkIHdvcmsgaW4gZ3B1IGVycm9yIGhhbmRsaW5nCgpOb3cgd2UgbmVlZCB0byByZXZlcnQg bW9zdCBvZiB0aGF0IGNvbW1pdCBzaW5jZSB0aGUgd29yayBxdWV1ZSBzZXBhcmF0aW5nIGhhbmcK ZGV0ZWN0aW9uIGZyb20gaGFuZyByZWNvdmVyeSBpcyBuZWVkZWQgaW4gcHJlcGFyYXRpb24gZm9y IHRoZSB1cGNvbWluZyB3YXRjaGRvZwp0aW1lb3V0IGZlYXR1cmUuIFRoZSB3YXRjaGRvZyBpbnRl cnJ1cHQgc2VydmljZSByb3V0aW5lIHdpbGwgYmUgYSBzZWNvbmQKY2FsbHNpdGUgb2YgdGhlIGVy cm9yIGhhbmRsZXIgYWxvbmdzaWRlIHRoZSBwZXJpb2RpYyBoYW5nIGNoZWNrZXIsIHdoaWNoIHJ1 bnMKaW4gYSB3b3JrIHF1ZXVlIGNvbnRleHQuIFNlZWluZyBhcyB0aGUgZXJyb3IgaGFuZGxlciB3 aWxsIGJlIHNlcnZpbmcgYSBjYWxsZXIKaW4gYSBoYXJkIGludGVycnVwdCBleGVjdXRpb24gY29u dGV4dCB0aGF0IG1lYW5zIHRoYXQgdGhlIGVycm9yIGhhbmRsZXIgbXVzdApuZXZlciBlbmQgdXAg aW4gYSBzaXR1YXRpb24gd2hlcmUgaXQgbmVlZHMgdG8gZ3JhYiB0aGUgc3RydWN0X211dGV4LgpV bmZvcnR1bmF0ZWx5LCB0aGF0IGlzIGV4YWN0bHkgd2hhdCB3ZSBuZWVkIHRvIGRvIGZpcnN0IGF0 IHRoZSBzdGFydCBvZiB0aGUKaGFuZyByZWNvdmVyeSBwYXRoLCB3aGljaCBtaWdodCBwb3RlbnRp YWxseSBzbGVlcCBpZiB0aGUgc3RydWN0X211dGV4IGlzCmFscmVhZHkgaGVsZCBieSBhbm90aGVy IHRocmVhZC4gTm90IGdvb2Qgd2hlbiB5b3UncmUgaW4gYSBoYXJkIGludGVycnVwdApjb250ZXh0 LgoKU2lnbmVkLW9mZi1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAzMSAr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI2IGluc2Vy dGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggYzQ1 ZWMzNTMuLjY3MDAzYzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1h LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtMTIwMyw2ICsxMjAz LDcgQEAgaW50IGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCS8q IEZyZWUgZXJyb3Igc3RhdGUgYWZ0ZXIgaW50ZXJydXB0cyBhcmUgZnVsbHkgZGlzYWJsZWQuICov CiAJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLmhhbmdjaGVj a193b3JrKTsKIAlpOTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoZGV2KTsKKwljYW5jZWxfd29ya19z eW5jKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmspOwogCiAJaWYgKGRldi0+cGRldi0+bXNpX2Vu YWJsZWQpCiAJCXBjaV9kaXNhYmxlX21zaShkZXYtPnBkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggNWJlN2QzZS4uMDcyY2EzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0x MzM3LDYgKzEzMzcsNyBAQCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgewogCXNwaW5sb2NrX3QgbG9j azsKIAkvKiBQcm90ZWN0ZWQgYnkgdGhlIGFib3ZlIGRldi0+Z3B1X2Vycm9yLmxvY2suICovCiAJ c3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICpmaXJzdF9lcnJvcjsKKwlzdHJ1Y3Qgd29ya19z dHJ1Y3Qgd29yazsKIAogCXVuc2lnbmVkIGxvbmcgbWlzc2VkX2lycV9yaW5nczsKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKaW5kZXggZmVmNzRjZi4uODkzN2M4MiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCkBAIC0yNDU3LDE2ICsyNDU3LDE5IEBAIHN0YXRpYyB2b2lkIGk5MTVfZXJyb3Jfd2Fr ZV91cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIC8qKgotICogaTkx NV9yZXNldF9hbmRfd2FrZXVwIC0gZG8gcHJvY2VzcyBjb250ZXh0IGVycm9yIGhhbmRsaW5nIHdv cmsKLSAqIEBkZXY6IGRybSBkZXZpY2UKKyAqIGk5MTVfZXJyb3Jfd29ya19mdW5jIC0gZG8gcHJv Y2VzcyBjb250ZXh0IGVycm9yIGhhbmRsaW5nIHdvcmsKKyAqIEB3b3JrOiB3b3JrIGl0ZW0gY29u dGFpbmluZyBlcnJvciBzdHJ1Y3QsIHBhc3NlZCBieSB0aGUgZXJyb3IgaGFuZGxlcgogICoKICAq IEZpcmUgYW4gZXJyb3IgdWV2ZW50IHNvIHVzZXJzcGFjZSBjYW4gc2VlIHRoYXQgYSBoYW5nIG9y IGVycm9yCiAgKiB3YXMgZGV0ZWN0ZWQuCiAgKi8KLXN0YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5k X3dha2V1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaTkxNV9lcnJvcl93 b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Ig KmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7CisJc3RydWN0IGk5MTVfZ3B1X2Vycm9yICpl cnJvciA9IGNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IsCisJICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3b3JrKTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQorCSAgICAgICAgY29udGFpbmVyX29mKGVycm9yLCBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwgZ3B1X2Vycm9yKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZGV2X3ByaXYtPmRldjsKIAljaGFyICplcnJvcl9ldmVudFtdID0geyBJOTE1X0VSUk9S X1VFVkVOVCAiPTEiLCBOVUxMIH07CiAJY2hhciAqcmVzZXRfZXZlbnRbXSA9IHsgSTkxNV9SRVNF VF9VRVZFTlQgIj0xIiwgTlVMTCB9OwogCWNoYXIgKnJlc2V0X2RvbmVfZXZlbnRbXSA9IHsgSTkx NV9FUlJPUl9VRVZFTlQgIj0wIiwgTlVMTCB9OwpAQCAtMjgyNyw3ICsyODMwLDIxIEBAIHZvaWQg aTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIGVuZ2luZV9tYXNr LCBib29sIHdlZGdlZCwKIAkJaTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2LCBmYWxzZSk7CiAJ fQogCi0JaTkxNV9yZXNldF9hbmRfd2FrZXVwKGRldik7CisJLyoKKwkgKiBHZW4gNzoKKwkgKgor CSAqIE91ciByZXNldCB3b3JrIGNhbiBncmFiIG1vZGVzZXQgbG9ja3MgKHNpbmNlIGl0IG5lZWRz IHRvIHJlc2V0IHRoZQorCSAqIHN0YXRlIG9mIG91dHN0YW5kaW5nIHBhZ2VmbGlwcykuIEhlbmNl IGl0IG11c3Qgbm90IGJlIHJ1biBvbiBvdXIgb3duCisJICogZGV2LXByaXYtPndxIHdvcmsgcXVl dWUgZm9yIG90aGVyd2lzZSB0aGUgZmx1c2hfd29yayBpbiB0aGUgcGFnZWZsaXAKKwkgKiBjb2Rl IHdpbGwgZGVhZGxvY2suCisJICogSWYgZXJyb3Jfd29yayBpcyBhbHJlYWR5IGluIHRoZSB3b3Jr IHF1ZXVlIHRoZW4gaXQgd2lsbCBub3QgYmUgYWRkZWQKKwkgKiBhZ2Fpbi4gSXQgaGFzbid0IHll dCBleGVjdXRlZCBzbyBpdCB3aWxsIHNlZSB0aGUgcmVzZXQgZmxhZ3Mgd2hlbgorCSAqIGl0IGlz IHNjaGVkdWxlZC4gSWYgaXQgaXNuJ3QgaW4gdGhlIHF1ZXVlIG9yIGl0IGlzIGN1cnJlbnRseQor CSAqIGV4ZWN1dGluZyB0aGVuIHRoaXMgY2FsbCB3aWxsIGFkZCBpdCB0byB0aGUgcXVldWUgYWdh aW4gc28gdGhhdAorCSAqIGV2ZW4gaWYgaXQgbWlzc2VzIHRoZSByZXNldCBmbGFncyBkdXJpbmcg dGhlIGN1cnJlbnQgY2FsbCBpdCBpcworCSAqIGd1YXJhbnRlZWQgdG8gc2VlIHRoZW0gb24gdGhl IG5leHQgY2FsbC4KKwkgKi8KKwlzY2hlZHVsZV93b3JrKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndv cmspOwogfQogCiAvKiBDYWxsZWQgZnJvbSBkcm0gZ2VuZXJpYyBjb2RlLCBwYXNzZWQgJ2NydGMn IHdoaWNoCkBAIC00NjgyLDcgKzQ2OTksNyBAQCB2b2lkIGludGVsX2lycV9pbml0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2 X3ByaXYtPmRldjsKIAogCWludGVsX2hwZF9pbml0X3dvcmsoZGV2X3ByaXYpOwotCisJSU5JVF9X T1JLKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndvcmssIGk5MTVfZXJyb3Jfd29ya19mdW5jKTsKIAlJ TklUX1dPUksoJmRldl9wcml2LT5ycHMud29yaywgZ2VuNl9wbV9ycHNfd29yayk7CiAJSU5JVF9X T1JLKCZkZXZfcHJpdi0+bDNfcGFyaXR5LmVycm9yX3dvcmssIGl2eWJyaWRnZV9wYXJpdHlfd29y ayk7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=