From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 2/3] drm/i915/guc: Add support for reset engine using GuC commands Date: Mon, 30 Oct 2017 11:56:15 -0700 Message-ID: <20171030185616.32836-3-michel.thierry@intel.com> References: <20171030185616.32836-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC43489D6C for ; Mon, 30 Oct 2017 18:56:17 +0000 (UTC) In-Reply-To: <20171030185616.32836-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 VGhpcyBwYXRjaCBhZGRzIHBlciBlbmdpbmUgcmVzZXQgYW5kIHJlY292ZXJ5IChURFIpIHN1cHBv cnQgd2hlbiBHdUMgaXMKdXNlZCB0byBzdWJtaXQgd29ya2xvYWRzIHRvIEdQVS4KCkluIHRoZSBj YXNlIG9mIGk5MTUgZGlyZWN0bHkgc3VibWlzc2lvbiB0byBFTFNQLCBkcml2ZXIgbWFuYWdlcyBo YW5nCmRldGVjdGlvbiwgcmVjb3ZlcnkgYW5kIHJlc3VibWlzc2lvbi4gV2l0aCBHdUMgc3VibWlz c2lvbiB0aGVzZSB0YXNrcwphcmUgc2hhcmVkIGJldHdlZW4gZHJpdmVyIGFuZCBHdUMuIGk5MTUg aXMgc3RpbGwgcmVzcG9uc2libGUgZm9yIGRldGVjdGluZwphIGhhbmcsIGFuZCB3aGVuIGl0IGRv ZXMgaXQgb25seSByZXF1ZXN0cyBHdUMgdG8gcmVzZXQgdGhhdCBFbmdpbmUuIEd1QwppbnRlcm5h bGx5IG1hbmFnZXMgYWNxdWlyaW5nIGZvcmNld2FrZSBhbmQgaWRsaW5nIHRoZSBlbmdpbmUgYmVm b3JlIGFjdHVhbGx5CnJlc2V0dGluZyBpdC4KCk9uY2UgdGhlIHJlc2V0IGlzIHN1Y2Nlc3NmdWws IGk5MTUgdGFrZXMgb3ZlciBhZ2FpbiBhbmQgaGFuZGxlcyByZXN1Ym1pc3Npb24uClRoZSBzY2hl ZHVsZXIgaW4gaTkxNSBrbm93cyB3aGljaCByZXF1ZXN0cyBhcmUgcGVuZGluZyBzbyBhZnRlciBy ZXNldHRpbmcKYSBlbmdpbmUsIHBlbmRpbmcgd29ya2xvYWRzL3JlcXVlc3RzIGFyZSByZXN1Ym1p dHRlZCBhZ2Fpbi4KCnYyOiBzL2k5MTVfZ3VjX3JlcXVlc3RfZW5naW5lX3Jlc2V0L2k5MTVfZ3Vj X3Jlc2V0X2VuZ2luZS8gdG8gbWF0Y2ggdGhlCm5vbi1ndWMgZnVudGlvbiBuYW1lcy4KCnYzOiBS ZW1vdmVkIGRlYnVnIG1lc3NhZ2UgYWJvdXQgZW5naW5lIHJlc3RhcnRpbmcgZnJvbSB3aGljaCBy ZXF1ZXN0LApzaW5jZSB0aGUgbmV3IGJhc2VsaW5lIGRvIGl0IHJlZ2FyZGxlc3Mgb2Ygc3VibWlz c2lvbiBtb2RlLiAoQ2hyaXMpCgp2NDogUmViYXNlLgoKdjU6IERvIG5vdCBwYXNzIHVubmVjZXNz YXJ5IHJlcG9ydGluZyBmbGFncyB0byB0aGUgZncgKEplZmYpOwp0YXNrbGV0X3NjaGVkdWxlKCZl eGVjbGlzdHMtPmlycV90YXNrbGV0KSBoYW5kbGVzIHRoZSByZXN1Ym1pdDsgcmViYXNlLgoKU2ln bmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KQ2M6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgfCAgOSArKysrKysrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuYyAgICAgIHwgMjQgKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMgICB8ICA1IC0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMo KyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYWY3NDU3NDk1 MDljLi4wMmZiMzU3NDRmNjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTk4NCwxMCAr MTk4NCwxNSBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLCB1bnNpZ25lZCBpbnQgZmxhZ3MpCiAJCWdvdG8gb3V0OwogCX0KIAotCXJldCA9IGlu dGVsX2dwdV9yZXNldChlbmdpbmUtPmk5MTUsIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSkpOwor CWlmICghZW5naW5lLT5pOTE1LT5ndWMuZXhlY2J1Zl9jbGllbnQpCisJCXJldCA9IGludGVsX2dw dV9yZXNldChlbmdpbmUtPmk5MTUsIGludGVsX2VuZ2luZV9mbGFnKGVuZ2luZSkpOworCWVsc2UK KwkJcmV0ID0gaW50ZWxfZ3VjX3Jlc2V0X2VuZ2luZShlbmdpbmUpOworCiAJaWYgKHJldCkgewog CQkvKiBJZiB3ZSBmYWlsIGhlcmUsIHdlIGV4cGVjdCB0byBmYWxsYmFjayB0byBhIGdsb2JhbCBy ZXNldCAqLwotCQlEUk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gcmVzZXQgJXMsIHJldD0lZFxu IiwKKwkJRFJNX0RFQlVHX0RSSVZFUigiJXNGYWlsZWQgdG8gcmVzZXQgJXMsIHJldD0lZFxuIiwK KwkJCQkgKGVuZ2luZS0+aTkxNS0+Z3VjLmV4ZWNidWZfY2xpZW50ID8gIkdVQyAiIDogIiIpLAog CQkJCSBlbmdpbmUtPm5hbWUsIHJldCk7CiAJCWdvdG8gb3V0OwogCX0KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IDBlZDA2Y2EwNzU2OC4uYjc3ZmQ5NzIwZWMyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTMzMjYsNiArMzMyNiw3IEBAIGV4dGVybiBpbnQgaTkxNV9yZXNldF9lbmdp bmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCiBleHRlcm4gYm9vbCBpbnRlbF9o YXNfcmVzZXRfZW5naW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBleHRl cm4gaW50IGludGVsX3Jlc2V0X2d1YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OworZXh0ZXJuIGludCBpbnRlbF9ndWNfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSk7CiBleHRlcm4gdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2soc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGV4dGVybiB2b2lkIGludGVsX2hhbmdjaGVj a19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBleHRlcm4gdW5zaWdu ZWQgbG9uZyBpOTE1X2NoaXBzZXRfdmFsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IGY3NGQ1MGZkYWViMC4uZjdiOWI2Yjkx NDk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwpAQCAtMjQsNiArMjQsNyBAQAogCiAjaW5j bHVkZSAiaW50ZWxfZ3VjLmgiCiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKKyNpbmNsdWRlICJpOTE1 X2d1Y19zdWJtaXNzaW9uLmgiCiAKIHN0YXRpYyB2b2lkIGdlbjhfZ3VjX3JhaXNlX2lycShzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMpCiB7CkBAIC0yODMsNiArMjg0LDI5IEBAIGludCBpbnRlbF9ndWNf c3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIGludGVs X2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CiAKKy8qKgorICogaW50 ZWxfZ3VjX3Jlc2V0X2VuZ2luZSgpIC0gYXNrIEd1QyB0byByZXNldCBhbiBlbmdpbmUKKyAqIEBl bmdpbmU6CWVuZ2luZSB0byBiZSByZXNldAorICovCitpbnQgaW50ZWxfZ3VjX3Jlc2V0X2VuZ2lu ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9 ICZkZXZfcHJpdi0+Z3VjOworCXUzMiBkYXRhWzddOworCisJR0VNX0JVR19PTighZ3VjLT5leGVj YnVmX2NsaWVudCk7CisKKwlkYXRhWzBdID0gSU5URUxfR1VDX0FDVElPTl9SRVFVRVNUX0VOR0lO RV9SRVNFVDsKKwlkYXRhWzFdID0gZW5naW5lLT5ndWNfaWQ7CisJZGF0YVsyXSA9IDA7CisJZGF0 YVszXSA9IDA7CisJZGF0YVs0XSA9IDA7CisJZGF0YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQt PnN0YWdlX2lkOworCWRhdGFbNl0gPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7 CisKKwlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsK K30KKwogLyoqCiAgKiBpbnRlbF9ndWNfcmVzdW1lKCkgLSBub3RpZnkgR3VDIHJlc3VtaW5nIGZy b20gc3VzcGVuZCBzdGF0ZQogICogQGRldl9wcml2OglpOTE1IGRldmljZSBwcml2YXRlCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCBlMjRkYmVjMmVhZDguLjZhMTBhYTZm MDRkMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCkBAIC01NzQsNiArNTc0 LDcgQEAgc3RydWN0IGd1Y19zaGFyZWRfY3R4X2RhdGEgewogZW51bSBpbnRlbF9ndWNfYWN0aW9u IHsKIAlJTlRFTF9HVUNfQUNUSU9OX0RFRkFVTFQgPSAweDAsCiAJSU5URUxfR1VDX0FDVElPTl9S RVFVRVNUX1BSRUVNUFRJT04gPSAweDIsCisJSU5URUxfR1VDX0FDVElPTl9SRVFVRVNUX0VOR0lO RV9SRVNFVCA9IDB4MywKIAlJTlRFTF9HVUNfQUNUSU9OX1NBTVBMRV9GT1JDRVdBS0UgPSAweDYs CiAJSU5URUxfR1VDX0FDVElPTl9BTExPQ0FURV9ET09SQkVMTCA9IDB4MTAsCiAJSU5URUxfR1VD X0FDVElPTl9ERUFMTE9DQVRFX0RPT1JCRUxMID0gMHgyMCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMKaW5kZXggZDYyOWIyZTQwMDEzLi4wNTY0ZDg3YWQ0MTYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VuY29yZS5jCkBAIC0xNzkyLDE0ICsxNzkyLDkgQEAgYm9vbCBpbnRlbF9oYXNf Z3B1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gaW50 ZWxfZ2V0X2dwdV9yZXNldChkZXZfcHJpdikgIT0gTlVMTDsKIH0KIAotLyoKLSAqIFdoZW4gR3VD IHN1Ym1pc3Npb24gaXMgZW5hYmxlZCwgR3VDIG1hbmFnZXMgRUxTUCBhbmQgY2FuIGluaXRpYXRl IHRoZQotICogZW5naW5lIHJlc2V0IHRvby4gRm9yIG5vdywgZmFsbCBiYWNrIHRvIGZ1bGwgR1BV IHJlc2V0IGlmIGl0IGlzIGVuYWJsZWQuCi0gKi8KIGJvb2wgaW50ZWxfaGFzX3Jlc2V0X2VuZ2lu ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmV0dXJuIChkZXZfcHJp di0+aW5mby5oYXNfcmVzZXRfZW5naW5lICYmCi0JCSFkZXZfcHJpdi0+Z3VjLmV4ZWNidWZfY2xp ZW50ICYmCiAJCWk5MTVfbW9kcGFyYW1zLnJlc2V0ID49IDIpOwogfQogCi0tIAoyLjE0LjIKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=