From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 03/20] drm/i915: Delay queuing hangcheck to wait-request Date: Thu, 19 May 2016 12:32:39 +0100 Message-ID: <1463657576-32063-3-git-send-email-chris@chris-wilson.co.uk> References: <1463657576-32063-1-git-send-email-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCF876E970 for ; Thu, 19 May 2016 11:33:06 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id s63so5647469wme.2 for ; Thu, 19 May 2016 04:33:06 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id q76sm9429419wmd.6.2016.05.19.04.33.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:33:03 -0700 (PDT) In-Reply-To: <1463657576-32063-1-git-send-email-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 List-Id: intel-gfx@lists.freedesktop.org V2UgY2FuIGZvcmdvIHF1ZXVpbmcgdGhlIGhhbmdjaGVjayBmcm9tIHRoZSBzdGFydCBvZiBldmVy eSByZXF1ZXN0IHRvCnVudGlsIHdlIHdhaXQgdXBvbiBhIHJlcXVlc3QuIFRoaXMgcmVkdWNlcyB0 aGUgb3ZlcmhlYWQgb2YgZXZlcnkKcmVxdWVzdCwgYnV0IG1heSBpbmNyZWFzZSB0aGUgbGF0ZW5j eSBvZiBkZXRlY3RpbmcgYSBoYW5nLiBIb3dlZXZlciwgaWYKbm90aGluZyBldmVyeSB3YWl0cyB1 cG9uIGEgaGFuZywgZGlkIGl0IGV2ZXIgaGFuZz8gSXQgYWxzbyBpbXByb3ZlcyB0aGUKcm9idXN0 bmVzcyBvZiB0aGUgd2FpdC1yZXF1ZXN0IGJ5IGVuc3VyaW5nIHRoYXQgdGhlIGhhbmdjaGVja2Vy IGlzCmluZGVlZCBydW5uaW5nIGJlZm9yZSB3ZSBzbGVlcCBpbmRlZmluaXRlbHkgKGFuZCB0aGVy ZWJ5IGVuc3VyaW5nIHRoYXQKd2UgbmV2ZXIgYWN0dWFsbHkgc2xlZXAgZm9yZXZlciB3YWl0aW5n IGZvciBhIGRlYWQgR1BVKS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAg OSArKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgfCAxMCArKysrLS0t LS0tCiAyIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMjRjYWI4ODAyYzJlLi4wNjAxM2I5ZmJjNmEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTMxMCw2ICsxMzEwLDkgQEAgaW50IF9faTkxNV93 YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQlicmVhazsK IAkJfQogCisJCS8qIEVuc3VyZSB0aGF0IGV2ZW4gaWYgdGhlIEdQVSBoYW5ncywgd2UgZ2V0IHdv a2VuIHVwLiAqLworCQlpOTE1X3F1ZXVlX2hhbmdjaGVjayhkZXZfcHJpdik7CisKIAkJdGltZXIu ZnVuY3Rpb24gPSBOVUxMOwogCQlpZiAodGltZW91dCB8fCBtaXNzZWRfaXJxKGRldl9wcml2LCBl bmdpbmUpKSB7CiAJCQl1bnNpZ25lZCBsb25nIGV4cGlyZTsKQEAgLTI2NTQsOCArMjY1Nyw2IEBA IHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCwKIAkvKiBOb3QgYWxsb3dlZCB0byBmYWlsISAqLwogCVdBUk4ocmV0LCAiZW1pdHxhZGRf cmVxdWVzdCBmYWlsZWQ6ICVkIVxuIiwgcmV0KTsKIAotCWk5MTVfcXVldWVfaGFuZ2NoZWNrKGVu Z2luZS0+aTkxNSk7Ci0KIAlxdWV1ZV9kZWxheWVkX3dvcmsoZGV2X3ByaXYtPndxLAogCQkJICAg JmRldl9wcml2LT5tbS5yZXRpcmVfd29yaywKIAkJCSAgIHJvdW5kX2ppZmZpZXNfdXBfcmVsYXRp dmUoSFopKTsKQEAgLTI5OTksOCArMzAwMCw4IEBAIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlpZiAoaWRsZSkKIAkJbW9kX2Rl bGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsCi0JCQkJICAgJmRldl9wcml2LT5tbS5pZGxlX3dvcmss Ci0JCQkJICAgbXNlY3NfdG9famlmZmllcygxMDApKTsKKwkJCQkgJmRldl9wcml2LT5tbS5pZGxl X3dvcmssCisJCQkJIG1zZWNzX3RvX2ppZmZpZXMoMTAwKSk7CiAKIAlyZXR1cm4gaWRsZTsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGYwZDk0MTQ1NWJlZC4uNDgxOGZjYjVlOTYwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTMxNDgsMTAgKzMxNDgsMTAgQEAgc3RhdGljIHZv aWQgaTkxNV9oYW5nY2hlY2tfZWxhcHNlZChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJaW50 ZWxfdW5jb3JlX2FybV91bmNsYWltZWRfbW1pb19kZXRlY3Rpb24oZGV2X3ByaXYpOwogCiAJZm9y X2VhY2hfZW5naW5lX2lkKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJCWJvb2wgYnVzeSA9IHdh aXRxdWV1ZV9hY3RpdmUoJmVuZ2luZS0+aXJxX3F1ZXVlKTsKIAkJdTY0IGFjdGhkOwogCQl1MzIg c2Vxbm87CiAJCXVuc2lnbmVkIHVzZXJfaW50ZXJydXB0czsKLQkJYm9vbCBidXN5ID0gdHJ1ZTsK IAogCQlzZW1hcGhvcmVfY2xlYXJfZGVhZGxvY2tzKGRldl9wcml2KTsKIApAQCAtMzE3NCwxMiAr MzE3NCwxMSBAQCBzdGF0aWMgdm9pZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0cnVjdCB3b3Jr X3N0cnVjdCAqd29yaykKIAkJaWYgKGVuZ2luZS0+aGFuZ2NoZWNrLnNlcW5vID09IHNlcW5vKSB7 CiAJCQlpZiAocmluZ19pZGxlKGVuZ2luZSwgc2Vxbm8pKSB7CiAJCQkJZW5naW5lLT5oYW5nY2hl Y2suYWN0aW9uID0gSEFOR0NIRUNLX0lETEU7Ci0JCQkJaWYgKHdhaXRxdWV1ZV9hY3RpdmUoJmVu Z2luZS0+aXJxX3F1ZXVlKSkgeworCQkJCWlmIChidXN5KSB7CiAJCQkJCS8qIFNhZmVndWFyZCBh Z2FpbnN0IGRyaXZlciBmYWlsdXJlICovCiAJCQkJCXVzZXJfaW50ZXJydXB0cyA9IGtpY2tfd2Fp dGVycyhlbmdpbmUpOwogCQkJCQllbmdpbmUtPmhhbmdjaGVjay5zY29yZSArPSBCVVNZOwotCQkJ CX0gZWxzZQotCQkJCQlidXN5ID0gZmFsc2U7CisJCQkJfQogCQkJfSBlbHNlIHsKIAkJCQkvKiBX ZSBhbHdheXMgaW5jcmVtZW50IHRoZSBoYW5nY2hlY2sgc2NvcmUKIAkJCQkgKiBpZiB0aGUgcmlu ZyBpcyBidXN5IGFuZCBzdGlsbCBwcm9jZXNzaW5nCkBAIC0zMjUzLDkgKzMyNTIsOCBAQCBzdGF0 aWMgdm9pZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK IAkJZ290byBvdXQ7CiAJfQogCisJLyogUmVzZXQgdGltZXIgaW4gY2FzZSBHUFUgaGFuZ3Mgd2l0 aG91dCBhbm90aGVyIHJlcXVlc3QgYmVpbmcgYWRkZWQgKi8KIAlpZiAoYnVzeV9jb3VudCkKLQkJ LyogUmVzZXQgdGltZXIgY2FzZSBjaGlwIGhhbmdzIHdpdGhvdXQgYW5vdGhlciByZXF1ZXN0Ci0J CSAqIGJlaW5nIGFkZGVkICovCiAJCWk5MTVfcXVldWVfaGFuZ2NoZWNrKGRldl9wcml2KTsKIAog b3V0OgotLSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=