From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH] drm/i915: Stop engines before reset Date: Thu, 14 Sep 2017 14:10:40 +0300 Message-ID: <20170914111040.15744-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 919D76E147 for ; Thu, 14 Sep 2017 11:12:04 +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 ZWxpYWJpbGl0eSBhbmQgcmVkdWNlIHRoZSByaXNrIG9mIGxvc2luZyB0aGUgbWFjaGluZS4KClRl c3RjYXNlOiBpZ3QvcHJpbWVfYnVzeS9oYW5nLSogIyBrYmwKQ2M6IEpvb25hcyBMYWh0aW5lbiA8 am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFs YUBpbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDcyICsrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MCBpbnNl cnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j CmluZGV4IDk3NTI1ZGUyY2VlNC4uNDczMzI1NzA1YjkyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYwpAQCAtMTM1NCwzMyArMTM1NCwzOCBAQCBpbnQgaTkxNV9yZWdfcmVhZF9pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lk IGdlbjNfc3RvcF9yaW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0 aWMgdm9pZCBnZW4zX3N0b3BfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CisJ Y29uc3QgdTMyIGJhc2UgPSBlbmdpbmUtPm1taW9fYmFzZTsKKwljb25zdCBpOTE1X3JlZ190IG1v ZGUgPSBSSU5HX01JX01PREUoYmFzZSk7CisKKwlJOTE1X1dSSVRFX0ZXKG1vZGUsIF9NQVNLRURf QklUX0VOQUJMRShTVE9QX1JJTkcpKTsKKwlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJfZnco ZGV2X3ByaXYsCisJCQkJICAgICAgIG1vZGUsCisJCQkJICAgICAgIE1PREVfSURMRSwKKwkJCQkg ICAgICAgTU9ERV9JRExFLAorCQkJCSAgICAgICA1MDApKQorCQlEUk1fREVCVUdfRFJJVkVSKCIl czogdGltZWQgb3V0IG9uIFNUT1BfUklOR1xuIiwKKwkJCQkgZW5naW5lLT5uYW1lKTsKKworCUk5 MTVfV1JJVEVfRlcoUklOR19DVEwoYmFzZSksIDApOworCUk5MTVfV1JJVEVfRlcoUklOR19IRUFE KGJhc2UpLCAwKTsKKwlJOTE1X1dSSVRFX0ZXKFJJTkdfVEFJTChiYXNlKSwgMCk7CisKKwkvKiBD aGVjayBhY3RzIGFzIGEgcG9zdCAqLworCWlmIChJOTE1X1JFQURfRlcoUklOR19IRUFEKGJhc2Up KSAhPSAwKQorCQlEUk1fREVCVUdfRFJJVkVSKCIlczogcmluZyBoZWFkIG5vdCBwYXJrZWRcbiIs CisJCQkJIGVuZ2luZS0+bmFtZSk7Cit9CisKK3N0YXRpYyB2b2lkIGk5MTVfc3RvcF9lbmdpbmVz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgZW5naW5lX21hc2sp CiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5l X2lkIGlkOwogCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7Ci0JCWNv bnN0IHUzMiBiYXNlID0gZW5naW5lLT5tbWlvX2Jhc2U7Ci0JCWNvbnN0IGk5MTVfcmVnX3QgbW9k ZSA9IFJJTkdfTUlfTU9ERShiYXNlKTsKLQotCQlJOTE1X1dSSVRFX0ZXKG1vZGUsIF9NQVNLRURf QklUX0VOQUJMRShTVE9QX1JJTkcpKTsKLQkJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyX2Z3 KGRldl9wcml2LAotCQkJCQkgICAgICAgbW9kZSwKLQkJCQkJICAgICAgIE1PREVfSURMRSwKLQkJ CQkJICAgICAgIE1PREVfSURMRSwKLQkJCQkJICAgICAgIDUwMCkpCi0JCQlEUk1fREVCVUdfRFJJ VkVSKCIlczogdGltZWQgb3V0IG9uIFNUT1BfUklOR1xuIiwKLQkJCQkJIGVuZ2luZS0+bmFtZSk7 Ci0KLQkJSTkxNV9XUklURV9GVyhSSU5HX0NUTChiYXNlKSwgMCk7Ci0JCUk5MTVfV1JJVEVfRlco UklOR19IRUFEKGJhc2UpLCAwKTsKLQkJSTkxNV9XUklURV9GVyhSSU5HX1RBSUwoYmFzZSksIDAp OwotCi0JCS8qIENoZWNrIGFjdHMgYXMgYSBwb3N0ICovCi0JCWlmIChJOTE1X1JFQURfRlcoUklO R19IRUFEKGJhc2UpKSAhPSAwKQotCQkJRFJNX0RFQlVHX0RSSVZFUigiJXM6IHJpbmcgaGVhZCBu b3QgcGFya2VkXG4iLAotCQkJCQkgZW5naW5lLT5uYW1lKTsKLQl9CisJZm9yX2VhY2hfZW5naW5l X21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFzaywgaWQpCisJCWdlbjNfc3RvcF9l bmdpbmUoZW5naW5lKTsKIH0KIAogc3RhdGljIGJvb2wgaTkxNV9yZXNldF9jb21wbGV0ZShzdHJ1 Y3QgcGNpX2RldiAqcGRldikKQEAgLTE0MTUsOSArMTQyMCw2IEBAIHN0YXRpYyBpbnQgZzMzX2Rv X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgZW5naW5l X21hc2spCiB7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAK LQkvKiBTdG9wIGVuZ2luZXMgYmVmb3JlIHdlIHJlc2V0OyBzZWUgZzR4X2RvX3Jlc2V0KCkgYmVs b3cgZm9yIHdoeS4gKi8KLQlnZW4zX3N0b3BfcmluZ3MoZGV2X3ByaXYpOwotCiAJcGNpX3dyaXRl X2NvbmZpZ19ieXRlKHBkZXYsIEk5MTVfR0RSU1QsIEdSRE9NX1JFU0VUX0VOQUJMRSk7CiAJcmV0 dXJuIHdhaXRfZm9yKGc0eF9yZXNldF9jb21wbGV0ZShwZGV2KSwgNTAwKTsKIH0KQEAgLTE0MzIs MTIgKzE0MzQsNiBAQCBzdGF0aWMgaW50IGc0eF9kb19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQogCQkgICBJOTE1X1JFQUQoVkRF Q0NMS19HQVRFX0QpIHwgVkNQX1VOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFKTsKIAlQT1NUSU5HX1JF QUQoVkRFQ0NMS19HQVRFX0QpOwogCi0JLyogV2Ugc3RvcCBlbmdpbmVzLCBvdGhlcndpc2Ugd2Ug bWlnaHQgZ2V0IGZhaWxlZCByZXNldCBhbmQgYQotCSAqIGRlYWQgZ3B1IChvbiBlbGspLgotCSAq IFdhTWVkaWFSZXNldE1haW5SaW5nQ2xlYW51cDpjdGcsZWxrIChwcmVzdW1hYmx5KQotCSAqLwot CWdlbjNfc3RvcF9yaW5ncyhkZXZfcHJpdik7Ci0KIAlwY2lfd3JpdGVfY29uZmlnX2J5dGUocGRl diwgSTkxNV9HRFJTVCwKIAkJCSAgICAgIEdSRE9NX01FRElBIHwgR1JET01fUkVTRVRfRU5BQkxF KTsKIAlyZXQgPSAgd2FpdF9mb3IoZzR4X3Jlc2V0X2NvbXBsZXRlKHBkZXYpLCA1MDApOwpAQCAt MTc0Miw2ICsxNzM4LDE4IEBAIGludCBpbnRlbF9ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKIAkgKi8KIAlpbnRlbF91bmNv cmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAJZm9yIChyZXRyeSA9 IDA7IHJldHJ5IDwgMzsgcmV0cnkrKykgeworCisJCS8qIFdlIHN0b3AgZW5naW5lcywgb3RoZXJ3 aXNlIHdlIG1pZ2h0IGdldCBmYWlsZWQgcmVzZXQgYW5kIGEKKwkJICogZGVhZCBncHUgKG9uIGVs aykuIEFsc28gYXMgbW9kZXJuIGdwdSBhcyBrYmwgY2FuIHN1ZmZlcgorCQkgKiBmcm9tIHN5c3Rl bSBoYW5nIGlmIGJhdGNoYnVmZmVyIGlzIHByb2dyZXNzaW5nIHdoZW4KKwkJICogdGhlIHJlc2V0 IGlzIGlzc3VlZCwgcmVnYXJkbGVzcyBvZiBSRUFEWV9UT19SRVNFVCBhY2suCisJCSAqIFRodXMg YXNzdW1lIGl0IGlzIGJlc3QgdG8gc3RvcCBlbmdpbmVzIG9uIGFsbCBnZW5zCisJCSAqIHdoZXJl IHdlIGhhdmUgYSBncHUgcmVzZXQuCisJCSAqCisJCSAqIFdhTWVkaWFSZXNldE1haW5SaW5nQ2xl YW51cDpjdGcsZWxrIChwcmVzdW1hYmx5KQorCQkgKi8KKwkJaTkxNV9zdG9wX2VuZ2luZXMoZGV2 X3ByaXYsIGVuZ2luZV9tYXNrKTsKKwogCQlyZXQgPSByZXNldChkZXZfcHJpdiwgZW5naW5lX21h c2spOwogCQlpZiAocmV0ICE9IC1FVElNRURPVVQpCiAJCQlicmVhazsKLS0gCjIuMTEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==