From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 1/4] drm/i915: Only call finish_reset after a prepare_reset Date: Thu, 5 Apr 2018 13:10:23 +0200 Message-ID: <9f745ee1-dc03-4a39-ece1-4c7f87221af4@linux.intel.com> References: <20180405110220.27008-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 554106E71C for ; Thu, 5 Apr 2018 11:10:26 +0000 (UTC) In-Reply-To: <20180405110220.27008-1-chris@chris-wilson.co.uk> Content-Language: en-US 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 T3AgMDUtMDQtMTggb20gMTM6MDIgc2NocmVlZiBDaHJpcyBXaWxzb246Cj4gSWYgd2Ugc2tpcCB0 aGUgaW50ZWxfcHJlcGFyZV9yZXNldCgpLCB3ZSBzaG91bGQgYWxzbyBza2lwIHRoZQo+IGludGVs X2Rpc3BsYXlfcmVzZXQoKS4gSWYgd2Ugd2UgdXNlIGEgZmxhZyBzZXQgYnkgaW50ZWxfcHJlcGFy ZV9yZXNldCgpCj4gdGhlbiB3ZSBkbyBub3QgaGF2ZSB0byBzZWNvbmQgZ3Vlc3MgYmFzZWQgb24g ZXh0ZXJuYWwgdXNlciBjb250cm9sbGVkCj4gc3RhdGUgd2hldGhlciBvciBub3QgdGhlIHByZXBh cmUgd2FzIGNhbGxlZCBiZWZvcmUgZGVjaWRpbmcgdG8gZmluaXNoCj4gaXQgYWZ0ZXIgdGhlIHJl c2V0LiBpZ3QvZ2VtX2VpbyBpcyBvbmUgc3VjaCBleGFtcGxlIHRoYXQgbWF5IHR3ZWFrCj4gaTkx NS5yZXNldCBmYXN0ZXIgdGhhbiB0aGUgY29kZSBpcyBleHBlY3RpbmcsIGxlYWRpbmcgdG8KPgo+ IFsgIDE5MC4yMzM1MjhdID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KPiBb ICAxOTAuMjMzNTM0XSBXQVJOSU5HOiBiYWQgdW5sb2NrIGJhbGFuY2UgZGV0ZWN0ZWQhCj4gWyAg MTkwLjIzMzU0MF0gNC4xNi4wLXJjNy1nMzM1ZWY5ODQ5MzEwLWRybXRpcF8xMCsgIzEgVGFpbnRl ZDogRyAgICAgVQo+IFsgIDE5MC4yMzM1NDddIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KPiBbICAxOTAuMjMzNTUzXSBnZW1fZWlvLzEzNDggaXMgdHJ5aW5nIHRvIHJlbGVh c2UgbG9jayAoY3J0Y193d19jbGFzc19hY3F1aXJlKSBhdDoKPiBbICAxOTAuMjMzNTY5XSBbPGZm ZmZmZmZmODk1Yzc4MTA+XSBkcm1fbW9kZXNldF9hY3F1aXJlX2ZpbmkrMHgwLzB4NjAKPiBbICAx OTAuMjMzNTc1XSBidXQgdGhlcmUgYXJlIG5vIG1vcmUgbG9ja3MgdG8gcmVsZWFzZSEKPiBbICAx OTAuMjMzNTgwXQo+ICAgICAgICAgICAgICAgIG90aGVyIGluZm8gdGhhdCBtaWdodCBoZWxwIHVz IGRlYnVnIHRoaXM6Cj4gWyAgMTkwLjIzMzU4OF0gMyBsb2NrcyBoZWxkIGJ5IGdlbV9laW8vMTM0 ODoKPiBbICAxOTAuMjMzNTkyXSAgIzA6ICAoJmYtPmZfcG9zX2xvY2speysuKy59LCBhdDogWzww MDAwMDAwMGFiOTBjNzg0Pl0gX19mZGdldF9wb3MrMHgzYS8weDUwCj4gWyAgMTkwLjIzMzYwN10g ICMxOiAgKHNiX3dyaXRlcnMjMTEpey4rLit9LCBhdDogWzwwMDAwMDAwMGUxNTI5MjY1Pl0gdmZz X3dyaXRlKzB4MTg4LzB4MWEwCj4gWyAgMTkwLjIzMzYyMl0gICMyOiAgKCZhdHRyLT5tdXRleCl7 Ky4rLn0sIGF0OiBbPDAwMDAwMDAwMTFmNDBhZmU+XSBzaW1wbGVfYXR0cl93cml0ZSsweDM2LzB4 ZDAKPiBbICAxOTAuMjMzNjM1XQo+ICAgICAgICAgICAgICAgIHN0YWNrIGJhY2t0cmFjZToKPiBb ICAxOTAuMjMzNjQ0XSBDUFU6IDAgUElEOiAxMzQ4IENvbW06IGdlbV9laW8gVGFpbnRlZDogRyAg ICAgVSAgICAgICAgICAgNC4xNi4wLXJjNy1nMzM1ZWY5ODQ5MzEwLWRybXRpcF8xMCsgIzEKPiBb ICAxOTAuMjMzNjU1XSBIYXJkd2FyZSBuYW1lOiBEZWxsIEluYy4gICAgICAgICAgICAgICAgIE9w dGlQbGV4IEdYMjgwICAgICAgICAgICAgICAgLzBHODMxMCwgQklPUyBBMDQgMDIvMDkvMjAwNQo+ IFsgIDE5MC4yMzM2NjRdIENhbGwgVHJhY2U6Cj4gWyAgMTkwLjIzMzY3NF0gIGR1bXBfc3RhY2sr MHg2Ny8weDk1Cj4gWyAgMTkwLjIzMzY4Ml0gID8gZHJtX21vZGVzZXRfYmFja29mZisweDFiMC8w eDFiMAo+IFsgIDE5MC4yMzM2OTBdICBwcmludF91bmxvY2tfaW1iYWxhbmNlX2J1ZysweGQyLzB4 ZTAKPiBbICAxOTAuMjMzNjk4XSAgPyBkcm1fbW9kZXNldF9iYWNrb2ZmKzB4MWIwLzB4MWIwCj4g WyAgMTkwLjIzMzcwNF0gIGxvY2tfcmVsZWFzZSsweDIzZS8weDMwMAo+IFsgIDE5MC4yMzM3MTJd ICBkcm1fbW9kZXNldF9hY3F1aXJlX2ZpbmkrMHgxNi8weDYwCj4gWyAgMTkwLjIzMzgzNV0gIGlu dGVsX2ZpbmlzaF9yZXNldCsweDcyLzB4MTYwIFtpOTE1XQo+IFsgIDE5MC4yMzM4OTRdICBpOTE1 X3Jlc2V0X2RldmljZSsweDFlOS8weDI0MCBbaTkxNV0KPiBbICAxOTAuMjMzOTUzXSAgPyBfX2lu dGVsX2dldF9jcnRjX3NjYW5saW5lKzB4MWMwLzB4MWMwIFtpOTE1XQo+IFsgIDE5MC4yMzM5NjJd ICA/IHdvcmtfb25fY3B1X3NhZmUrMHg1MC8weDUwCj4gWyAgMTkwLjIzNDAyMF0gIGk5MTVfaGFu ZGxlX2Vycm9yKzB4MWYyLzB4NDcwIFtpOTE1XQo+IFsgIDE5MC4yMzQwMzFdICA/IF9fbWlnaHRf ZmF1bHQrMHgzOS8weDkwCj4gWyAgMTkwLjIzNDAzN10gID8gX19taWdodF9mYXVsdCsweDM5LzB4 OTAKPiBbICAxOTAuMjM0MDk5XSAgaTkxNV93ZWRnZWRfc2V0KzB4N2YvMHhjMCBbaTkxNV0KPiBb ICAxOTAuMjM0MTA3XSAgc2ltcGxlX2F0dHJfd3JpdGUrMHhiMC8weGQwCj4gWyAgMTkwLjIzNDEx N10gIGZ1bGxfcHJveHlfd3JpdGUrMHg1MS8weDgwCj4gWyAgMTkwLjIzNDEyNV0gIF9fdmZzX3dy aXRlKzB4MjEvMHgxNDAKPiBbICAxOTAuMjM0MTMzXSAgPyByY3VfcmVhZF9sb2NrX3NjaGVkX2hl bGQrMHg2Zi8weDgwCj4gWyAgMTkwLjIzNDE0MF0gID8gcmN1X3N5bmNfbG9ja2RlcF9hc3NlcnQr MHgyOS8weDUwCj4gWyAgMTkwLjIzNDE0N10gID8gX19zYl9zdGFydF93cml0ZSsweDE1Mi8weDFm MAo+IFsgIDE5MC4yMzQxNTJdICA/IF9fc2Jfc3RhcnRfd3JpdGUrMHgxNjgvMHgxZjAKPiBbICAx OTAuMjM0MTU5XSAgdmZzX3dyaXRlKzB4YmQvMHgxYTAKPiBbICAxOTAuMjM0MTY2XSAgU3lTX3dy aXRlKzB4NDAvMHhhMAo+IFsgIDE5MC4yMzQxNzNdICA/IGRvX3N5c2NhbGxfNjQrMHgxOS8weDFi MAo+IFsgIDE5MC4yMzQxODBdICBkb19zeXNjYWxsXzY0KzB4NmIvMHgxYjAKPiBbICAxOTAuMjM0 MTg4XSAgZW50cnlfU1lTQ0FMTF82NF9hZnRlcl9od2ZyYW1lKzB4NDIvMHhiNwo+IFsgIDE5MC4y MzQxOTZdIFJJUDogMDAzMzoweDdmODRjMWIzOTJiNwo+IFsgIDE5MC4yMzQyMDFdIFJTUDogMDAy YjowMDAwN2Y4NGI2NzU1YjAwIEVGTEFHUzogMDAwMDAyOTMgT1JJR19SQVg6IDAwMDAwMDAwMDAw MDAwMDEKPiBbICAxOTAuMjM0MjExXSBSQVg6IGZmZmZmZmZmZmZmZmZmZGEgUkJYOiAwMDAwMDAw MDAwMDAwMDQ2IFJDWDogMDAwMDdmODRjMWIzOTJiNwo+IFsgIDE5MC4yMzQyMThdIFJEWDogMDAw MDAwMDAwMDAwMDAwMiBSU0k6IDAwMDA1NWVjMjBhYmM4ZDYgUkRJOiAwMDAwMDAwMDAwMDAwMDQ2 Cj4gWyAgMTkwLjIzNDIyNV0gUkJQOiAwMDAwNTVlYzIwYWJjOGQ2IFIwODogMDAwMDAwMDAwMDAw MDAwMCBSMDk6IDAwMDAwMDAwMDAwMDAwMDAKPiBbICAxOTAuMjM0MjMxXSBSMTA6IDAwMDAwMDAw MDAwMDAwMDAgUjExOiAwMDAwMDAwMDAwMDAwMjkzIFIxMjogMDAwMDAwMDAwMDAwMDAwMgo+IFsg IDE5MC4yMzQyMzhdIFIxMzogMDAwMDAwMDAwMDAwMDAwMCBSMTQ6IDAwMDA3Zjg0YjAwMDBiMjAg UjE1OiAwMDAwNTVlYzIwY2U0ZWI4Cj4KPiBUZXN0Y2FzZTogaWd0L2dlbV9laW8KPiBTaWduZWQt b2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPiBDYzogVmls bGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBDYzogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgOSArKystLS0tLS0KPiAgMSBm aWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA0MTVmYjhjZjJjZjQuLjljNjE1NjIxNmU1 ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMzY3Nyw3ICsz Njc3LDYgQEAgdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKPiAgCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKPiAgCWludCBy ZXQ7Cj4gIAo+IC0KPiAgCS8qIHJlc2V0IGRvZXNuJ3QgdG91Y2ggdGhlIGRpc3BsYXkgKi8KPiAg CWlmICghaTkxNV9tb2RwYXJhbXMuZm9yY2VfcmVzZXRfbW9kZXNldF90ZXN0ICYmCj4gIAkgICAg IWdwdV9yZXNldF9jbG9iYmVyc19kaXNwbGF5KGRldl9wcml2KSkKPiBAQCAtMzczMSwxOSArMzcz MCwxNyBAQCB2b2lkIGludGVsX2ZpbmlzaF9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gIHsKPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRy bTsKPiAgCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4ID0gJmRldl9wcml2LT5y ZXNldF9jdHg7Cj4gLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBkZXZfcHJpdi0+ bW9kZXNldF9yZXN0b3JlX3N0YXRlOwo+ICsJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl Owo+ICAJaW50IHJldDsKPiAgCj4gIAkvKiByZXNldCBkb2Vzbid0IHRvdWNoIHRoZSBkaXNwbGF5 ICovCj4gLQlpZiAoIWk5MTVfbW9kcGFyYW1zLmZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCAmJgo+ IC0JICAgICFncHVfcmVzZXRfY2xvYmJlcnNfZGlzcGxheShkZXZfcHJpdikpCj4gKwlpZiAoIXRl c3RfYml0KEk5MTVfUkVTRVRfTU9ERVNFVCwgJmRldl9wcml2LT5ncHVfZXJyb3IuZmxhZ3MpKQo+ ICAJCXJldHVybjsKPiAgCj4gKwlzdGF0ZSA9IGZldGNoX2FuZF96ZXJvKCZkZXZfcHJpdi0+bW9k ZXNldF9yZXN0b3JlX3N0YXRlKTsKPiAgCWlmICghc3RhdGUpCj4gIAkJZ290byB1bmxvY2s7Cj4g IAo+IC0JZGV2X3ByaXYtPm1vZGVzZXRfcmVzdG9yZV9zdGF0ZSA9IE5VTEw7Cj4gLQo+ICAJLyog cmVzZXQgZG9lc24ndCB0b3VjaCB0aGUgZGlzcGxheSAqLwo+ICAJaWYgKCFncHVfcmVzZXRfY2xv YmJlcnNfZGlzcGxheShkZXZfcHJpdikpIHsKPiAgCQkvKiBmb3IgdGVzdGluZyBvbmx5IHJlc3Rv cmUgdGhlIGRpc3BsYXkgKi8KClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==