From: Michel Thierry Subject: [PATCH] drm/i915: Use the engine name directly in the error_state file Date: Tue, 9 Jan 2018 11:33:55 -0800 Message-ID: <20180109193355.35538-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C670889309 for ; Tue, 9 Jan 2018 19:33:56 +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 a2VlcAptYWludGFpbmluZywgdXNlIHRoZSBlbmdpbmUtPm5hbWUgZGlyZWN0bHkuCgpTdWdnZXN0 ZWQtYnk6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgpDYzog TWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDIzICsrKysrKysrKystLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggOTQ0OTljMjRmMjc5Li5kYjk1 ZWNhY2RhY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9y LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMzQsMTYg KzM0LDEyIEBACiAKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogCi1zdGF0aWMgY29uc3QgY2hhciAq ZW5naW5lX3N0cihpbnQgZW5naW5lKQotewotCXN3aXRjaCAoZW5naW5lKSB7Ci0JY2FzZSBSQ1M6 IHJldHVybiAicmVuZGVyIjsKLQljYXNlIFZDUzogcmV0dXJuICJic2QiOwotCWNhc2UgQkNTOiBy ZXR1cm4gImJsdCI7Ci0JY2FzZSBWRUNTOiByZXR1cm4gInZlYm94IjsKLQljYXNlIFZDUzI6IHJl dHVybiAiYnNkMiI7Ci0JZGVmYXVsdDogcmV0dXJuICIiOwotCX0KK3N0YXRpYyBjb25zdCBjaGFy ICplbmdpbmVfc3RyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBpbnQgZW5naW5lX2lk KQoreworCWlmICghaTkxNS0+ZW5naW5lW2VuZ2luZV9pZF0pCisJCXJldHVybiAiIjsKKwllbHNl CisJCXJldHVybiBpOTE1LT5lbmdpbmVbZW5naW5lX2lkXS0+bmFtZTsKIH0KIAogc3RhdGljIGNv bnN0IGNoYXIgKnRpbGluZ19mbGFnKGludCB0aWxpbmcpCkBAIC0zNDUsNyArMzQxLDcgQEAgc3Rh dGljIHZvaWQgcHJpbnRfZXJyb3JfYnVmZmVycyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVf YnVmICptLAogCQllcnJfcHV0cyhtLCBwdXJnZWFibGVfZmxhZyhlcnItPnB1cmdlYWJsZSkpOwog CQllcnJfcHV0cyhtLCBlcnItPnVzZXJwdHIgPyAiIHVzZXJwdHIiIDogIiIpOwogCQllcnJfcHV0 cyhtLCBlcnItPmVuZ2luZSAhPSAtMSA/ICIgIiA6ICIiKTsKLQkJZXJyX3B1dHMobSwgZW5naW5l X3N0cihlcnItPmVuZ2luZSkpOworCQllcnJfcHV0cyhtLCBlbmdpbmVfc3RyKG0tPmk5MTUsIGVy ci0+ZW5naW5lKSk7CiAJCWVycl9wdXRzKG0sIGk5MTVfY2FjaGVfbGV2ZWxfc3RyKG0tPmk5MTUs IGVyci0+Y2FjaGVfbGV2ZWwpKTsKIAogCQlpZiAoZXJyLT5uYW1lKQpAQCAtNDE3LDcgKzQxMyw4 IEBAIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jf c3RhdGVfYnVmICptLAogewogCWludCBuOwogCi0JZXJyX3ByaW50ZihtLCAiJXMgY29tbWFuZCBz dHJlYW06XG4iLCBlbmdpbmVfc3RyKGVlLT5lbmdpbmVfaWQpKTsKKwllcnJfcHJpbnRmKG0sICIl cyBjb21tYW5kIHN0cmVhbTpcbiIsIGVuZ2luZV9zdHIobS0+aTkxNSwKKwkJCQkJCQkgZWUtPmVu Z2luZV9pZCkpOwogCWVycl9wcmludGYobSwgIiAgSURMRT86ICVzXG4iLCB5ZXNubyhlZS0+aWRs ZSkpOwogCWVycl9wcmludGYobSwgIiAgU1RBUlQ6IDB4JTA4eFxuIiwgZWUtPnN0YXJ0KTsKIAll cnJfcHJpbnRmKG0sICIgIEhFQUQ6ICAweCUwOHggWzB4JTA4eF1cbiIsIGVlLT5oZWFkLCBlZS0+ cnFfaGVhZCk7CkBAIC02MzMsNyArNjMwLDcgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3Ry KHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCWlmIChlcnJvci0+ZW5naW5l W2ldLmhhbmdjaGVja19zdGFsbGVkICYmCiAJCSAgICBlcnJvci0+ZW5naW5lW2ldLmNvbnRleHQu cGlkKSB7CiAJCQllcnJfcHJpbnRmKG0sICJBY3RpdmUgcHJvY2VzcyAob24gcmluZyAlcyk6ICVz IFslZF0sIHNjb3JlICVkXG4iLAotCQkJCSAgIGVuZ2luZV9zdHIoaSksCisJCQkJICAgZW5naW5l X3N0cihtLT5pOTE1LCBpKSwKIAkJCQkgICBlcnJvci0+ZW5naW5lW2ldLmNvbnRleHQuY29tbSwK IAkJCQkgICBlcnJvci0+ZW5naW5lW2ldLmNvbnRleHQucGlkLAogCQkJCSAgIGVycm9yLT5lbmdp bmVbaV0uY29udGV4dC5iYW5fc2NvcmUpOwotLSAKMi4xNS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK