From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v9 01/21] drm/i915: Look for active requests earlier in the reset path Date: Thu, 15 Jun 2017 13:18:08 -0700 Message-ID: <20170615201828.23144-2-michel.thierry@intel.com> References: <20170615201828.23144-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE7136E80A for ; Thu, 15 Jun 2017 20:18:30 +0000 (UTC) In-Reply-To: <20170615201828.23144-1-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org QW5kIHN0b3JlIHRoZSBhY3RpdmUgcmVxdWVzdCBzbyB0aGF0IHdlIG9ubHkgc2VhcmNoIGZvciBp dCBvbmNlLgoKdjI6IENoZWNrIGZvciByZXF1ZXN0IGNvbXBsZXRpb24gaW5zaWRlIF9wcmVwYXJl X2VuZ2luZSwgZG9uJ3QgdXNlCkVDQU5DRUxFRCwgcmVtb3ZlIHVubmVjZXNzYXJ5IG51bGwgY2hl Y2tzIChDaHJpcykuCgp2MzogQ2FwdHVyZSBhY3RpdmUgcmVxdWVzdHMgZHVyaW5nIHJlc2V0X3By ZXBhcmUgYW5kIHN0b3JlIGl0IHRoZQplbmdpbmUgaGFuZ2NoZWNrIG9iai4KCnY0OiBSZW5hbWUg Y29tbWl0LCBjaGFuZ2UgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdCB0byBqdXN0IGNvbmZpcm0gdGhl CmFjdGl2ZV9yZXF1ZXN0IGlzIHN0aWxsIGluY29tcGxldGUsIGluc3RlYWQgb2YgZW5naW5lX3N0 YWxsZWQgKENocmlzKS4KCnY1OiBXaXRoIHN0eWxlOyBwYXNzIHRoZSBhY3RpdmUgcmVxdWVzdCB0 byBnZW1fcmVzZXRfZW5naW5lLCBrZWVwIHNpbmdsZQpyZXR1cm4gaW4gcmVzZXRfcHJlcGFyZV9l bmdpbmUgKENocmlzKS4KCnY2OiBNb3ZlZCBiZWZvcmUgcmVzZXQtZW5naW5lIGNvZGUgYXBwZWFy cyAoQ2hyaXMpCgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+ICh2NSkKU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAx NCArKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o IHwgIDEgKwogMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMzFjYmU3ODE3MWE5Li40NzIyY2QzNTY3YTUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjgyMCw3ICsyODIwLDcgQEAgaW50IGk5MTVf Z2VtX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJ LyogRW5zdXJlIGlycSBoYW5kbGVyIGZpbmlzaGVzLCBhbmQgbm90IHJ1biBhZ2Fpbi4gKi8KIAlm b3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKLQkJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QgPSBOVUxMOwogCiAJCS8qIFByZXZlbnQgdGhlIHNpZ25hbGVyIHRocmVhZCBmcm9tIHVw ZGF0aW5nIHRoZSByZXF1ZXN0CiAJCSAqIHN0YXRlIChieSBjYWxsaW5nIGRtYV9mZW5jZV9zaWdu YWwpIGFzIHdlIGFyZSBwcm9jZXNzaW5nCkBAIC0yODUyLDYgKzI4NTIsOCBAQCBpbnQgaTkxNV9n ZW1fcmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlp ZiAocmVxdWVzdCAmJiByZXF1ZXN0LT5mZW5jZS5lcnJvciA9PSAtRUlPKQogCQkJCWVyciA9IC1F SU87IC8qIFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8KIAkJfQorCisJCWVuZ2luZS0+aGFuZ2No ZWNrLmFjdGl2ZV9yZXF1ZXN0ID0gcmVxdWVzdDsKIAl9CiAKIAlpOTE1X2dlbV9yZXZva2VfZmVu Y2VzKGRldl9wcml2KTsKQEAgLTI5MDUsNyArMjkwNyw3IEBAIHN0YXRpYyB2b2lkIGVuZ2luZV9z a2lwX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogc3RhdGlj IGJvb2wgaTkxNV9nZW1fcmVzZXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcXVlc3QpCiB7CiAJLyogUmVhZCBvbmNlIGFuZCByZXR1cm4gdGhlIHJlc29sdXRpb24gKi8K LQljb25zdCBib29sIGd1aWx0eSA9IGVuZ2luZV9zdGFsbGVkKHJlcXVlc3QtPmVuZ2luZSk7CisJ Y29uc3QgYm9vbCBndWlsdHkgPSAhaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCk7 CiAKIAkvKiBUaGUgZ3VpbHR5IHJlcXVlc3Qgd2lsbCBnZXQgc2tpcHBlZCBvbiBhIGh1bmcgZW5n aW5lLgogCSAqCkBAIC0yOTM5LDExICsyOTQxLDkgQEAgc3RhdGljIGJvb2wgaTkxNV9nZW1fcmVz ZXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJcmV0dXJu IGd1aWx0eTsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5naW5lKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2VuZ2lu ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkJICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0OwotCi0JcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3QoZW5naW5l KTsKIAlpZiAocmVxdWVzdCAmJiBpOTE1X2dlbV9yZXNldF9yZXF1ZXN0KHJlcXVlc3QpKSB7CiAJ CURSTV9ERUJVR19EUklWRVIoInJlc2V0dGluZyAlcyB0byByZXN0YXJ0IGZyb20gdGFpbCBvZiBy ZXF1ZXN0IDB4JXhcbiIsCiAJCQkJIGVuZ2luZS0+bmFtZSwgcmVxdWVzdC0+Z2xvYmFsX3NlcW5v KTsKQEAgLTI5NjksNyArMjk2OSw3IEBAIHZvaWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2 LCBpZCkgewogCQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OwogCi0JCWk5MTVfZ2VtX3Jl c2V0X2VuZ2luZShlbmdpbmUpOworCQlpOTE1X2dlbV9yZXNldF9lbmdpbmUoZW5naW5lLCBlbmdp bmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCk7CiAJCWN0eCA9IGZldGNoX2FuZF96ZXJvKCZl bmdpbmUtPmxhc3RfcmV0aXJlZF9jb250ZXh0KTsKIAkJaWYgKGN0eCkKIAkJCWVuZ2luZS0+Y29u dGV4dF91bnBpbihlbmdpbmUsIGN0eCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKaW5kZXggNmFhMjBhYzhjZGUzLi5kMzNjOTM0NDRjMGQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTEyMSw2ICsxMjEsNyBAQCBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2hhbmdjaGVjayB7CiAJdW5zaWduZWQgbG9uZyBhY3Rpb25fdGltZXN0YW1wOwogCWlu dCBkZWFkbG9jazsKIAlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgaW5zdGRvbmU7CisJc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICphY3RpdmVfcmVxdWVzdDsKIAlib29sIHN0YWxsZWQ7CiB9Owog Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=