From: Arun Siluvery Subject: [PATCH 07/14] drm/i915/tdr: Restore engine state and start after reset Date: Tue, 12 Apr 2016 17:59:34 +0100 Message-ID: <1460480381-8777-8-git-send-email-arun.siluvery@linux.intel.com> References: <1460480381-8777-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id E42D76E73E for ; Tue, 12 Apr 2016 16:59:58 +0000 (UTC) In-Reply-To: <1460480381-8777-1-git-send-email-arun.siluvery@linux.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 Cc: Tomas Elf List-Id: intel-gfx@lists.freedesktop.org V2UgY2FwdHVyZSB0aGUgc3RhdGUgb2YgYW4gZW5naW5lIGJlZm9yZSByZXNldHRpbmcgaXQsIG9u Y2UgdGhlIHJlc2V0IGlzCnN1Y2Nlc3NmdWwgZW5naW5lIGlzIHJlc3RvcmVkIHdpdGggdGhlIHNh bWUgc3RhdGUgYW5kIHJlc3RhcnRlZC4KClRoZSBzdGF0ZSBpbmNsdWRlcyBoZWFkIHJlZ2lzdGVy IGFuZCBhY3RpdmUgcmVxdWVzdC4gV2UgYWxzbyBudWRnZSB0aGUgaGVhZApmb3J3YXJkIGlmIGl0 IGhhc24ndCBhZHZhbmNlZCwgb3RoZXJ3aXNlIHdoZW4gdGhlIGVuZ2luZSBpcyByZXN0YXJ0ZWQg SFcKZXhlY3V0ZXMgdGhlIHNhbWUgaW5zdHJ1Y3Rpb24gYW5kIG1heSBoYW5nIGFnYWluLiBHZW5l cmFsbHkgaGVhZAphdXRvbWF0aWNhbGx5IGFkdmFuY2VzIHRvIHRoZSBuZXh0IGluc3RydWN0aW9u IGFzIHNvb24gYXMgSFcgcmVhZHMgY3VycmVudAppbnN0cnVjdGlvbiwgd2l0aG91dCB3YWl0aW5n IGZvciBpdCB0byBjb21wbGV0ZSwgaG93ZXZlciBhIE1CT1ggd2FpdAppbnNlcnRlZCBkaXJlY3Rs eSB0byBWQ1MvQkNTIGVuZ2luZXMgZG9lc24ndCBiZWhhdmUgaW4gdGhlIHNhbWUgd2F5LAppbnN0 ZWFkIGhlYWQgd2lsbCBzdGlsbCBiZSBwb2ludGluZyBhdCB0aGUgc2FtZSBpbnN0cnVjdGlvbiB1 bnRpbCBpdApjb21wbGV0ZXMuCgpJZiB0aGUgaGVhZCBpcyBtb2RpZmllZCwgdGhpcyBpcyBhbHNv IHVwZGF0ZWQgaW4gdGhlIGNvbnRleHQgaW1hZ2Ugc28gdGhhdApIVyBzZWVzIHVwIHRvIGRhdGUg dmFsdWUuCgpBIHZhbGlkIHJlcXVlc3QgaXMgZXhwZWN0ZWQgaW4gdGhlIHN0YXRlIGF0IHRoaXMg cG9pbnQgb3RoZXJ3aXNlIHdlCndvdWxkbid0IGhhdmUgcmVhY2hlZCB0aGlzIHBvaW50LCB0aGUg Y29udGV4dCB0aGF0IHN1Ym1pdHRlZCB0aGlzIHJlcXVlc3QKaXMgcmVzdWJtaXR0ZWQgdG8gSFcu IFRoZSByZXF1ZXN0IHRoYXQgY2F1c2VkIHRoZSBoYW5nIHdvdWxkIGJlIGF0IHRoZQpzdGFydCBv ZiBleGVjbGlzdCBxdWV1ZSwgdW5sZXNzIHdlIHJlc3VibWl0IGFuZCBjb21wbGV0ZSB0aGlzIHJl cXVlc3QsIGl0CmNhbm5vdCBiZSByZW1vdmVkIGZyb20gdGhlIHF1ZXVlLgoKQ2M6IE1pa2EgS3Vv cHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUb21h cyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkg PGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jICAgICAgICB8IDk0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDkgKysrKwogMiBm aWxlcyBjaGFuZ2VkLCAxMDMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK aW5kZXggNWJmYzkzZC4uODZkNWUxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTUw NSw2ICs1MDUsMzAgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0cyhy ZXEwLCByZXExLCB0ZHJfcmVzdWJtaXNzaW9uKTsKIH0KIAorLyoqCisgKiBpbnRlbF9leGVjbGlz dHNfcmVzdWJtaXQoKQorICogQGVuZ2luZTogZW5naW5lIHRvIGRvIHJlc3VibWlzc2lvbiBmb3IK KyAqCisgKiBJbiBleGVjbGlzdHMgbW9kZSwgZW5naW5lIHJlc2V0IHBvc3Rwcm9jZXNzIG1haW5s eSBpbmNsdWRlcyByZXN1Ym1pc3Npb24gb2YKKyAqIGNvbnRleHQgYWZ0ZXIgcmVzZXQsIGZvciB0 aGlzIHdlIGJ5cGFzcyB0aGUgZXhlY2xpc3QgcXVldWUuIFRoaXMgaXMKKyAqIG5lY2Vzc2FyeSBz aW5jZSBhdCB0aGUgcG9pbnQgb2YgVERSIGhhbmcgcmVjb3ZlcnkgdGhlIGhhcmR3YXJlIHdpbGwg YmUgaHVuZworICogYW5kIHJlc3VibWl0dGluZyBhIGZpeGVkIGNvbnRleHQgKHRoZSBjb250ZXh0 IHRoYXQgdGhlIFREUiBoYXMgaWRlbnRpZmllZAorICogYXMgaHVuZyBhbmQgZml4ZWQgdXAgaW4g b3JkZXIgdG8gbW92ZSBwYXN0IHRoZSBibG9ja2luZyBiYXRjaCBidWZmZXIpIHRvIGEKKyAqIGh1 bmcgZXhlY2xpc3QgcXVldWUgd2lsbCBsb2NrIHVwIHRoZSBURFIuICBJbnN0ZWFkLCBvcHQgZm9y IGRpcmVjdCBFTFNQCisgKiBzdWJtaXNzaW9uIHdpdGhvdXQgZGVwZW5kaW5nIG9uIHRoZSByZXN0 IG9mIHRoZSBkcml2ZXIuCisgKi8KK3N0YXRpYyB2b2lkIGludGVsX2V4ZWNsaXN0c19yZXN1Ym1p dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJdW5zaWduZWQgbG9uZyBmbGFn czsKKworCWlmIChXQVJOX09OKGxpc3RfZW1wdHkoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpKSkK KwkJcmV0dXJuOworCisJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jaywg ZmxhZ3MpOworCWV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoZW5naW5lLCB0cnVlKTsKKwlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKK30KKwog c3RhdGljIHVuc2lnbmVkIGludAogZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyIHJlcXVlc3RfaWQpCiB7CkBAIC0xMjY5LDYg KzEyOTMsNzUgQEAgc3RhdGljIGludCBnZW44X2VuZ2luZV9zdGF0ZV9zYXZlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSwKIAlyZXR1cm4gMDsKIH0KIAorLyoqCisgKiBnZW44X2VuZ2lu ZV9zdGFydCgpIC0gcmVzdG9yZSBzYXZlZCBzdGF0ZSBhbmQgc3RhcnQgZW5naW5lCisgKiBAZW5n aW5lOiBlbmdpbmUgdG8gYmUgc3RhcnRlZAorICogQHN0YXRlOiBzdGF0ZSB0byBiZSByZXN0b3Jl ZAorICoKKyAqIFJldHVybnM6CisgKgkwIGlmIG9rLCBvdGhlcndpc2UgcHJvcGFnYXRlcyBlcnJv ciBjb2Rlcy4KKyAqLworc3RhdGljIGludCBnZW44X2VuZ2luZV9zdGFydChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Nfc3RhdGUg KnN0YXRlKQoreworCXUzMiBoZWFkOworCXUzMiBoZWFkX2FkZHIsIHRhaWxfYWRkcjsKKwl1MzIg KnJlZ19zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKKwlzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGVuZ2luZS0+ZGV2LT5kZXZfcHJpdmF0ZTsKKworCWN0eCA9IHN0YXRlLT5yZXEtPmN0eDsKKwly aW5nYnVmID0gY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1ZjsKKwlyZWdfc3RhdGUgPSBj dHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfcmVnX3N0YXRlOworCisJaGVhZCA9IHN0YXRlLT5o ZWFkOworCWhlYWRfYWRkciA9IGhlYWQgJiBIRUFEX0FERFI7CisKKwlpZiAoaGVhZCA9PSBlbmdp bmUtPmhhbmdjaGVjay5sYXN0X2hlYWQpIHsKKwkJLyoKKwkJICogVGhlIGVuZ2luZSBoYXMgbm90 IGFkdmFuY2VkIHNpbmNlIHRoZSBsYXN0IHRpbWUgaXQgaHVuZywKKwkJICogZm9yY2UgaXQgdG8g YWR2YW5jZSB0byB0aGUgbmV4dCBRV09SRC4gSW4gbW9zdCBjYXNlcyB0aGUKKwkJICogZW5naW5l IGhlYWQgcG9pbnRlciB3aWxsIGF1dG9tYXRpY2FsbHkgYWR2YW5jZSB0byB0aGUKKwkJICogbmV4 dCBpbnN0cnVjdGlvbiBhcyBzb29uIGFzIGl0IGhhcyByZWFkIHRoZSBjdXJyZW50CisJCSAqIGlu c3RydWN0aW9uLCB3aXRob3V0IHdhaXRpbmcgZm9yIGl0IHRvIGNvbXBsZXRlLiBUaGlzCisJCSAq IHNlZW1zIHRvIGJlIHRoZSBkZWZhdWx0IGJlaGF2aW91ciwgaG93ZXZlciBhbiBNQk9YIHdhaXQK KwkJICogaW5zZXJ0ZWQgZGlyZWN0bHkgdG8gdGhlIFZDUy9CQ1MgZW5naW5lcyBkb2VzIG5vdCBi ZWhhdmUKKwkJICogaW4gdGhlIHNhbWUgd2F5LCBpbnN0ZWFkIHRoZSBoZWFkIHBvaW50ZXIgd2ls bCBzdGlsbCBiZQorCQkgKiBwb2ludGluZyBhdCB0aGUgTUJPWCBpbnN0cnVjdGlvbiB1bnRpbCBp dCBjb21wbGV0ZXMuCisJCSAqLworCQloZWFkX2FkZHIgPSByb3VuZHVwKGhlYWRfYWRkciwgOCk7 CisJCWVuZ2luZS0+aGFuZ2NoZWNrLmxhc3RfaGVhZCA9IGhlYWQ7CisJfSBlbHNlIGlmIChoZWFk X2FkZHIgJiAweDcpIHsKKwkJLyogRW5zdXJlIGhlYWQgcG9pbnRlciBpcyBwb2ludGluZyB0byBh IFFXT1JEIGJvdW5kYXJ5ICovCisJCWhlYWRfYWRkciA9IEFMSUdOKGhlYWRfYWRkciwgOCk7CisJ fQorCisJdGFpbF9hZGRyID0gcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gJiBUQUlMX0FERFI7 CisKKwlpZiAoaGVhZF9hZGRyID4gdGFpbF9hZGRyKQorCQloZWFkX2FkZHIgPSB0YWlsX2FkZHI7 CisJZWxzZSBpZiAoaGVhZF9hZGRyID49IHJpbmdidWYtPnNpemUpCisJCWhlYWRfYWRkciA9IDA7 CisKKwloZWFkICY9IH5IRUFEX0FERFI7CisJaGVhZCB8PSAoaGVhZF9hZGRyICYgSEVBRF9BRERS KTsKKworCS8qIFJlc3RvcmUgaGVhZCAqLworCXJlZ19zdGF0ZVtDVFhfUklOR19IRUFEKzFdID0g aGVhZDsKKwlJOTE1X1dSSVRFX0hFQUQoZW5naW5lLCBoZWFkKTsKKworCS8qIHNldCBoZWFkICov CisJcmluZ2J1Zi0+aGVhZCA9IGhlYWQ7CisJcmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgPSAt MTsKKwlpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShyaW5nYnVmKTsKKworCWlmIChzdGF0ZS0+cmVx KQorCQlpbnRlbF9leGVjbGlzdHNfcmVzdWJtaXQoZW5naW5lKTsKKworCXJldHVybiAwOworfQor CiBzdGF0aWMgaW50IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWludCByZXQsIGk7CkBAIC0yMTc1LDYgKzIy NjgsNyBAQCBsb2dpY2FsX3JpbmdfZGVmYXVsdF92ZnVuY3Moc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAogCS8qIGVuZ2luZSByZXNldCBzdXBwb3J0aW5nIGZ1bmN0aW9ucyAqLwogCWVuZ2luZS0+ c2F2ZSA9IGdlbjhfZW5naW5lX3N0YXRlX3NhdmU7CisJZW5naW5lLT5zdGFydCA9IGdlbjhfZW5n aW5lX3N0YXJ0OwogCiAJaWYgKElTX0JYVF9SRVZJRChkZXYsIDAsIEJYVF9SRVZJRF9BMSkpIHsK IAkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllciA9IGJ4dF9hX3NlcW5vX2JhcnJpZXI7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNjJmOWZiNC4uOTJlNWQwMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtOTIsNiArOTIsMTMg QEAgc3RydWN0IGludGVsX3JpbmdfaGFuZ2NoZWNrIHsKIAllbnVtIGludGVsX3JpbmdfaGFuZ2No ZWNrX2FjdGlvbiBhY3Rpb247CiAJaW50IGRlYWRsb2NrOwogCXUzMiBpbnN0ZG9uZVtJOTE1X05V TV9JTlNURE9ORV9SRUddOworCisJLyoKKwkgKiBMYXN0IHJlY29yZGVkIHJpbmcgaGVhZCBpbmRl eC4KKwkgKiBUaGlzIGlzIG9ubHkgZXZlciBhIHJpbmcgaW5kZXggd2hlcmUgYXMgYWN0aXZlCisJ ICogaGVhZCBtYXkgYmUgYSBncmFwaGljcyBhZGRyZXNzIGluIGEgcmluZyBidWZmZXIKKwkgKi8K Kwl1MzIgbGFzdF9oZWFkOwogfTsKIAogc3RydWN0IGludGVsX3JpbmdidWZmZXIgewpAQCAtMjE1 LDYgKzIyMiw4IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAkvKiBlbmdpbmUgcmVzZXQg c3VwcG9ydGluZyBmdW5jdGlvbnMgKi8KIAlpbnQgKCpzYXZlKShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCiAJCSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzX3N0YXRlICpzdGF0ZSk7 CisJaW50ICgqc3RhcnQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzX3N0YXRlICpzdGF0ZSk7CiAKIAkvKiBHRU44IHNpZ25hbC93 YWl0IHRhYmxlIC0gbmV2ZXIgdHJ1c3QgY29tbWVudHMhCiAJICoJICBzaWduYWwgdG8Jc2lnbmFs IHRvICAgIHNpZ25hbCB0byAgIHNpZ25hbCB0byAgICAgIHNpZ25hbCB0bwotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=