From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 2/3] drm/i915: Include GuC fw version in error state Date: Fri, 24 Feb 2017 11:05:29 -0800 Message-ID: <20170224190530.31482-2-michel.thierry@intel.com> References: <20170224190530.31482-1-michel.thierry@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 5FA5B6E1A9 for ; Fri, 24 Feb 2017 19:05:31 +0000 (UTC) In-Reply-To: <20170224190530.31482-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 VGhlcmUgd2FzIG5vIHdheSB0byBjaGVjayBpZiB0aGUgcGxhdGZvcm0gaXMgcnVubmluZyB0aGUg bGF0ZXN0CmZpcm13YXJlLgoKdjI6IHVzZSBIQVNfR1VDIGFuZCBpbnRlbF9ndWMqIChNaWNoYWwp CiAgICBjYXB0dXJlIGJlZm9yZSByZXNldCAoQ2hyaXMpCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVj emtvQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+CkNjOiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxlckBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIHwgMTcgKysrKysrKysrKysrKysrKysKIDIgZmls ZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDNiMGNmZjA1ZjVmNy4uYTMzMWMwMDUyM2JjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTk1Niw2ICs5NTYsOCBAQCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgewogCS8qIEZpcm13YXJlIGxv YWQgc3RhdGUgKi8KIAl1MzIgZG1jX2xvYWRlZDsKIAl1MzIgZG1jX3ZlcnNpb247CisJdTMyIGd1 Y19sb2FkZWQ7CisJdTMyIGd1Y192ZXJzaW9uOwogCiAJdTMyIG5mZW5jZTsKIAl1NjQgZmVuY2Vb STkxNV9NQVhfTlVNX0ZFTkNFU107CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpp bmRleCBhZTZmMDA5MmIwNDYuLjYzZjFiOTYwNmI1NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dwdV9lcnJvci5jCkBAIC02MjksNiArNjI5LDEzIEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3Rv X3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJICAgQ1NSX1ZFUlNJ T05fTUlOT1IoZXJyb3ItPmRtY192ZXJzaW9uKSk7CiAJfQogCisJaWYgKEhBU19HVUMoZGV2X3By aXYpKSB7CisJCWVycl9wcmludGYobSwgIkd1QyBsb2FkZWQ6ICVzXG4iLCB5ZXNubyhlcnJvci0+ Z3VjX2xvYWRlZCkpOworCQllcnJfcHJpbnRmKG0sICJHdUMgZncgdmVyc2lvbjogJWQuJWRcbiIs CisJCQkgICBlcnJvci0+Z3VjX3ZlcnNpb24gPj4gMTYsCisJCQkgICBlcnJvci0+Z3VjX3ZlcnNp b24gJiAweGZmZmYpOworCX0KKwogCWVycl9wcmludGYobSwgIkVJUjogMHglMDh4XG4iLCBlcnJv ci0+ZWlyKTsKIAllcnJfcHJpbnRmKG0sICJJRVI6IDB4JTA4eFxuIiwgZXJyb3ItPmllcik7CiAJ Zm9yIChpID0gMDsgaSA8IGVycm9yLT5uZ3RpZXI7IGkrKykKQEAgLTE1OTIsNiArMTU5OSwxNiBA QCBzdGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfZndfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQllcnJvci0+ZG1jX2xvYWRlZCA9IChjc3ItPmRtY19wYXlsb2FkICE9 IE5VTEwpOwogCQllcnJvci0+ZG1jX3ZlcnNpb24gPSBjc3ItPnZlcnNpb247CiAJfQorCisJaWYg KEhBU19HVUMoZGV2X3ByaXYpKSB7CisJCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJp di0+Z3VjOworCisJCWVycm9yLT5ndWNfbG9hZGVkID0KKwkJCShndWMtPmZ3LmxvYWRfc3RhdHVz ID09IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MpOworCQllcnJvci0+Z3VjX3ZlcnNpb24gPQor CQkJKGd1Yy0+ZncubWFqb3JfdmVyX2ZvdW5kIDw8IDE2IHwKKwkJCSBndWMtPmZ3Lm1pbm9yX3Zl cl9mb3VuZCk7CisJfQogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2Vycm9yX2NhcHR1cmVfbXNnKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLS0gCjIuMTEuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==