From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 1/2] drm/i915: Try harder to reset the GPU Date: Tue, 16 May 2017 16:55:29 +0300 Message-ID: <87ziecewj2.fsf@gaia.fi.intel.com> References: <20170516131458.19358-1-chris@chris-wilson.co.uk> 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 DF6416E3D9 for ; Wed, 17 May 2017 11:18:04 +0000 (UTC) In-Reply-To: <20170516131458.19358-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gUmVwZWF0 IHRoZSByZXNldCBhIGNvdXBsZSBvZiB0aW1lcyBpZiBhdCBmaXJzdCB3ZSBkbyBub3Qgc3VjY2Vl ZC4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgo+IExpbms6Cj4gaHR0cDovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNn aWQvMjAxNzA1MTMwODM3MjYuNTAyLTEtY2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrCgpTZWVtcyB0 aGF0IHRoaXMgaXMgYWxyZWFkeSBtZXJnZWQgYnV0IEZXSVcuCgpSZXZpZXdlZC1ieTogTWlrYSBL dW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDQ0ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9u cygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKPiBpbmRleCA3MWI5YjM4N2Fk MDQuLmZjM2RhMGE2ZmRiYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCj4g QEAgLTE0NjMsOSArMTQ2MywxMCBAQCBpbnQgaTkxNV9yZWdfcmVhZF9pb2N0bChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAo+ICAJcmV0dXJuIHJldDsKPiAgfQo+ICAKPiAtc3RhdGljIGludCBpOTE1 X3Jlc2V0X2NvbXBsZXRlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ICtzdGF0aWMgYm9vbCBpOTE1 X3Jlc2V0X2NvbXBsZXRlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ICB7Cj4gIAl1OCBnZHJzdDsK PiArCj4gIAlwY2lfcmVhZF9jb25maWdfYnl0ZShwZGV2LCBJOTE1X0dEUlNULCAmZ2Ryc3QpOwo+ ICAJcmV0dXJuIChnZHJzdCAmIEdSRE9NX1JFU0VUX1NUQVRVUykgPT0gMDsKPiAgfQo+IEBAIC0x NDc2LDE1ICsxNDc3LDE2IEBAIHN0YXRpYyBpbnQgaTkxNV9kb19yZXNldChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrCj4gIAo+ICAJLyogYXNz ZXJ0IHJlc2V0IGZvciBhdCBsZWFzdCAyMCB1c2VjICovCj4gIAlwY2lfd3JpdGVfY29uZmlnX2J5 dGUocGRldiwgSTkxNV9HRFJTVCwgR1JET01fUkVTRVRfRU5BQkxFKTsKPiAtCXVkZWxheSgyMCk7 Cj4gKwl1c2xlZXBfcmFuZ2UoNTAsIDIwMCk7Cj4gIAlwY2lfd3JpdGVfY29uZmlnX2J5dGUocGRl diwgSTkxNV9HRFJTVCwgMCk7Cj4gIAo+ICAJcmV0dXJuIHdhaXRfZm9yKGk5MTVfcmVzZXRfY29t cGxldGUocGRldiksIDUwMCk7Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbnQgZzR4X3Jlc2V0X2NvbXBs ZXRlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ICtzdGF0aWMgYm9vbCBnNHhfcmVzZXRfY29tcGxl dGUoc3RydWN0IHBjaV9kZXYgKnBkZXYpCj4gIHsKPiAgCXU4IGdkcnN0Owo+ICsKPiAgCXBjaV9y ZWFkX2NvbmZpZ19ieXRlKHBkZXYsIEk5MTVfR0RSU1QsICZnZHJzdCk7Cj4gIAlyZXR1cm4gKGdk cnN0ICYgR1JET01fUkVTRVRfRU5BQkxFKSA9PSAwOwo+ICB9Cj4gQEAgLTE0OTIsNiArMTQ5NCw3 IEBAIHN0YXRpYyBpbnQgZzR4X3Jlc2V0X2NvbXBsZXRlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQo+ ICBzdGF0aWMgaW50IGczM19kb19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQo+ICB7Cj4gIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9 IGRldl9wcml2LT5kcm0ucGRldjsKPiArCj4gIAlwY2lfd3JpdGVfY29uZmlnX2J5dGUocGRldiwg STkxNV9HRFJTVCwgR1JET01fUkVTRVRfRU5BQkxFKTsKPiAgCXJldHVybiB3YWl0X2ZvcihnNHhf cmVzZXRfY29tcGxldGUocGRldiksIDUwMCk7Cj4gIH0KPiBAQCAtMTUwNSw3ICsxNTA4LDcgQEAg c3RhdGljIGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCB1bnNpZ25lZCBlbmdpbmVfbWFzaykKPiAgCQkJICAgICAgR1JET01fUkVOREVSIHwgR1JET01f UkVTRVRfRU5BQkxFKTsKPiAgCXJldCA9ICB3YWl0X2ZvcihnNHhfcmVzZXRfY29tcGxldGUocGRl diksIDUwMCk7Cj4gIAlpZiAocmV0KQo+IC0JCXJldHVybiByZXQ7Cj4gKwkJZ290byBvdXQ7Cj4g IAo+ICAJLyogV2FWY3BDbGtHYXRlRGlzYWJsZUZvck1lZGlhUmVzZXQ6Y3RnLGVsayAqLwo+ICAJ STkxNV9XUklURShWREVDQ0xLX0dBVEVfRCwgSTkxNV9SRUFEKFZERUNDTEtfR0FURV9EKSB8IFZD UF9VTklUX0NMT0NLX0dBVEVfRElTQUJMRSk7Cj4gQEAgLTE1MTQsMTYgKzE1MTcsMTQgQEAgc3Rh dGljIGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1 bnNpZ25lZCBlbmdpbmVfbWFzaykKPiAgCXBjaV93cml0ZV9jb25maWdfYnl0ZShwZGV2LCBJOTE1 X0dEUlNULAo+ICAJCQkgICAgICBHUkRPTV9NRURJQSB8IEdSRE9NX1JFU0VUX0VOQUJMRSk7Cj4g IAlyZXQgPSAgd2FpdF9mb3IoZzR4X3Jlc2V0X2NvbXBsZXRlKHBkZXYpLCA1MDApOwo+IC0JaWYg KHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+ICAKPiAgCS8qIFdhVmNwQ2xrR2F0ZURpc2FibGVGb3JN ZWRpYVJlc2V0OmN0ZyxlbGsgKi8KPiAgCUk5MTVfV1JJVEUoVkRFQ0NMS19HQVRFX0QsIEk5MTVf UkVBRChWREVDQ0xLX0dBVEVfRCkgJiB+VkNQX1VOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFKTsKPiAg CVBPU1RJTkdfUkVBRChWREVDQ0xLX0dBVEVfRCk7Cj4gIAo+ICtvdXQ6Cj4gIAlwY2lfd3JpdGVf Y29uZmlnX2J5dGUocGRldiwgSTkxNV9HRFJTVCwgMCk7Cj4gLQo+IC0JcmV0dXJuIDA7Cj4gKwly ZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGlyb25sYWtlX2RvX3Jlc2V0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiBAQCAtMTUzMSwyNSArMTUzMiwyMSBAQCBz dGF0aWMgaW50IGlyb25sYWtlX2RvX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKPiAgewo+ICAJaW50IHJldDsKPiAgCj4gLQlJOTE1X1dSSVRFKElMS19HRFNSLAo+IC0J CSAgIElMS19HUkRPTV9SRU5ERVIgfCBJTEtfR1JET01fUkVTRVRfRU5BQkxFKTsKPiArCUk5MTVf V1JJVEUoSUxLX0dEU1IsIElMS19HUkRPTV9SRU5ERVIgfCBJTEtfR1JET01fUkVTRVRfRU5BQkxF KTsKPiAgCXJldCA9IGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2LAo+ICAJCQkJICAg ICAgSUxLX0dEU1IsIElMS19HUkRPTV9SRVNFVF9FTkFCTEUsIDAsCj4gIAkJCQkgICAgICA1MDAp Owo+ICAJaWYgKHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+ICsJCWdvdG8gb3V0Owo+ICAKPiAtCUk5 MTVfV1JJVEUoSUxLX0dEU1IsCj4gLQkJICAgSUxLX0dSRE9NX01FRElBIHwgSUxLX0dSRE9NX1JF U0VUX0VOQUJMRSk7Cj4gKwlJOTE1X1dSSVRFKElMS19HRFNSLCBJTEtfR1JET01fTUVESUEgfCBJ TEtfR1JET01fUkVTRVRfRU5BQkxFKTsKPiAgCXJldCA9IGludGVsX3dhaXRfZm9yX3JlZ2lzdGVy KGRldl9wcml2LAo+ICAJCQkJICAgICAgSUxLX0dEU1IsIElMS19HUkRPTV9SRVNFVF9FTkFCTEUs IDAsCj4gIAkJCQkgICAgICA1MDApOwo+IC0JaWYgKHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+IC0K PiArb3V0Ogo+ICAJSTkxNV9XUklURShJTEtfR0RTUiwgMCk7Cj4gLQo+IC0JcmV0dXJuIDA7Cj4g KwlQT1NUSU5HX1JFQUQoSUxLX0dEU1IpOwo+ICsJcmV0dXJuIHJldDsKPiAgfQo+ICAKPiAgLyog UmVzZXQgdGhlIGhhcmR3YXJlIGRvbWFpbnMgKEdFTlhfR1JET01fKikgc3BlY2lmaWVkIGJ5IG1h c2sgKi8KPiBAQCAtMTc1OCw4ICsxNzU1LDExIEBAIHN0YXRpYyByZXNldF9mdW5jIGludGVsX2dl dF9ncHVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICBpbnQgaW50 ZWxfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQg ZW5naW5lX21hc2spCj4gIHsKPiAgCXJlc2V0X2Z1bmMgcmVzZXQ7Cj4gKwlpbnQgcmV0cnk7Cj4g IAlpbnQgcmV0Owo+ICAKPiArCW1pZ2h0X3NsZWVwKCk7Cj4gKwo+ICAJcmVzZXQgPSBpbnRlbF9n ZXRfZ3B1X3Jlc2V0KGRldl9wcml2KTsKPiAgCWlmIChyZXNldCA9PSBOVUxMKQo+ICAJCXJldHVy biAtRU5PREVWOwo+IEBAIC0xNzY4LDcgKzE3NjgsMTMgQEAgaW50IGludGVsX2dwdV9yZXNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVuc2lnbmVkIGVuZ2luZV9tYXNrKQo+ ICAJICogcmVxdWVzdCBtYXkgYmUgZHJvcHBlZCBhbmQgbmV2ZXIgY29tcGxldGVzIChjYXVzaW5n IC1FSU8pLgo+ICAJICovCj4gIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwg Rk9SQ0VXQUtFX0FMTCk7Cj4gLQlyZXQgPSByZXNldChkZXZfcHJpdiwgZW5naW5lX21hc2spOwo+ ICsJZm9yIChyZXRyeSA9IDA7IHJldHJ5IDwgMzsgcmV0cnkrKykgewo+ICsJCXJldCA9IHJlc2V0 KGRldl9wcml2LCBlbmdpbmVfbWFzayk7Cj4gKwkJaWYgKHJldCAhPSAtRVRJTUVET1VUKQo+ICsJ CQlicmVhazsKPiArCj4gKwkJY29uZF9yZXNjaGVkKCk7Cj4gKwl9Cj4gIAlpbnRlbF91bmNvcmVf Zm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7Cj4gIAo+ICAJcmV0dXJuIHJl dDsKPiAtLSAKPiAyLjExLjAKPgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK