From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 12/21] drm/i915: Replace wait-on-mutex with wait-on-bit in reset worker Date: Mon, 5 Sep 2016 14:04:29 +0100 Message-ID: <20160905130438.31046-13-chris@chris-wilson.co.uk> References: <20160905130438.31046-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90A6E6E3BC for ; Mon, 5 Sep 2016 13:04:59 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a6so2075295wmc.2 for ; Mon, 05 Sep 2016 06:04:59 -0700 (PDT) In-Reply-To: <20160905130438.31046-1-chris@chris-wilson.co.uk> 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@intel.com List-Id: intel-gfx@lists.freedesktop.org U2luY2Ugd2UgaGF2ZSBhIGNvb3BlcmF0aXZlIG1vZGUgbm93IHdpdGggYSBkaXJlY3QgcmVzZXQs IHdlIGNhbiBhdm9pZAp0aGUgY29udGVudGlvbiBvbiBzdHJ1Y3RfbXV0ZXggYW5kIGluc3RlYWQg dHJ5IHRoZW4gc2xlZXAgb24gdGhlCkk5MTVfUkVTRVRfSU5fUFJPR1JFU1MgYml0LiBJZiB0aGUg bXV0ZXggaXMgaGVsZCBhbmQgdGhhdCBiaXQgaXMKY2xlYXJlZCwgYWxsIGlzIGZpbmUuIE90aGVy d2lzZSwgd2Ugc2xlZXAgZm9yIGEgYml0IGFuZCB0cnkgYWdhaW4uIEluCnRoZSB3b3JzdCBjYXNl IHdlIHNsZWVwIGZvciBhbiBleHRyYSBzZWNvbmQgd2FpdGluZyBmb3IgdGhlIG11dGV4IHRvIGJl CnJlbGVhc2VkIChubyBvbmUgdG91Y2hpbmcgdGhlIEdQVSBpcyBhbGxvd2VkIHRoZSBzdHJ1Y3Rf bXV0ZXggd2hpbHN0IHRoZQpJOTE1X1JFU0VUX0lOX1BST0dSRVNTIGJpdCBpcyBzZXQpLiBCdXQg d2hlbiB3ZSBoYXZlIGEgZGlyZWN0IHJlc2V0LAp0aGlzIGFsbG93cyB1cyB0byBjbGVhbiB1cCB0 aGUgcmVzZXQgd29ya2VyIGZhc3Rlci4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMgfCAzMCArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx OCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpp bmRleCAyYzdjYjUwNDE1MTEuLjY5OWVlMmM3YTNlNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CkBAIC0yNDk3LDcgKzI0OTcsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3Jlc2V0X2FuZF93YWtldXAo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWNoYXIgKmVycm9yX2V2ZW50W10g PSB7IEk5MTVfRVJST1JfVUVWRU5UICI9MSIsIE5VTEwgfTsKIAljaGFyICpyZXNldF9ldmVudFtd ID0geyBJOTE1X1JFU0VUX1VFVkVOVCAiPTEiLCBOVUxMIH07CiAJY2hhciAqcmVzZXRfZG9uZV9l dmVudFtdID0geyBJOTE1X0VSUk9SX1VFVkVOVCAiPTAiLCBOVUxMIH07Ci0JaW50IHJldDsKKwlp bnQgcmV0ID0gLUVBR0FJTjsKIAogCWtvYmplY3RfdWV2ZW50X2Vudihrb2JqLCBLT0JKX0NIQU5H RSwgZXJyb3JfZXZlbnQpOwogCkBAIC0yNTEyLDIxICsyNTEyLDI3IEBAIHN0YXRpYyB2b2lkIGk5 MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ ICogc2ltdWxhdGVkIHJlc2V0IHZpYSBkZWJ1Z3MsIHNvIGdldCBhbiBSUE0gcmVmZXJlbmNlLgog CSAqLwogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKLQogCWludGVsX3ByZXBhcmVf cmVzZXQoZGV2X3ByaXYpOwogCi0JLyoKLQkgKiBBbGwgc3RhdGUgcmVzZXQgX211c3RfIGJlIGNv bXBsZXRlZCBiZWZvcmUgd2UgdXBkYXRlIHRoZQotCSAqIHJlc2V0IGNvdW50ZXIsIGZvciBvdGhl cndpc2Ugd2FpdGVycyBtaWdodCBtaXNzIHRoZSByZXNldAotCSAqIHBlbmRpbmcgc3RhdGUgYW5k IG5vdCBwcm9wZXJseSBkcm9wIGxvY2tzLCByZXN1bHRpbmcgaW4KLQkgKiBkZWFkbG9ja3Mgd2l0 aCB0aGUgcmVzZXQgd29yay4KLQkgKi8KLQltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVj dF9tdXRleCk7Ci0JcmV0ID0gaTkxNV9yZXNldChkZXZfcHJpdik7Ci0JbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CisJZG8geworCQkvKgorCQkgKiBBbGwgc3RhdGUg cmVzZXQgX211c3RfIGJlIGNvbXBsZXRlZCBiZWZvcmUgd2UgdXBkYXRlIHRoZQorCQkgKiByZXNl dCBjb3VudGVyLCBmb3Igb3RoZXJ3aXNlIHdhaXRlcnMgbWlnaHQgbWlzcyB0aGUgcmVzZXQKKwkJ ICogcGVuZGluZyBzdGF0ZSBhbmQgbm90IHByb3Blcmx5IGRyb3AgbG9ja3MsIHJlc3VsdGluZyBp bgorCQkgKiBkZWFkbG9ja3Mgd2l0aCB0aGUgcmVzZXQgd29yay4KKwkJICovCisJCWlmIChtdXRl eF90cnlsb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCkpIHsKKwkJCXJldCA9IGk5MTVf cmVzZXQoZGV2X3ByaXYpOworCQkJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9t dXRleCk7CisJCX0KIAotCWludGVsX2ZpbmlzaF9yZXNldChkZXZfcHJpdik7CisJCS8qIFdlIG5l ZWQgdG8gd2FpdCBmb3IgYW55b25lIGhvbGRpbmcgdGhlIGxvY2sgdG8gd2FrZXVwICovCisJfSB3 aGlsZSAod2FpdF9vbl9iaXRfdGltZW91dCgmZGV2X3ByaXYtPmdwdV9lcnJvci5mbGFncywKKwkJ CQkgICAgIEk5MTVfUkVTRVRfSU5fUFJPR1JFU1MsCisJCQkJICAgICBUQVNLX1VOSU5URVJSVVBU SUJMRSwKKwkJCQkgICAgIEhaKSk7CiAKKwlpbnRlbF9maW5pc2hfcmVzZXQoZGV2X3ByaXYpOwog CWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAogCWlmIChyZXQgPT0gMCkKLS0gCjIu OS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK