From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v4 14/16] drm/i915: Refactor direct GPU reset from request waiters Date: Thu, 23 Feb 2017 07:44:20 +0000 Message-ID: <20170223074422.4125-15-chris@chris-wilson.co.uk> References: <20170223074422.4125-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-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 152846E98A for ; Thu, 23 Feb 2017 07:44:41 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id z61so2919962wrc.3 for ; Wed, 22 Feb 2017 23:44:41 -0800 (PST) In-Reply-To: <20170223074422.4125-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 List-Id: intel-gfx@lists.freedesktop.org Q29tYmluZSB0aGUgY29tbW9uIGNvZGUgZm9yIHRoZSBwYWlyIG9mIHdhaXRlcnMgaW50byBhIHNp bmdsZSBmdW5jdGlvbi4KCnYyOiBSZW5hbWUgcmVzZXRfcmVxdWVzdCB0byB3YWl0X3JlcXVlc3Rf Y2hlY2tfYW5kX3Jlc2V0CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0 LmMgfCAyMCArKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fcmVxdWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVz dC5jCmluZGV4IGUwNGY2NjAwMjA0Ny4uZWU2MDFlMTNlMjhhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fcmVxdWVzdC5jCkBAIC0xMDI0LDYgKzEwMjQsMTYgQEAgYm9vbCBfX2k5MTVf c3Bpbl9yZXF1ZXN0KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXJl dHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGJvb2wgX19pOTE1X3dhaXRfcmVxdWVzdF9jaGVja19h bmRfcmVzZXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQoreworCWlmIChs aWtlbHkoIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJnJlcXVlc3QtPmk5MTUtPmdwdV9lcnJvcikp KQorCQlyZXR1cm4gZmFsc2U7CisKKwlfX3NldF9jdXJyZW50X3N0YXRlKFRBU0tfUlVOTklORyk7 CisJaTkxNV9yZXNldChyZXF1ZXN0LT5pOTE1KTsKKwlyZXR1cm4gdHJ1ZTsKK30KKwogLyoqCiAg KiBpOTE1X3dhaXRfcmVxdWVzdCAtIHdhaXQgdW50aWwgZXhlY3V0aW9uIG9mIHJlcXVlc3QgaGFz IGZpbmlzaGVkCiAgKiBAcmVxOiB0aGUgcmVxdWVzdCB0byB3YWl0IHVwb24KQEAgLTEwODUsMTEg KzEwOTUsOCBAQCBsb25nIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxLAogCQkJCWJyZWFrOwogCiAJCQlpZiAoZmxhZ3MgJiBJOTE1X1dBSVRfTE9DS0VE ICYmCi0JCQkgICAgaTkxNV9yZXNldF9pbl9wcm9ncmVzcygmcmVxLT5pOTE1LT5ncHVfZXJyb3Ip KSB7Ci0JCQkJX19zZXRfY3VycmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOwotCQkJCWk5MTVfcmVz ZXQocmVxLT5pOTE1KTsKKwkJCSAgICBfX2k5MTVfd2FpdF9yZXF1ZXN0X2NoZWNrX2FuZF9yZXNl dChyZXEpKQogCQkJCWNvbnRpbnVlOwotCQkJfQogCiAJCQlpZiAoc2lnbmFsX3BlbmRpbmdfc3Rh dGUoc3RhdGUsIGN1cnJlbnQpKSB7CiAJCQkJdGltZW91dCA9IC1FUkVTVEFSVFNZUzsKQEAgLTEx NTksMTEgKzExNjYsOCBAQCBsb25nIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxLAogCQkgKiBpdHNlbGYsIG9yIGluZGlyZWN0bHkgYnkgcmVjb3Zlcmlu ZyB0aGUgR1BVKS4KIAkJICovCiAJCWlmIChmbGFncyAmIEk5MTVfV0FJVF9MT0NLRUQgJiYKLQkJ ICAgIGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJnJlcS0+aTkxNS0+Z3B1X2Vycm9yKSkgewotCQkJ X19zZXRfY3VycmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOwotCQkJaTkxNV9yZXNldChyZXEtPmk5 MTUpOworCQkgICAgX19pOTE1X3dhaXRfcmVxdWVzdF9jaGVja19hbmRfcmVzZXQocmVxKSkKIAkJ CWNvbnRpbnVlOwotCQl9CiAKIAkJLyogT25seSBzcGluIGlmIHdlIGtub3cgdGhlIEdQVSBpcyBw cm9jZXNzaW5nIHRoaXMgcmVxdWVzdCAqLwogCQlpZiAoaTkxNV9zcGluX3JlcXVlc3QocmVxLCBz dGF0ZSwgMikpCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=