From: Mika Kuoppala Subject: [PATCH] drm/i915: Stop engines before reset Date: Tue, 19 Sep 2017 17:41:28 +0300 Message-ID: <20170919144128.25506-1-mika.kuoppala@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 EF2E96E5C8 for ; Tue, 19 Sep 2017 14:43:27 +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 T24ga2JsIGV2aWRlbmNlIGluZGljYXRlcyB0aGF0IGV2ZW4gaWYgdGhlIGhhcmR3YXJlIGhhcHBp bHkKdGVsbHMgdXMgdG8gcHJvY2VlZCB3aXRoIHJlc2V0LCBpdCByZWFsbHkgaXNuJ3QgcmVhZHku ClJlc2V0dGluZyBhIGZyZWVseSBydW5uaW5nIGJhdGNoYnVmZmVyIGFmdGVyIHdlIGhhdmUgYWNr IGZvciByZWFkaW5lc3MsCnN0aWxsIGNhbiBjYXVzZSBhIHN5c3RlbSBoYW5nLgoKV2UgYWxzbyBo YXZlIHNpbWlsYXIgZXhwZXJpZW5jZXMgb24gb2xkZXIgZ2Vucy4gU28gbm93CmF0dGVtcHQgdG8g c3RvcCBlbmdpbmVzIGJlZm9yZSBwcm9jZWVkaW5nIGZvciByZXNldCwgb24gYWxsCmdlbnMgd2hl cmUgd2UgaGF2ZSBhIGdwdSByZXNldC4gVGhpcyBoYXMgc2hvd24gdG8gaW1wcm92ZSByZXNldApy ZWxpYWJpbGl0eSBhbmQgcmVkdWNlIHRoZSByaXNrIG9mIGxvc2luZyB0aGUgbWFjaGluZS4KCnYy OiBBZGQgZml4bWUgZm9yIHdhIChKb29uYXMpCgpUZXN0Y2FzZTogaWd0L3ByaW1lX2J1c3kvaGFu Zy0qICMga2JsCkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRl bC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpBY2tlZC1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkFja2VkLWJ5OiBKb29uYXMgTGFo dGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCA3NSArKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCA5NzUyNWRlMmNlZTQuLmZk ZDdmOTNhY2I0ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTEzNTQsMzMg KzEzNTQsMzkgQEAgaW50IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBnZW4zX3N0b3BfcmluZ3Moc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZvaWQgZ2VuM19zdG9wX2VuZ2lu ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCWNvbnN0IHUzMiBiYXNlID0gZW5naW5l LT5tbWlvX2Jhc2U7CisJY29uc3QgaTkxNV9yZWdfdCBtb2RlID0gUklOR19NSV9NT0RFKGJhc2Up OworCisJSTkxNV9XUklURV9GVyhtb2RlLCBfTUFTS0VEX0JJVF9FTkFCTEUoU1RPUF9SSU5HKSk7 CisJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyX2Z3KGRldl9wcml2LAorCQkJCSAgICAgICBt b2RlLAorCQkJCSAgICAgICBNT0RFX0lETEUsCisJCQkJICAgICAgIE1PREVfSURMRSwKKwkJCQkg ICAgICAgNTAwKSkKKwkJRFJNX0RFQlVHX0RSSVZFUigiJXM6IHRpbWVkIG91dCBvbiBTVE9QX1JJ TkdcbiIsCisJCQkJIGVuZ2luZS0+bmFtZSk7CisKKwlJOTE1X1dSSVRFX0ZXKFJJTkdfQ1RMKGJh c2UpLCAwKTsKKwlJOTE1X1dSSVRFX0ZXKFJJTkdfSEVBRChiYXNlKSwgMCk7CisJSTkxNV9XUklU RV9GVyhSSU5HX1RBSUwoYmFzZSksIDApOworCisJLyogQ2hlY2sgYWN0cyBhcyBhIHBvc3QgKi8K KwlpZiAoSTkxNV9SRUFEX0ZXKFJJTkdfSEVBRChiYXNlKSkgIT0gMCkKKwkJRFJNX0RFQlVHX0RS SVZFUigiJXM6IHJpbmcgaGVhZCBub3QgcGFya2VkXG4iLAorCQkJCSBlbmdpbmUtPm5hbWUpOwor fQorCitzdGF0aWMgdm9pZCBpOTE1X3N0b3BfZW5naW5lcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkgICAgICB1bnNpZ25lZCBlbmdpbmVfbWFzaykKIHsKIAlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKLQlm b3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKLQkJY29uc3QgdTMyIGJhc2Ug PSBlbmdpbmUtPm1taW9fYmFzZTsKLQkJY29uc3QgaTkxNV9yZWdfdCBtb2RlID0gUklOR19NSV9N T0RFKGJhc2UpOwotCi0JCUk5MTVfV1JJVEVfRlcobW9kZSwgX01BU0tFRF9CSVRfRU5BQkxFKFNU T1BfUklORykpOwotCQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJfZncoZGV2X3ByaXYsCi0J CQkJCSAgICAgICBtb2RlLAotCQkJCQkgICAgICAgTU9ERV9JRExFLAotCQkJCQkgICAgICAgTU9E RV9JRExFLAotCQkJCQkgICAgICAgNTAwKSkKLQkJCURSTV9ERUJVR19EUklWRVIoIiVzOiB0aW1l ZCBvdXQgb24gU1RPUF9SSU5HXG4iLAotCQkJCQkgZW5naW5lLT5uYW1lKTsKLQotCQlJOTE1X1dS SVRFX0ZXKFJJTkdfQ1RMKGJhc2UpLCAwKTsKLQkJSTkxNV9XUklURV9GVyhSSU5HX0hFQUQoYmFz ZSksIDApOwotCQlJOTE1X1dSSVRFX0ZXKFJJTkdfVEFJTChiYXNlKSwgMCk7Ci0KLQkJLyogQ2hl Y2sgYWN0cyBhcyBhIHBvc3QgKi8KLQkJaWYgKEk5MTVfUkVBRF9GVyhSSU5HX0hFQUQoYmFzZSkp ICE9IDApCi0JCQlEUk1fREVCVUdfRFJJVkVSKCIlczogcmluZyBoZWFkIG5vdCBwYXJrZWRcbiIs Ci0JCQkJCSBlbmdpbmUtPm5hbWUpOwotCX0KKwlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2lu ZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCBpZCkKKwkJZ2VuM19zdG9wX2VuZ2luZShlbmdpbmUp OwogfQogCiBzdGF0aWMgYm9vbCBpOTE1X3Jlc2V0X2NvbXBsZXRlKHN0cnVjdCBwY2lfZGV2ICpw ZGV2KQpAQCAtMTQxNSw5ICsxNDIxLDYgQEAgc3RhdGljIGludCBnMzNfZG9fcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKIHsKIAlz dHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAotCS8qIFN0b3AgZW5n aW5lcyBiZWZvcmUgd2UgcmVzZXQ7IHNlZSBnNHhfZG9fcmVzZXQoKSBiZWxvdyBmb3Igd2h5LiAq LwotCWdlbjNfc3RvcF9yaW5ncyhkZXZfcHJpdik7Ci0KIAlwY2lfd3JpdGVfY29uZmlnX2J5dGUo cGRldiwgSTkxNV9HRFJTVCwgR1JET01fUkVTRVRfRU5BQkxFKTsKIAlyZXR1cm4gd2FpdF9mb3Io ZzR4X3Jlc2V0X2NvbXBsZXRlKHBkZXYpLCA1MDApOwogfQpAQCAtMTQzMiwxMiArMTQzNSw2IEBA IHN0YXRpYyBpbnQgZzR4X2RvX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgdW5zaWduZWQgZW5naW5lX21hc2spCiAJCSAgIEk5MTVfUkVBRChWREVDQ0xLX0dBVEVfRCkg fCBWQ1BfVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwogCVBPU1RJTkdfUkVBRChWREVDQ0xLX0dB VEVfRCk7CiAKLQkvKiBXZSBzdG9wIGVuZ2luZXMsIG90aGVyd2lzZSB3ZSBtaWdodCBnZXQgZmFp bGVkIHJlc2V0IGFuZCBhCi0JICogZGVhZCBncHUgKG9uIGVsaykuCi0JICogV2FNZWRpYVJlc2V0 TWFpblJpbmdDbGVhbnVwOmN0ZyxlbGsgKHByZXN1bWFibHkpCi0JICovCi0JZ2VuM19zdG9wX3Jp bmdzKGRldl9wcml2KTsKLQogCXBjaV93cml0ZV9jb25maWdfYnl0ZShwZGV2LCBJOTE1X0dEUlNU LAogCQkJICAgICAgR1JET01fTUVESUEgfCBHUkRPTV9SRVNFVF9FTkFCTEUpOwogCXJldCA9ICB3 YWl0X2ZvcihnNHhfcmVzZXRfY29tcGxldGUocGRldiksIDUwMCk7CkBAIC0xNzQyLDYgKzE3Mzks MjAgQEAgaW50IGludGVsX2dwdV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQogCSAqLwogCWludGVsX3VuY29yZV9mb3JjZXdha2Vf Z2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAlmb3IgKHJldHJ5ID0gMDsgcmV0cnkgPCAz OyByZXRyeSsrKSB7CisKKwkJLyogV2Ugc3RvcCBlbmdpbmVzLCBvdGhlcndpc2Ugd2UgbWlnaHQg Z2V0IGZhaWxlZCByZXNldCBhbmQgYQorCQkgKiBkZWFkIGdwdSAob24gZWxrKS4gQWxzbyBhcyBt b2Rlcm4gZ3B1IGFzIGtibCBjYW4gc3VmZmVyCisJCSAqIGZyb20gc3lzdGVtIGhhbmcgaWYgYmF0 Y2hidWZmZXIgaXMgcHJvZ3Jlc3Npbmcgd2hlbgorCQkgKiB0aGUgcmVzZXQgaXMgaXNzdWVkLCBy ZWdhcmRsZXNzIG9mIFJFQURZX1RPX1JFU0VUIGFjay4KKwkJICogVGh1cyBhc3N1bWUgaXQgaXMg YmVzdCB0byBzdG9wIGVuZ2luZXMgb24gYWxsIGdlbnMKKwkJICogd2hlcmUgd2UgaGF2ZSBhIGdw dSByZXNldC4KKwkJICoKKwkJICogV2FNZWRpYVJlc2V0TWFpblJpbmdDbGVhbnVwOmN0ZyxlbGsg KHByZXN1bWFibHkpCisJCSAqCisJCSAqIEZJWE1FOiBXYSBmb3IgbW9yZSBtb2Rlcm4gZ2VucyBu ZWVkcyB0byBiZSB2YWxpZGF0ZWQKKwkJICovCisJCWk5MTVfc3RvcF9lbmdpbmVzKGRldl9wcml2 LCBlbmdpbmVfbWFzayk7CisKIAkJcmV0ID0gcmVzZXQoZGV2X3ByaXYsIGVuZ2luZV9tYXNrKTsK IAkJaWYgKHJldCAhPSAtRVRJTUVET1VUKQogCQkJYnJlYWs7Ci0tIAoyLjExLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=