From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 2/2] drm/i915: Add a way to test the modeset done during gpu reset, v2. Date: Mon, 25 Apr 2016 19:33:39 +0300 Message-ID: <20160425163339.GE4329@intel.com> References: <57039ADC.4010601@linux.intel.com> <1460355814-3599-1-git-send-email-maarten.lankhorst@linux.intel.com> <1460355814-3599-2-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 89C876E64E for ; Mon, 25 Apr 2016 16:33:42 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1460355814-3599-2-git-send-email-maarten.lankhorst@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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBBcHIgMTEsIDIwMTYgYXQgMDg6MjM6MzRBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gQWRkIGZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCBhcyBhIHBhcmFtZXRlciB0 byBmb3JjZSB0aGUgbW9kZXNldCBwYXRoIGR1cmluZyBncHUgcmVzZXQuCj4gVGhpcyBhbGxvd3Mg YSBJR1QgdGVzdCB0byBzZXQgdGhlIGtub2IgYW5kIHRyaWdnZXIgYSBoYW5nIHRvIGZvcmNlIHRo ZSBncHUgcmVzZXQsCj4gZXZlbiBvbiBwbGF0Zm9ybXMgdGhhdCB3b3VsZG4ndCBvdGhlcndpc2Ug cmVxdWlyZSBpdC4KPiAKPiBDaGFuZ2VzIHNpbmNlIHYxOgo+IC0gU3BsaXQgb3V0IGZpeCB0byBz ZXBhcmF0ZSBjb21taXQuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiBUZXN0Y2FzZTogZHJ2X2hhbmdtYW4u cmVzZXQtd2l0aC1mb3JjZWQtbW9kZXNldAo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BhcmFtcy5jICAgfCAgNiArKysrKysKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w YXJhbXMuaCAgIHwgIDEgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCA0MiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KPiAgMyBmaWxlcyBjaGFu Z2VkLCAzNSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcGFyYW1zLmMKPiBpbmRleCAxNzc5ZjAyZTZkZjguLjgwY2U1ODE3OTNkYyAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYwo+IEBAIC00NSw2ICs0NSw3IEBAIHN0cnVjdCBp OTE1X3BhcmFtcyBpOTE1IF9fcmVhZF9tb3N0bHkgPSB7Cj4gIAkuZmFzdGJvb3QgPSAwLAo+ICAJ LnByZWZhdWx0X2Rpc2FibGUgPSAwLAo+ICAJLmxvYWRfZGV0ZWN0X3Rlc3QgPSAwLAo+ICsJLmZv cmNlX3Jlc2V0X21vZGVzZXRfdGVzdCA9IDAsCj4gIAkucmVzZXQgPSB0cnVlLAo+ICAJLmludmVy dF9icmlnaHRuZXNzID0gMCwKPiAgCS5kaXNhYmxlX2Rpc3BsYXkgPSAwLAo+IEBAIC0xNTgsNiAr MTU5LDExIEBAIE1PRFVMRV9QQVJNX0RFU0MobG9hZF9kZXRlY3RfdGVzdCwKPiAgCSJGb3JjZS1l bmFibGUgdGhlIFZHQSBsb2FkIGRldGVjdCBjb2RlIGZvciB0ZXN0aW5nIChkZWZhdWx0OmZhbHNl KS4gIgo+ICAJIkZvciBkZXZlbG9wZXJzIG9ubHkuIik7Cj4gIAo+ICttb2R1bGVfcGFyYW1fbmFt ZWRfdW5zYWZlKGZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCwgaTkxNS5mb3JjZV9yZXNldF9tb2Rl c2V0X3Rlc3QsIGJvb2wsIDA2MDApOwo+ICtNT0RVTEVfUEFSTV9ERVNDKGZvcmNlX3Jlc2V0X21v ZGVzZXRfdGVzdCwKPiArCSJGb3JjZSBhIG1vZGVzZXQgZHVyaW5nIGdwdSByZXNldCBmb3IgdGVz dGluZyAoZGVmYXVsdDpmYWxzZSkuICIKPiArCSJGb3IgZGV2ZWxvcGVycyBvbmx5LiIpOwo+ICsK PiAgbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2FmZShpbnZlcnRfYnJpZ2h0bmVzcywgaTkxNS5pbnZl cnRfYnJpZ2h0bmVzcywgaW50LCAwNjAwKTsKPiAgTU9EVUxFX1BBUk1fREVTQyhpbnZlcnRfYnJp Z2h0bmVzcywKPiAgCSJJbnZlcnQgYmFja2xpZ2h0IGJyaWdodG5lc3MgIgo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wYXJhbXMuaAo+IGluZGV4IDAyYmMyNzgwNDI5MS4uMzkzNGM0MzAwNDI3IDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCj4gQEAgLTU1LDYgKzU1LDcgQEAgc3RydWN0 IGk5MTVfcGFyYW1zIHsKPiAgCWJvb2wgZmFzdGJvb3Q7Cj4gIAlib29sIHByZWZhdWx0X2Rpc2Fi bGU7Cj4gIAlib29sIGxvYWRfZGV0ZWN0X3Rlc3Q7Cj4gKwlib29sIGZvcmNlX3Jlc2V0X21vZGVz ZXRfdGVzdDsKPiAgCWJvb2wgcmVzZXQ7Cj4gIAlib29sIGRpc2FibGVfZGlzcGxheTsKPiAgCWJv b2wgZW5hYmxlX2d1Y19zdWJtaXNzaW9uOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKPiBpbmRleCAyZjc2ZWZjODY0MTcuLmZhZjJkYTA4Nzc4ZiAxMDA2NDQKPiAtLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMzE2MCw2ICszMTYwLDcgQEAgX19pbnRlbF9kaXNw bGF5X3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAKPiAgdm9pZCBpbnRlbF9wcmVw YXJlX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIHsKPiArCWJvb2wgcmVxdWlyZXNf ZGlzcGxheV9yZXNldCA9IHRydWU7Cj4gIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7 Cj4gIAlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKnBjdHg7Cj4gIAlpbnQgcmV0Owo+ IEBAIC0zMTY5LDggKzMxNzAsMTIgQEAgdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCS8qIHJlc2V0IGRvZXNuJ3QgdG91 Y2ggdGhlIGRpc3BsYXkgKi8KPiAtCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1IHx8IElT X0c0WChkZXYpKQo+IC0JCXJldHVybjsKPiArCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1 IHx8IElTX0c0WChkZXYpKSB7Cj4gKwkJaWYgKCFpOTE1LmZvcmNlX3Jlc2V0X21vZGVzZXRfdGVz dCkKPiArCQkJcmV0dXJuOwo+ICsKPiArCQlyZXF1aXJlc19kaXNwbGF5X3Jlc2V0ID0gZmFsc2U7 Cj4gKwl9Cj4gIAo+ICAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKPiAgCXBjdHggPSBkZXYt Pm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4Owo+IEBAIC0zMTk5LDEyICszMjA0LDE1IEBAIHZvaWQg aW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAKPiAgZXJyOgo+ ICAJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKPiArCWlmICghcmVxdWlyZXNfZGlzcGxh eV9yZXNldCkKPiArCQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CgpXaHkgZG8gd2Ugd2Fu dCB0byB1bmxvY2sgaGVyZT8KCj4gIH0KPiAgCj4gIHZvaWQgaW50ZWxfZmluaXNoX3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIHsKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKPiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSA9IGRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGU7Cj4gKwlib29sIGhwZF9pbml0Owo+ ICAJaW50IHJldDsKPiAgCj4gIAkvKgo+IEBAIC0zMjIwLDIyICszMjI4LDI3IEBAIHZvaWQgaW50 ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAo+ICAJLyogcmVzZXQg ZG9lc24ndCB0b3VjaCB0aGUgZGlzcGxheSAqLwo+ICAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDUgfHwgSVNfRzRYKGRldikpIHsKPiAtCQkvKgo+IC0JCSAqIEZsaXBzIGluIHRoZSByaW5n cyBoYXZlIGJlZW4gbnVrZWQgYnkgdGhlIHJlc2V0LAo+IC0JCSAqIHNvIHVwZGF0ZSB0aGUgYmFz ZSBhZGRyZXNzIG9mIGFsbCBwcmltYXJ5Cj4gLQkJICogcGxhbmVzIHRvIHRoZSB0aGUgbGFzdCBm YiB0byBtYWtlIHN1cmUgd2UncmUKPiAtCQkgKiBzaG93aW5nIHRoZSBjb3JyZWN0IGZiIGFmdGVy IGEgcmVzZXQuCj4gLQkJICoKPiAtCQkgKiBGSVhNRTogQXRvbWljIHdpbGwgbWFrZSB0aGlzIG9i c29sZXRlIHNpbmNlIHdlIHdvbid0IHNjaGVkdWxlCj4gLQkJICogQ1MtYmFzZWQgZmxpcHMgKHdo aWNoIG1pZ2h0IGdldCBsb3N0IGluIGdwdSByZXNldHMpIGFueSBtb3JlLgo+IC0JCSAqLwo+IC0J CWludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhkZXYpOwo+IC0JCXJldHVybjsKPiArCQlocGRf aW5pdCA9IGZhbHNlOwo+ICsKPiArCQlpZiAoIXN0YXRlKSB7Cj4gKwkJCS8qCj4gKwkJCSAqIEZs aXBzIGluIHRoZSByaW5ncyBoYXZlIGJlZW4gbnVrZWQgYnkgdGhlIHJlc2V0LAo+ICsJCQkgKiBz byB1cGRhdGUgdGhlIGJhc2UgYWRkcmVzcyBvZiBhbGwgcHJpbWFyeQo+ICsJCQkgKiBwbGFuZXMg dG8gdGhlIHRoZSBsYXN0IGZiIHRvIG1ha2Ugc3VyZSB3ZSdyZQo+ICsJCQkgKiBzaG93aW5nIHRo ZSBjb3JyZWN0IGZiIGFmdGVyIGEgcmVzZXQuCj4gKwkJCSAqCj4gKwkJCSAqIEZJWE1FOiBBdG9t aWMgd2lsbCBtYWtlIHRoaXMgb2Jzb2xldGUgc2luY2Ugd2Ugd29uJ3Qgc2NoZWR1bGUKPiArCQkJ ICogQ1MtYmFzZWQgZmxpcHMgKHdoaWNoIG1pZ2h0IGdldCBsb3N0IGluIGdwdSByZXNldHMpIGFu eSBtb3JlLgo+ICsJCQkgKi8KPiArCQkJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVzKGRldik7 CgpGb3IgdGhpcyBJIGd1ZXNzLiBIbW0uIE1heWJlIGhhbmcgb24gdG8gdGhlIGxvY2sgYW55d2F5 LCBhbmQgYWRkIGEKbmV3IGZsYWcgaW4gZGV2X3ByaXYgb3Igc29tZXRoaW5nIHRvIGluZGljYXRl IGlmIHdlJ3JlIHBlcmZvcm1pbmcKYSBkaXNwbGF5IHJlc2V0IG9yIG5vdC4gSSBzdXBwb3NlIHdl IGNvdWxkIGNoZWNrIGZvcgoocHJlLWc0eCB8fCBpOTE1LndoYXRldmVyKSBvbiBlaXRoZXIgc2lk ZSwgYnV0IHRoYXQgY291bGQKYmUgcHJvYmxlbWF0aWMgaWYgc29tZW9uZSBjaGFuZ2VzIHRoZSBt b2RwYXJhbSBtaWQtZmxpZ2h0LgoKU28gZmluaXNoX3Jlc2V0IGNvdWxkIHBlcmhhcHMgbG9va3Mg c29tZXRoaW5nIGxpa2UgKGFzc3VtaW5nIHdlIGRvbid0CndhbnQgdG8gcnVuIHRocm91Z2ggdGhl IHdob2xlIGRpc3BsYXkgaW5pdCBzZXF1ZW5jZSBvbiBnNHgrKToKCnsKCWlmICghZGV2X3ByaXYt PmRpc3BsYXlfcmVzZXQpIHsKCQlpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFuZXMoKTsKCQlyZXR1 cm47Cgl9CgoJaWYgKHByZS1nNHgpIHsKCQkuLi4KCgkJcmV0ID0gZGlzcGxheV9yZXN1bWUoKTsK CgkJaW5pdF9ocGQoKTsKCX0gZWxzZSB7CgkJcmV0ID0gZGlzcGxheV9yZXN1bWUoKTsKCX0KCgl1 bmxvY2tfYWxsKCk7Cn0KCgo+ICsJCQlyZXR1cm47Cj4gKwkJfQo+ICAJfSBlbHNlIHsKPiAgCQkv Kgo+ICAJCSAqIFRoZSBkaXNwbGF5IGhhcyBiZWVuIHJlc2V0IGFzIHdlbGwsCj4gIAkJICogc28g bmVlZCBhIGZ1bGwgcmUtaW5pdGlhbGl6YXRpb24uCj4gIAkJICovCj4gKwkJaHBkX2luaXQgPSB0 cnVlOwo+ICAJCWludGVsX3J1bnRpbWVfcG1fZGlzYWJsZV9pbnRlcnJ1cHRzKGRldl9wcml2KTsK PiAgCQlpbnRlbF9ydW50aW1lX3BtX2VuYWJsZV9pbnRlcnJ1cHRzKGRldl9wcml2KTsKPiAgCj4g QEAgLTMyNTUsNyArMzI2OCw4IEBAIHZvaWQgaW50ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCj4gIAlpZiAocmV0KQo+ICAJCURSTV9FUlJPUigiUmVzdG9yaW5nIG9sZCBz dGF0ZSBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKPiAgCj4gLQlpbnRlbF9ocGRfaW5pdChkZXZf cHJpdik7Cj4gKwlpZiAoaHBkX2luaXQpCj4gKwkJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOwo+ ICAKPiAgCWRybV9tb2Rlc2V0X3VubG9ja19hbGwoZGV2KTsKPiAgfQo+IC0tIAo+IDIuMS4wCgot LSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK