From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeff.mcgee@intel.com Subject: [RFC 7/8] drm/i915: Allow reset without error capture Date: Fri, 16 Mar 2018 11:31:04 -0700 Message-ID: <20180316183105.16027-8-jeff.mcgee@intel.com> References: <20180316183105.16027-1-jeff.mcgee@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDFFC6E04A for ; Fri, 16 Mar 2018 18:45:41 +0000 (UTC) In-Reply-To: <20180316183105.16027-1-jeff.mcgee@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 Cc: ben@bwidawsk.net, kalyan.kondapally@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogSmVmZiBNY0dlZSA8amVmZi5tY2dlZUBpbnRlbC5jb20+CgpQdWxsIHRoZSByZXNldCBo YW5kbGluZyBvdXQgb2YgaTkxNV9oYW5kbGVfZXJyb3IoKSBzbyB0aGF0IGl0IGNhbiBiZQpjYWxs ZWQgYnkgdGhhdCBmdW5jdGlvbiBhbmQgZGlyZWN0bHkgYnkgdGhlIHVwY29taW5nIGZvcmNlIHBy ZWVtcHRpb24KaGFuZGxlci4gVGhpcyBhbGxvd3MgdGhlIGZvcmNlIHByZWVtcHRpb24gaGFuZGxl ciB0byBieXBhc3MgdGhlIGVycm9yCmNhcHR1cmUgdGhhdCBpOTE1X2hhbmRsZV9lcnJvcigpIGRv ZXMgYmVmb3JlIGdldHRpbmcgb24gd2l0aCB0aGUKcmVzZXQuIFdlIGRvIG5vdCB3YW50IGVycm9y IGNhcHR1cmUgZm9yIGZvcmNlIHByZWVtcHRpb24gYmVjYXVzZSBpdAphZGRzIHNpZ25pZmljYW50 IGxhdGVuY3kgKH4xMCBtc2VjcyBtZWFzdXJlZCBvbiBBUEwpLgoKVGhpcyBwYXRjaCBpcyByZXF1 aXJlZCB0byBzdXBwb3J0IHRoZSBmb3JjZSBwcmVlbXB0aW9uIGZlYXR1cmUuCgpDaGFuZ2UtSWQ6 IEk0MWI0ZmFlMWFkYzE5N2YwZTcwY2VjNDdjYjk2MGEwZDdmYTU1ZjQ4ClNpZ25lZC1vZmYtYnk6 IEplZmYgTWNHZWUgPGplZmYubWNnZWVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8 IDc1ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNo YW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IGQ4NTI0MzU3MzczZS4uYWRlMDlmOTdiZTVjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTMyNDUsNiArMzI0NSw4IEBAIF9fcHJpbnRmKDMsIDQpCiB2b2lkIGk5MTVf aGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJICAgICAg IHUzMiBlbmdpbmVfbWFzaywKIAkJICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4uKTsKK3ZvaWQg aTkxNV9oYW5kbGVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkg ICAgICAgdTMyIGVuZ2luZV9tYXNrKTsKIAogZXh0ZXJuIHZvaWQgaW50ZWxfaXJxX2luaXQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB2b2lkIGludGVsX2lycV9m aW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuYwppbmRleCBhMzRmNDU5ZjhhYzEuLmFiNWQ0ZDQwMDgzZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCkBAIC0yNjczLDQxICsyNjczLDE3IEBAIHN0YXRpYyB2b2lkIGk5MTVfY2xlYXJfZXJy b3JfcmVnaXN0ZXJzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIH0KIAogLyoq Ci0gKiBpOTE1X2hhbmRsZV9lcnJvciAtIGhhbmRsZSBhIGdwdSBlcnJvcgorICogaTkxNV9oYW5k bGVfcmVzZXQgLSBoYW5kbGUgYSBncHUgcmVzZXQKICAqIEBkZXZfcHJpdjogaTkxNSBkZXZpY2Ug cHJpdmF0ZQotICogQGVuZ2luZV9tYXNrOiBtYXNrIHJlcHJlc2VudGluZyBlbmdpbmVzIHRoYXQg YXJlIGh1bmcKLSAqIEBmbXQ6IEVycm9yIG1lc3NhZ2UgZm9ybWF0IHN0cmluZworICogQGVuZ2lu ZV9tYXNrOiBtYXNrIHJlcHJlc2VudGluZyBlbmdpbmVzIHRoYXQgcmVxdWlyZSByZXNldAogICoK LSAqIERvIHNvbWUgYmFzaWMgY2hlY2tpbmcgb2YgcmVnaXN0ZXIgc3RhdGUgYXQgZXJyb3IgdGlt ZSBhbmQKLSAqIGR1bXAgaXQgdG8gdGhlIHN5c2xvZy4gIEFsc28gY2FsbCBpOTE1X2NhcHR1cmVf ZXJyb3Jfc3RhdGUoKSB0byBtYWtlCi0gKiBzdXJlIHdlIGdldCBhIHJlY29yZCBhbmQgbWFrZSBp dCBhdmFpbGFibGUgaW4gZGVidWdmcy4gIEZpcmUgYSB1ZXZlbnQKLSAqIHNvIHVzZXJzcGFjZSBr bm93cyBzb21ldGhpbmcgYmFkIGhhcHBlbmVkIChzaG91bGQgdHJpZ2dlciBjb2xsZWN0aW9uCi0g KiBvZiBhIHJpbmcgZHVtcCBldGMuKS4KKyAqIEV4ZWN1dGVzIHJlc2V0IG9uIHRoZSBnaXZlbiBl bmdpbmVzLgogICovCi12b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKLQkJICAgICAgIHUzMiBlbmdpbmVfbWFzaywKLQkJICAgICAgIGNvbnN0 IGNoYXIgKmZtdCwgLi4uKQordm9pZCBpOTE1X2hhbmRsZV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCSAgICAgICB1MzIgZW5naW5lX21hc2spCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCXVuc2lnbmVkIGludCB0bXA7Ci0JdmFfbGlzdCBh cmdzOwotCWNoYXIgZXJyb3JfbXNnWzgwXTsKLQotCXZhX3N0YXJ0KGFyZ3MsIGZtdCk7Ci0JdnNj bnByaW50ZihlcnJvcl9tc2csIHNpemVvZihlcnJvcl9tc2cpLCBmbXQsIGFyZ3MpOwotCXZhX2Vu ZChhcmdzKTsKLQotCS8qCi0JICogSW4gbW9zdCBjYXNlcyBpdCdzIGd1YXJhbnRlZWQgdGhhdCB3 ZSBnZXQgaGVyZSB3aXRoIGFuIFJQTQotCSAqIHJlZmVyZW5jZSBoZWxkLCBmb3IgZXhhbXBsZSBi ZWNhdXNlIHRoZXJlIGlzIGEgcGVuZGluZyBHUFUKLQkgKiByZXF1ZXN0IHRoYXQgd29uJ3QgZmlu aXNoIHVudGlsIHRoZSByZXNldCBpcyBkb25lLiBUaGlzCi0JICogaXNuJ3QgdGhlIGNhc2UgYXQg bGVhc3Qgd2hlbiB3ZSBnZXQgaGVyZSBieSBkb2luZyBhCi0JICogc2ltdWxhdGVkIHJlc2V0IHZp YSBkZWJ1Z2ZzLCBzbyBnZXQgYW4gUlBNIHJlZmVyZW5jZS4KLQkgKi8KLQlpbnRlbF9ydW50aW1l X3BtX2dldChkZXZfcHJpdik7Ci0KLQlpOTE1X2NhcHR1cmVfZXJyb3Jfc3RhdGUoZGV2X3ByaXYs IGVuZ2luZV9tYXNrLCBlcnJvcl9tc2cpOwotCWk5MTVfY2xlYXJfZXJyb3JfcmVnaXN0ZXJzKGRl dl9wcml2KTsKIAogCS8qCiAJICogVHJ5IGVuZ2luZSByZXNldCB3aGVuIGF2YWlsYWJsZS4gV2Ug ZmFsbCBiYWNrIHRvIGZ1bGwgcmVzZXQgaWYKQEAgLTI3MzEsMTQgKzI3MDcsMTQgQEAgdm9pZCBp OTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQog CiAJaWYgKCFlbmdpbmVfbWFzaykKLQkJZ290byBvdXQ7CisJCXJldHVybjsKIAogCS8qIEZ1bGwg cmVzZXQgbmVlZHMgdGhlIG11dGV4LCBzdG9wIGFueSBvdGhlciB1c2VyIHRyeWluZyB0byBkbyBz by4gKi8KIAlpZiAodGVzdF9hbmRfc2V0X2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZkZXZfcHJp di0+Z3B1X2Vycm9yLmZsYWdzKSkgewogCQl3YWl0X2V2ZW50KGRldl9wcml2LT5ncHVfZXJyb3Iu cmVzZXRfcXVldWUsCiAJCQkgICAhdGVzdF9iaXQoSTkxNV9SRVNFVF9CQUNLT0ZGLAogCQkJCSAg ICAgJmRldl9wcml2LT5ncHVfZXJyb3IuZmxhZ3MpKTsKLQkJZ290byBvdXQ7CisJCXJldHVybjsK IAl9CiAKIAkvKiBQcmV2ZW50IGFueSBvdGhlciByZXNldC1lbmdpbmUgYXR0ZW1wdC4gKi8KQEAg LTI3NTksOCArMjczNSw0MyBAQCB2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWNsZWFyX2JpdChJOTE1X1JFU0VUX0JBQ0tPRkYsICZk ZXZfcHJpdi0+Z3B1X2Vycm9yLmZsYWdzKTsKIAl3YWtlX3VwX2FsbCgmZGV2X3ByaXYtPmdwdV9l cnJvci5yZXNldF9xdWV1ZSk7Cit9CisvKioKKyAqIGk5MTVfaGFuZGxlX2Vycm9yIC0gaGFuZGxl IGEgZ3B1IGVycm9yCisgKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlIHByaXZhdGUKKyAqIEBlbmdp bmVfbWFzazogbWFzayByZXByZXNlbnRpbmcgZW5naW5lcyB0aGF0IGFyZSBodW5nCisgKiBAZm10 OiBFcnJvciBtZXNzYWdlIGZvcm1hdCBzdHJpbmcKKyAqCisgKiBEbyBzb21lIGJhc2ljIGNoZWNr aW5nIG9mIHJlZ2lzdGVyIHN0YXRlIGF0IGVycm9yIHRpbWUgYW5kCisgKiBkdW1wIGl0IHRvIHRo ZSBzeXNsb2cuICBBbHNvIGNhbGwgaTkxNV9jYXB0dXJlX2Vycm9yX3N0YXRlKCkgdG8gbWFrZQor ICogc3VyZSB3ZSBnZXQgYSByZWNvcmQgYW5kIG1ha2UgaXQgYXZhaWxhYmxlIGluIGRlYnVnZnMu ICBGaXJlIGEgdWV2ZW50CisgKiBzbyB1c2Vyc3BhY2Uga25vd3Mgc29tZXRoaW5nIGJhZCBoYXBw ZW5lZCAoc2hvdWxkIHRyaWdnZXIgY29sbGVjdGlvbgorICogb2YgYSByaW5nIGR1bXAgZXRjLiku CisgKi8KK3ZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAorCQkgICAgICAgdTMyIGVuZ2luZV9tYXNrLAorCQkgICAgICAgY29uc3QgY2hhciAq Zm10LCAuLi4pCit7CisJdmFfbGlzdCBhcmdzOworCWNoYXIgZXJyb3JfbXNnWzgwXTsKKworCXZh X3N0YXJ0KGFyZ3MsIGZtdCk7CisJdnNjbnByaW50ZihlcnJvcl9tc2csIHNpemVvZihlcnJvcl9t c2cpLCBmbXQsIGFyZ3MpOworCXZhX2VuZChhcmdzKTsKKworCS8qCisJICogSW4gbW9zdCBjYXNl cyBpdCdzIGd1YXJhbnRlZWQgdGhhdCB3ZSBnZXQgaGVyZSB3aXRoIGFuIFJQTQorCSAqIHJlZmVy ZW5jZSBoZWxkLCBmb3IgZXhhbXBsZSBiZWNhdXNlIHRoZXJlIGlzIGEgcGVuZGluZyBHUFUKKwkg KiByZXF1ZXN0IHRoYXQgd29uJ3QgZmluaXNoIHVudGlsIHRoZSByZXNldCBpcyBkb25lLiBUaGlz CisJICogaXNuJ3QgdGhlIGNhc2UgYXQgbGVhc3Qgd2hlbiB3ZSBnZXQgaGVyZSBieSBkb2luZyBh CisJICogc2ltdWxhdGVkIHJlc2V0IHZpYSBkZWJ1Z2ZzLCBzbyBnZXQgYW4gUlBNIHJlZmVyZW5j ZS4KKwkgKi8KKwlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CisKKwlpOTE1X2NhcHR1 cmVfZXJyb3Jfc3RhdGUoZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCBlcnJvcl9tc2cpOworCWk5MTVf Y2xlYXJfZXJyb3JfcmVnaXN0ZXJzKGRldl9wcml2KTsKKwlpOTE1X2hhbmRsZV9yZXNldChkZXZf cHJpdiwgZW5naW5lX21hc2spOwogCi1vdXQ6CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3By aXYpOwogfQogCi0tIAoyLjE2LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=