From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH v2] drm/i915: Use the engine name directly in the error_state file Date: Tue, 9 Jan 2018 17:21:51 -0800 Message-ID: <20180110012151.28261-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id C742589B51 for ; Wed, 10 Jan 2018 01:21:52 +0000 (UTC) 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 SW5zdGVhZCBvZiB1c2luZyBsb2NhbCBzdHJpbmcgbmFtZXMgdGhhdCB3ZSB3aWxsIGhhdmUgdG8g a2VlcAptYWludGFpbmluZywgdXNlIHRoZSBlbmdpbmUtPm5hbWUgZGlyZWN0bHkuCgp2MjogQmV0 dGVyIGludmFsaWQgZW5naW5lX2lkIGhhbmRsaW5nLCBjYXB0dXJlX2JvIHdpbGwgbm90IGJlIGFi bGUga25vdwp0aGUgZW5naW5lX2lkIGFuZCBlbmQgdXAgd2l0aCAtMSAoTWljaGFsKS4KClN1Z2dl c3RlZC1ieTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+CkNj OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAzMyArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA5NDQ5OWMyNGYyNzkuLjQyMmUz MDIxNjFlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0zNCwxNiAr MzQsMjIgQEAKIAogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAKLXN0YXRpYyBjb25zdCBjaGFyICpl bmdpbmVfc3RyKGludCBlbmdpbmUpCi17Ci0Jc3dpdGNoIChlbmdpbmUpIHsKLQljYXNlIFJDUzog cmV0dXJuICJyZW5kZXIiOwotCWNhc2UgVkNTOiByZXR1cm4gImJzZCI7Ci0JY2FzZSBCQ1M6IHJl dHVybiAiYmx0IjsKLQljYXNlIFZFQ1M6IHJldHVybiAidmVib3giOwotCWNhc2UgVkNTMjogcmV0 dXJuICJic2QyIjsKLQlkZWZhdWx0OiByZXR1cm4gIiI7Ci0JfQorc3RhdGljIGlubGluZSBjb25z dCBjaGFyICppbnRlbF9lbmdpbmVfbmFtZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cit7CisJcmV0dXJuIGVuZ2luZSA/IGVuZ2luZS0+bmFtZSA6ICIiOworfQorCitzdGF0aWMgaW5s aW5lIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKgoraW50ZWxfZW5naW5lX2xvb2t1cChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgaW50IGVuZ2luZV9pZCkKK3sKKwlpZiAoZW5naW5lX2lk IDwgMCB8fCBlbmdpbmVfaWQgPj0gSTkxNV9OVU1fRU5HSU5FUykKKwkJcmV0dXJuIE5VTEw7CisJ cmV0dXJuIGk5MTUtPmVuZ2luZVtlbmdpbmVfaWRdOworfQorCitzdGF0aWMgY29uc3QgY2hhciAq ZW5naW5lX3N0cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgaW50IGVuZ2luZV9pZCkK K3sKKwlyZXR1cm4gaW50ZWxfZW5naW5lX25hbWUoaW50ZWxfZW5naW5lX2xvb2t1cChpOTE1LCBl bmdpbmVfaWQpKTsKIH0KIAogc3RhdGljIGNvbnN0IGNoYXIgKnRpbGluZ19mbGFnKGludCB0aWxp bmcpCkBAIC0zNDUsNyArMzUxLDcgQEAgc3RhdGljIHZvaWQgcHJpbnRfZXJyb3JfYnVmZmVycyhz dHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQllcnJfcHV0cyhtLCBwdXJnZWFi bGVfZmxhZyhlcnItPnB1cmdlYWJsZSkpOwogCQllcnJfcHV0cyhtLCBlcnItPnVzZXJwdHIgPyAi IHVzZXJwdHIiIDogIiIpOwogCQllcnJfcHV0cyhtLCBlcnItPmVuZ2luZSAhPSAtMSA/ICIgIiA6 ICIiKTsKLQkJZXJyX3B1dHMobSwgZW5naW5lX3N0cihlcnItPmVuZ2luZSkpOworCQllcnJfcHV0 cyhtLCBlbmdpbmVfc3RyKG0tPmk5MTUsIGVyci0+ZW5naW5lKSk7CiAJCWVycl9wdXRzKG0sIGk5 MTVfY2FjaGVfbGV2ZWxfc3RyKG0tPmk5MTUsIGVyci0+Y2FjaGVfbGV2ZWwpKTsKIAogCQlpZiAo ZXJyLT5uYW1lKQpAQCAtNDE3LDcgKzQyMyw4IEBAIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X2Vu Z2luZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogewogCWludCBuOwogCi0J ZXJyX3ByaW50ZihtLCAiJXMgY29tbWFuZCBzdHJlYW06XG4iLCBlbmdpbmVfc3RyKGVlLT5lbmdp bmVfaWQpKTsKKwllcnJfcHJpbnRmKG0sICIlcyBjb21tYW5kIHN0cmVhbTpcbiIsIGVuZ2luZV9z dHIobS0+aTkxNSwKKwkJCQkJCQkgZWUtPmVuZ2luZV9pZCkpOwogCWVycl9wcmludGYobSwgIiAg SURMRT86ICVzXG4iLCB5ZXNubyhlZS0+aWRsZSkpOwogCWVycl9wcmludGYobSwgIiAgU1RBUlQ6 IDB4JTA4eFxuIiwgZWUtPnN0YXJ0KTsKIAllcnJfcHJpbnRmKG0sICIgIEhFQUQ6ICAweCUwOHgg WzB4JTA4eF1cbiIsIGVlLT5oZWFkLCBlZS0+cnFfaGVhZCk7CkBAIC02MzMsNyArNjQwLDcgQEAg aW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9i dWYgKm0sCiAJCWlmIChlcnJvci0+ZW5naW5lW2ldLmhhbmdjaGVja19zdGFsbGVkICYmCiAJCSAg ICBlcnJvci0+ZW5naW5lW2ldLmNvbnRleHQucGlkKSB7CiAJCQllcnJfcHJpbnRmKG0sICJBY3Rp dmUgcHJvY2VzcyAob24gcmluZyAlcyk6ICVzIFslZF0sIHNjb3JlICVkXG4iLAotCQkJCSAgIGVu Z2luZV9zdHIoaSksCisJCQkJICAgZW5naW5lX3N0cihtLT5pOTE1LCBpKSwKIAkJCQkgICBlcnJv ci0+ZW5naW5lW2ldLmNvbnRleHQuY29tbSwKIAkJCQkgICBlcnJvci0+ZW5naW5lW2ldLmNvbnRl eHQucGlkLAogCQkJCSAgIGVycm9yLT5lbmdpbmVbaV0uY29udGV4dC5iYW5fc2NvcmUpOwotLSAK Mi4xNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK