From: Michel Thierry Subject: [PATCH v6 13/20] drm/i915/guc: Provide register list to be saved/restored during engine reset Date: Tue, 18 Apr 2017 13:23:28 -0700 Message-ID: <20170418202335.35232-14-michel.thierry@intel.com> References: <20170418202335.35232-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id ADFCC6E232 for ; Tue, 18 Apr 2017 20:23:37 +0000 (UTC) In-Reply-To: <20170418202335.35232-1-michel.thierry@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQXJ1biBTaWx1dmVyeSA8YXJ1bi5zaWx1dmVyeUBsaW51eC5pbnRlbC5jb20+CgpHdUMg ZXhwZWN0cyBhIGxpc3Qgb2YgcmVnaXN0ZXJzIGZyb20gdGhlIGRyaXZlciB3aGljaCBhcmUgc2F2 ZWQvcmVzdG9yZWQKZHVyaW5nIGVuZ2luZSByZXNldC4gVGhlIHR5cGUgb2YgdmFsdWUgdG8gYmUg c2F2ZWQgaXMgY29udHJvbGxlZCBieQpmbGFncy4gV2UgcHJvdmlkZSBhIG1pbmltYWwgc2V0IG9m IHJlZ2lzdGVycyB0aGF0IHdlIHdhbnQgR3VDIHRvIHNhdmUgYW5kCnJlc3RvcmUuIFRoaXMgaXMg bm90IGFuIGlzc3VlIGluIGNhc2Ugb2YgZW5naW5lIHJlc2V0IGFzIGRyaXZlciBpbml0aWFsaXpl cwptb3N0IG9mIHRoZW0gZm9sbG93aW5nIGFuIGVuZ2luZSByZXNldCwgYnV0IGluIGNhc2Ugb2Yg bWVkaWEgcmVzZXQgKGFrYQp3YXRjaGRvZyByZXNldCkgd2hpY2ggaXMgY29tcGxldGVseSBpbnRl cm5hbCB0byBHdUMgKGluY2x1ZGluZyByZXN1Ym1pc3Npb24Kb2YgaHVuZyB3b3JrbG9hZCksIGl0 IGlzIG5lY2Vzc2FyeSB0byBwcm92aWRlIHRoaXMgbGlzdCwgb3RoZXJ3aXNlIEd1QyB3b24ndApi ZSBhYmxlIHRvIHNjaGVkdWxlIGZ1cnRoZXIgd29ya2xvYWRzIGFmdGVyIGEgcmVzZXQuIFRoaXMg aXMgdGhlIG1pbmltYWwKc2V0IG9mIHJlZ2lzdGVycyBpZGVudGlmaWVkIGZvciB0aGluZ3MgdG8g d29yayBhcyBleHBlY3RlZCBidXQgaWYgd2Ugc2VlCmFueSBuZXcgaXNzdWVzLCB0aGlzIHJlZ2lz dGVyIGxpc3QgY2FuIGJlIGV4cGFuZGVkLgoKdjI6IFJFR1NFVF9NQVNLRUQgaXMgdG9vIGRpZmZp Y3VsdCBmb3IgR3VDLCB1c2UgUkVHU0VUX1NBVkVfREVGQVVMVF9WQUxVRQphbmQgY3VycmVudCB2 YWx1ZSBmcm9tIFJJTkdfTU9ERSByZWcgaW5zdGVhZDsgbm8gbmVlZCB0byBwcmVzZXJ2ZQpoZWFk L3RhaWwgZWl0aGVyLCBiZSBleHRyYSBwYXJhbm9pZCBhbmQgc2F2ZSB3aGl0ZWxpc3RlZCByZWdp c3RlcnMgKERhbmllbGUpLgoKQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2Vy YW9sb3NwdXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4u c2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKZWZmIE1jR2VlIDxqZWZm Lm1jZ2VlQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50 aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJt aXNzaW9uLmMgfCA2MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFu Z2VkLCA1OCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAxZWEzNmE4OGQyZmIuLmQ3NzI3MTg4NjFk ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMTAw Myw2ICsxMDAzLDI0IEBAIHN0YXRpYyB2b2lkIGd1Y19wb2xpY2llc19pbml0KHN0cnVjdCBndWNf cG9saWNpZXMgKnBvbGljaWVzKQogCXBvbGljaWVzLT5pc192YWxpZCA9IDE7CiB9CiAKKy8qCisg KiBJbiB0aGlzIG1hY3JvIGl0IGlzIGhpZ2hseSB1bmxpa2VseSB0byBleGNlZWQgbWF4IHZhbHVl IGJ1dCBldmVuIGlmIHdlIGRpZAorICogaXQgaXMgbm90IGFuIGVycm9yIHNvIGp1c3QgdGhyb3cg YSB3YXJuaW5nIGFuZCBjb250aW51ZS4gT25seSBzaWRlIGVmZmVjdAorICogaW4gY29udGludWlu ZyBmdXJ0aGVyIG1lYW5zIHNvbWUgcmVnaXN0ZXJzIHdvbid0IGJlIGFkZGVkIHRvIHNhdmUvcmVz dG9yZQorICogbGlzdC4KKyAqLworI2RlZmluZSBHVUNfQUREX01NSU9fUkVHX0FEUyhub2RlLCBy ZWdfYWRkciwgX2ZsYWdzLCBkZWZ2YWx1ZSkJCVwKKwlkbyB7CQkJCQkJCQlcCisJCXUzMiBfX2Nv dW50ID0gbm9kZS0+bnVtYmVyX29mX3JlZ2lzdGVyczsJCVwKKwkJaWYgKFdBUk5fT04oX19jb3Vu dCA+PSBHVUNfUkVHU0VUX01BWF9SRUdJU1RFUlMpKQlcCisJCQljb250aW51ZTsJCQkJCVwKKwkJ bm9kZS0+cmVnaXN0ZXJzW19fY291bnRdLm9mZnNldCA9IHJlZ19hZGRyLnJlZzsJCVwKKwkJbm9k ZS0+cmVnaXN0ZXJzW19fY291bnRdLmZsYWdzID0gKF9mbGFncyk7CQlcCisJCWlmIChkZWZ2YWx1 ZSkJCQkJCQlcCisJCQlub2RlLT5yZWdpc3RlcnNbX19jb3VudF0udmFsdWUgPSAoZGVmdmFsdWUp OwlcCisJCW5vZGUtPm51bWJlcl9vZl9yZWdpc3RlcnMrKzsJCQkJXAorCX0gd2hpbGUgKDApCisK IHN0YXRpYyBpbnQgZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CkBAIC0x MDE2LDYgKzEwMzQsNyBAQCBzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKIAkJdTggcmVnX3N0YXRlX2J1ZmZlcltHVUNfUzNfU0FWRV9TUEFDRV9QQUdFUyAq IFBBR0VfU0laRV07CiAJfSBfX3BhY2tlZCAqYmxvYjsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmU7CisJc3RydWN0IGk5MTVfd29ya2Fyb3VuZHMgKndvcmthcm91bmRzID0gJmRldl9w cml2LT53b3JrYXJvdW5kczsKIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAl1MzIgYmFzZTsK IApAQCAtMTAzNSw2ICsxMDU0LDM5IEBAIHN0YXRpYyBpbnQgZ3VjX2Fkc19jcmVhdGUoc3RydWN0 IGludGVsX2d1YyAqZ3VjKQogCiAJLyogTU1JTyByZWcgc3RhdGUgKi8KIAlmb3JfZWFjaF9lbmdp bmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwkJdTMyIGk7CisJCXN0cnVjdCBndWNfbW1pb19y ZWdzZXQgKmVuZ19yZWcgPQorCQkJJmJsb2ItPnJlZ19zdGF0ZS5lbmdpbmVfcmVnW2VuZ2luZS0+ Z3VjX2lkXTsKKworCQkvKgorCQkgKiBQcm92aWRlIGEgbGlzdCBvZiByZWdpc3RlcnMgdG8gYmUg c2F2ZWQvcmVzdG9yZWQgZHVyaW5nIGdwdQorCQkgKiByZXNldC4gVGhpcyBpcyBtYWlubHkgcmVx dWlyZWQgZm9yIE1lZGlhIHJlc2V0IChha2Egd2F0Y2hkb2cKKwkJICogdGltZW91dCkgd2hpY2gg aXMgY29tcGxldGVseSB1bmRlciB0aGUgY29udHJvbCBvZiBHdUMKKwkJICogKHJlc3VibWlzc2lv biBvZiBodW5nIHdvcmtsb2FkIGlzIGhhbmRsZWQgaW5zaWRlIEd1QykuCisJCSAqLworCQlHVUNf QUREX01NSU9fUkVHX0FEUyhlbmdfcmVnLCBSSU5HX0hXU19QR0EoZW5naW5lLT5tbWlvX2Jhc2Up LAorCQkJCSAgICAgR1VDX1JFR1NFVF9FTkdJTkVSRVNFVCB8CisJCQkJICAgICBHVUNfUkVHU0VU X1NBVkVfQ1VSUkVOVF9WQUxVRSwgMCk7CisKKwkJLyoKKwkJICogV29ya2Fyb3VuZCB0aGUgZ3Vj IGlzc3VlIHdpdGggbWFza2VkIHJlZ2lzdGVycywgbm90ZSB0aGF0CisJCSAqIGF0IHRoaXMgcG9p bnQgZ3VjIHN1Ym1pc3Npb24gaXMgc3RpbGwgZGlzYWJsZWQgYW5kIHRoZSBtb2RlCisJCSAqIHJl Z2lzdGVyIGRvZXNudCBoYXZlIHRoZSBpcnFfc3RlZXJpbmcgYml0IHNldCwgd2hpY2ggd2UKKwkJ ICogbmVlZCB0byBmd2QgaXJxcyB0byBHdUMuCisJCSAqLworCQlHVUNfQUREX01NSU9fUkVHX0FE UyhlbmdfcmVnLCBSSU5HX01PREVfR0VONyhlbmdpbmUpLAorCQkJCSAgICAgR1VDX1JFR1NFVF9F TkdJTkVSRVNFVCB8CisJCQkJICAgICBHVUNfUkVHU0VUX1NBVkVfREVGQVVMVF9WQUxVRSwKKwkJ CQkgICAgIEk5MTVfUkVBRChSSU5HX01PREVfR0VONyhlbmdpbmUpKSB8CisJCQkJICAgICBHRlhf SU5URVJSVVBUX1NURUVSSU5HIHwgKDB4RkZGRjw8MTYpKTsKKworCQlHVUNfQUREX01NSU9fUkVH X0FEUyhlbmdfcmVnLCBSSU5HX0lNUihlbmdpbmUtPm1taW9fYmFzZSksCisJCQkJICAgICBHVUNf UkVHU0VUX0VOR0lORVJFU0VUIHwKKwkJCQkgICAgIEdVQ19SRUdTRVRfU0FWRV9DVVJSRU5UX1ZB TFVFLCAwKTsKKworCQlEUk1fREVCVUdfRFJJVkVSKCIlcyByZWdpc3RlciBzYXZlL3Jlc3RvcmUg Y291bnQ6ICV1XG4iLAorCQkJCSBlbmdpbmUtPm5hbWUsIGVuZ19yZWctPm51bWJlcl9vZl9yZWdp c3RlcnMpOworCiAJCWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5t bWlvX3N0YXJ0ID0KIAkJCWk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfRk9SQ0VfVE9fTk9OUFJJ VihlbmdpbmUtPm1taW9fYmFzZSwgMCkpOwogCkBAIC0xMDQ0LDkgKzEwOTYsMTMgQEAgc3RhdGlj IGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCSAqIGluY29uc2lz dGVuY2llcyB3aXRoIHRoZSBoYW5kbGluZyBvZiBGT1JDRV9UT19OT05QUklWCiAJCSAqIHJlZ2lz dGVycy4KIAkJICovCi0JCWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lk XS5jb3VudCA9IDA7CisJCWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lk XS5jb3VudCA9CisJCQkJCXdvcmthcm91bmRzLT5od193aGl0ZWxpc3RfY291bnRbaWRdOwogCi0J CS8qIE5vdGhpbmcgdG8gYmUgc2F2ZWQgb3IgcmVzdG9yZWQgZm9yIG5vdy4gKi8KKwkJZm9yIChp ID0gMDsgaSA8IHdvcmthcm91bmRzLT5od193aGl0ZWxpc3RfY291bnRbaWRdOyBpKyspIHsKKwkJ CWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5vZmZzZXRzW2ldID0K KwkJCQlJOTE1X1JFQUQoUklOR19GT1JDRV9UT19OT05QUklWKGVuZ2luZS0+bW1pb19iYXNlLCBp KSk7CisJCX0KIAl9CiAKIAkvKgotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK