From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2 12/14] drm/i915: Refactor direct GPU reset from request waiters Date: Tue, 14 Feb 2017 09:54:11 +0000 Message-ID: <20170214095413.26452-13-chris@chris-wilson.co.uk> References: <20170214095413.26452-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-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6F186E654 for ; Tue, 14 Feb 2017 09:54:30 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id k90so26824766wrc.3 for ; Tue, 14 Feb 2017 01:54:30 -0800 (PST) In-Reply-To: <20170214095413.26452-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 bmdsZSBmdW5jdGlvbi4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3Qu YyB8IDIxICsrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fcmVxdWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVz dC5jCmluZGV4IGJkOTIxYzRiMDEwMC4uNmY3YmVhZWRhM2ZmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fcmVxdWVzdC5jCkBAIC0xMDA2LDYgKzEwMDYsMTYgQEAgYm9vbCBfX2k5MTVf c3Bpbl9yZXF1ZXN0KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXJl dHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGJvb2wgX19pOTE1X3Jlc2V0X3JlcXVlc3Qoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQoreworCWlmIChsaWtlbHkoIWk5MTVfcmVz ZXRfaW5fcHJvZ3Jlc3MoJnJlcXVlc3QtPmk5MTUtPmdwdV9lcnJvcikpKQorCQlyZXR1cm4gZmFs c2U7CisKKwlfX3NldF9jdXJyZW50X3N0YXRlKFRBU0tfUlVOTklORyk7CisJaTkxNV9yZXNldChy ZXF1ZXN0LT5pOTE1KTsKKwlyZXR1cm4gdHJ1ZTsKK30KKwogLyoqCiAgKiBpOTE1X3dhaXRfcmVx dWVzdCAtIHdhaXQgdW50aWwgZXhlY3V0aW9uIG9mIHJlcXVlc3QgaGFzIGZpbmlzaGVkCiAgKiBA cmVxOiB0aGUgcmVxdWVzdCB0byB3YWl0IHVwb24KQEAgLTEwNjksMTEgKzEwNzksOCBAQCBsb25n IGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJ CWJyZWFrOwogCiAJCQlpZiAoZmxhZ3MgJiBJOTE1X1dBSVRfTE9DS0VEICYmCi0JCQkgICAgaTkx NV9yZXNldF9pbl9wcm9ncmVzcygmcmVxLT5pOTE1LT5ncHVfZXJyb3IpKSB7Ci0JCQkJX19zZXRf Y3VycmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOwotCQkJCWk5MTVfcmVzZXQocmVxLT5pOTE1KTsK KwkJCSAgICBfX2k5MTVfcmVzZXRfcmVxdWVzdChyZXEpKQogCQkJCWNvbnRpbnVlOwotCQkJfQog CiAJCQlpZiAoc2lnbmFsX3BlbmRpbmdfc3RhdGUoc3RhdGUsIGN1cnJlbnQpKSB7CiAJCQkJdGlt ZW91dCA9IC1FUkVTVEFSVFNZUzsKQEAgLTExNDIsMTIgKzExNDksOCBAQCBsb25nIGk5MTVfd2Fp dF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkgKiB0byBjb21l IGFsb25nIGFuZCB1cGRhdGUgdGhlIGJyZWFkY3J1bWIgKGVpdGhlciBkaXJlY3RseQogCQkgKiBp dHNlbGYsIG9yIGluZGlyZWN0bHkgYnkgcmVjb3ZlcmluZyB0aGUgR1BVKS4KIAkJICovCi0JCWlm IChmbGFncyAmIEk5MTVfV0FJVF9MT0NLRUQgJiYKLQkJICAgIGk5MTVfcmVzZXRfaW5fcHJvZ3Jl c3MoJnJlcS0+aTkxNS0+Z3B1X2Vycm9yKSkgewotCQkJX19zZXRfY3VycmVudF9zdGF0ZShUQVNL X1JVTk5JTkcpOwotCQkJaTkxNV9yZXNldChyZXEtPmk5MTUpOworCQlpZiAoZmxhZ3MgJiBJOTE1 X1dBSVRfTE9DS0VEICYmIF9faTkxNV9yZXNldF9yZXF1ZXN0KHJlcSkpCiAJCQljb250aW51ZTsK LQkJfQogCiAJCS8qIE9ubHkgc3BpbiBpZiB3ZSBrbm93IHRoZSBHUFUgaXMgcHJvY2Vzc2luZyB0 aGlzIHJlcXVlc3QgKi8KIAkJaWYgKGk5MTVfc3Bpbl9yZXF1ZXN0KHJlcSwgc3RhdGUsIDIpKQot LSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK