From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH v2 11/22] drm/i915: Perform a direct reset of the GPU from the waiter Date: Thu, 08 Sep 2016 12:35:24 +0300 Message-ID: <8737la91k3.fsf@gaia.fi.intel.com> References: <20160905130438.31046-1-chris@chris-wilson.co.uk> <20160907144516.29495-1-chris@chris-wilson.co.uk> <20160907144516.29495-11-chris@chris-wilson.co.uk> 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 08D456EDD0 for ; Thu, 8 Sep 2016 09:36:24 +0000 (UTC) In-Reply-To: <20160907144516.29495-11-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+IHdyaXRlczoKCj4gSWYgYSB3 YWl0ZXIgaXMgaG9sZGluZyB0aGUgc3RydWN0X211dGV4LCB0aGVuIHRoZSByZXNldCB3b3JrZXIg Y2Fubm90Cj4gcmVzZXQgdGhlIEdQVSB1bnRpbCB0aGUgd2FpdGVyIHJldHVybnMuIFdlIGRvIG5v dCB3YW50IHRvIHJldHVybiAtRUFHQUlOCj4gZm9ybSBpOTE1X3dhaXRfcmVxdWVzdCBhcyB0aGF0 IGJyZWFrcyBkZWxpY2F0ZSBvcGVyYXRpb25zIGxpa2UKPiBpOTE1X3ZtYV91bmJpbmQoKSB3aGlj aCBvZnRlbiBjYW5ub3QgYmUgcmVzdGFydGVkIGVhc2lseSwgYW5kIHJldHVybmluZwo+IC1FSU8g aXMganVzdCBhcyB1c2VsZXNzIChhbmQgaGFzIGluIHRoZSBwYXN0IHByb3ZlbiBkYW5nZXJvdXMp LiBUaGUKPiByZW1haW5pbmcgV0FSTl9PTihpOTE1X3dhaXRfcmVxdWVzdCkgc2VydmUgYXMgYSB2 YWx1YWJsZSByZW1pbmRlciB0aGF0Cj4gaGFuZGxpbmcgZXJyb3JzIGZyb20gYW4gaW5kZWZpbml0 ZSB3YWl0IGFyZSB0cmlja3kuCj4KPiBXZSBjYW4ga2VlcCB0aGUgY3VycmVudCBzZW1hbnRpYyB0 aGF0IGtub3dpbmcgYWZ0ZXIgYSByZXNldCBpcyBjb21wbGV0ZSwKPiBzbyBpcyB0aGUgcmVxdWVz dCwgYnkgcGVyZm9ybWluZyB0aGUgcmVzZXQgb3Vyc2VsdmVzIGlmIHdlIGhvbGQgdGhlCj4gbXV0 ZXguCj4KPiB1ZXZlbnQgZW1pc3Npb24gaXMgc3RpbGwgaGFuZGxlZCBieSB0aGUgcmVzZXQgd29y a2VyLCBzbyBpdCBtYXkgYXBwZWFyCj4gc2xpZ2h0bHkgb3V0IG9mIG9yZGVyIHdpdGggcmVzcGVj dCB0byB0aGUgYWN0dWFsIHJlc2V0IChhbmQgY29uY3VycmVudAo+IHVzZSBvZiB0aGUgZGV2aWNl KS4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAx MSArKysrKystLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAg fCAxNSArKystLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVx dWVzdC5jIHwgMjkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAgIHwgIDIgKysKPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgIDMgLS0tCj4gIDUgZmlsZXMgY2hhbmdlZCwgNDAgaW5z ZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBp bmRleCA0N2E2NzZkODU5ZGIuLmZmNDE3M2U2ZTI5OCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYwo+IEBAIC0xNzI5LDYgKzE3MjksOCBAQCBpbnQgaTkxNV9yZXN1bWVfc3dpdGNoZXJvbyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAgKiBSZXNldCB0aGUgY2hpcC4gIFVzZWZ1bCBpZiBh IGhhbmcgaXMgZGV0ZWN0ZWQuIFJldHVybnMgemVybyBvbiBzdWNjZXNzZnVsCj4gICAqIHJlc2V0 IG9yIG90aGVyd2lzZSBhbiBlcnJvciBjb2RlLgo+ICAgKgo+ICsgKiBDYWxsZXIgbXVzdCBob2xk IHRoZSBzdHJ1Y3RfbXV0ZXguCj4gKyAqCj4gICAqIFByb2NlZHVyZSBpcyBmYWlybHkgc2ltcGxl Ogo+ICAgKiAgIC0gcmVzZXQgdGhlIGNoaXAgdXNpbmcgdGhlIHJlc2V0IHJlZwo+ICAgKiAgIC0g cmUtaW5pdCBjb250ZXh0IHN0YXRlCj4gQEAgLTE3NDMsNyArMTc0NSwxMCBAQCBpbnQgaTkxNV9y ZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gIAlzdHJ1Y3QgaTkxNV9n cHVfZXJyb3IgKmVycm9yID0gJmRldl9wcml2LT5ncHVfZXJyb3I7Cj4gIAlpbnQgcmV0Owo+ICAK PiAtCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKPiArCWxvY2tkZXBfYXNzZXJ0X2hl bGQoJmRldi0+c3RydWN0X211dGV4KTsKPiArCj4gKwlpZiAoIXRlc3RfYW5kX2NsZWFyX2JpdChJ OTE1X1JFU0VUX0lOX1BST0dSRVNTLCAmZXJyb3ItPmZsYWdzKSkKPiArCQlyZXR1cm4gdGVzdF9i aXQoSTkxNV9XRURHRUQsICZlcnJvci0+ZmxhZ3MpID8gLUVJTyA6IDA7Cj4gIAo+ICAJLyogQ2xl YXIgYW55IHByZXZpb3VzIGZhaWxlZCBhdHRlbXB0cyBhdCByZWNvdmVyeS4gVGltZSB0byB0cnkg YWdhaW4uICovCj4gIAlfX2NsZWFyX2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5mbGFncyk7Cj4g QEAgLTE3ODQsOSArMTc4OSw2IEBAIGludCBpOTE1X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKPiAgCQlnb3RvIGVycm9yOwo+ICAJfQo+ICAKPiAtCWNsZWFyX2JpdChJ OTE1X1JFU0VUX0lOX1BST0dSRVNTLCAmZXJyb3ItPmZsYWdzKTsKPiAtCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IC0KPiAgCS8qCj4gIAkgKiBycHMvcmM2IHJlLWluaXQgaXMg bmVjZXNzYXJ5IHRvIHJlc3RvcmUgc3RhdGUgbG9zdCBhZnRlciB0aGUKPiAgCSAqIHJlc2V0IGFu ZCB0aGUgcmUtaW5zdGFsbCBvZiBndCBpcnFzLiBTa2lwIGZvciBpcm9ubGFrZSBwZXIKPiBAQCAt MTgwMCw3ICsxODAyLDYgQEAgaW50IGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQo+ICAKPiAgZXJyb3I6Cj4gIAlzZXRfYml0KEk5MTVfV0VER0VELCAmZXJyb3It PmZsYWdzKTsKPiAtCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ICAJcmV0dXJu IHJldDsKPiAgfQo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCBkZDczYzAwY2Q3 NzQuLjJlMmZkOGE3NzIzMyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0zODYy LDcgKzM4NjIsOSBAQCB3YWl0X3JlbWFpbmluZ19tc19mcm9tX2ppZmZpZXModW5zaWduZWQgbG9u ZyB0aW1lc3RhbXBfamlmZmllcywgaW50IHRvX3dhaXRfbXMpCj4gIAkJCSAgICBzY2hlZHVsZV90 aW1lb3V0X3VuaW50ZXJydXB0aWJsZShyZW1haW5pbmdfamlmZmllcyk7Cj4gIAl9Cj4gIH0KPiAt c3RhdGljIGlubGluZSBib29sIF9faTkxNV9yZXF1ZXN0X2lycV9jb21wbGV0ZShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKPiArCj4gK3N0YXRpYyBpbmxpbmUgYm9vbAo+ICtfX2k5 MTVfcmVxdWVzdF9pcnFfY29tcGxldGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp Cj4gIHsKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5naW5lOwo+ ICAKPiBAQCAtMzkyNCwxNyArMzkyNiw2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBfX2k5MTVfcmVx dWVzdF9pcnFfY29tcGxldGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCj4gIAkJ CXJldHVybiB0cnVlOwo+ICAJfQo+ICAKPiAtCS8qIFdlIG5lZWQgdG8gY2hlY2sgd2hldGhlciBh bnkgZ3B1IHJlc2V0IGhhcHBlbmVkIGluIGJldHdlZW4KPiAtCSAqIHRoZSByZXF1ZXN0IGJlaW5n IHN1Ym1pdHRlZCBhbmQgbm93LiBJZiBhIHJlc2V0IGhhcyBvY2N1cnJlZCwKPiAtCSAqIHRoZSBz ZXFubyB3aWxsIGhhdmUgYmVlbiBhZHZhbmNlIHBhc3Qgb3VycyBhbmQgb3VyIHJlcXVlc3QKPiAt CSAqIGlzIGNvbXBsZXRlLiBJZiB3ZSBhcmUgaW4gdGhlIHByb2Nlc3Mgb2YgaGFuZGxpbmcgYSBy ZXNldCwKPiAtCSAqIHRoZSByZXF1ZXN0IGlzIGVmZmVjdGl2ZWx5IGNvbXBsZXRlIGFzIHRoZSBy ZW5kZXJpbmcgd2lsbAo+IC0JICogYmUgZGlzY2FyZGVkLCBidXQgd2UgbmVlZCB0byByZXR1cm4g aW4gb3JkZXIgdG8gZHJvcCB0aGUKPiAtCSAqIHN0cnVjdF9tdXRleC4KPiAtCSAqLwo+IC0JaWYg KGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJnJlcS0+aTkxNS0+Z3B1X2Vycm9yKSkKPiAtCQlyZXR1 cm4gdHJ1ZTsKPiAtCj4gIAlyZXR1cm4gZmFsc2U7Cj4gIH0KPiAgCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwo+IGluZGV4IDVmODk4MDFlNmExNi4uNjRjMzcwNjgxYTgx IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwo+IEBAIC01MzMs NiArNTMzLDE2IEBAIHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCwgYm9vbCBmbHVzaF9jYWNoZXMpCj4gIAllbmdpbmUtPnN1Ym1pdF9y ZXF1ZXN0KHJlcXVlc3QpOwo+ICB9Cj4gIAo+ICtzdGF0aWMgdm9pZCByZXNldF93YWl0X3F1ZXVl KHdhaXRfcXVldWVfaGVhZF90ICpxLCB3YWl0X3F1ZXVlX3QgKndhaXQpCj4gK3sKPiArCXVuc2ln bmVkIGxvbmcgZmxhZ3M7Cj4gKwo+ICsJc3Bpbl9sb2NrX2lycXNhdmUoJnEtPmxvY2ssIGZsYWdz KTsKPiArCWlmIChsaXN0X2VtcHR5KCZ3YWl0LT50YXNrX2xpc3QpKQo+ICsJCV9fYWRkX3dhaXRf cXVldWUocSwgd2FpdCk7Cj4gKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZxLT5sb2NrLCBmbGFn cyk7Cj4gK30KPiArCj4gIHN0YXRpYyB1bnNpZ25lZCBsb25nIGxvY2FsX2Nsb2NrX3VzKHVuc2ln bmVkIGludCAqY3B1KQo+ICB7Cj4gIAl1bnNpZ25lZCBsb25nIHQ7Cj4gQEAgLTcxMCw2ICs3MjAs MjUgQEAgd2FrZXVwOgo+ICAJCWlmIChfX2k5MTVfcmVxdWVzdF9pcnFfY29tcGxldGUocmVxKSkK PiAgCQkJYnJlYWs7Cj4gIAo+ICsJCS8qIElmIHRoZSBHUFUgaXMgaHVuZywgYW5kIHdlIGhvbGQg dGhlIGxvY2ssIHJlc2V0IHRoZSBHUFUKPiArCQkgKiBhbmQgdGhlbiBjaGVjayBmb3IgY29tcGxl dGlvbi4gT24gYSBmdWxsIHJlc2V0LCB0aGUgZW5naW5lJ3MKPiArCQkgKiBIVyBzZXFubyB3aWxs IGJlIGFkdmFuY2VkIHBhc3NlZCB1cyBhbmQgd2UgYXJlIGNvbXBsZXRlLgo+ICsJCSAqIElmIHdl IGRvIGEgcGFydGlhbCByZXNldCwgd2UgaGF2ZSB0byB3YWl0IGZvciB0aGUgR1BVIHRvCj4gKwkJ ICogcmVzdW1lIGFuZCB1cGRhdGUgdGhlIGJyZWFkY3J1bWIuCj4gKwkJICoKPiArCQkgKiBJZiB3 ZSBkb24ndCBob2xkIHRoZSBtdXRleCwgd2UgY2FuIGp1c3Qgd2FpdCBmb3IgdGhlIHdvcmtlcgo+ ICsJCSAqIHRvIGNvbWUgYWxvbmcgYW5kIHVwZGF0ZSB0aGUgYnJlYWRjcnVtYiAoZWl0aGVyIGRp cmVjdGx5Cj4gKwkJICogaXRzZWxmLCBvciBpbmRpcmVjdGx5IGJ5IHJlY292ZXJpbmcgdGhlIEdQ VSkuCj4gKwkJICovCj4gKwkJaWYgKGZsYWdzICYgSTkxNV9XQUlUX0xPQ0tFRCAmJgo+ICsJCSAg ICBpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZyZXEtPmk5MTUtPmdwdV9lcnJvcikpIHsKPiArCQkJ X19zZXRfY3VycmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOwo+ICsJCQlpOTE1X3Jlc2V0KHJlcS0+ aTkxNSk7CgoKPiArCQkJcmVzZXRfd2FpdF9xdWV1ZSgmcmVxLT5pOTE1LT5ncHVfZXJyb3Iud2Fp dF9xdWV1ZSwKPiArCQkJCQkgJnJlc2V0KTsKCkNvbW1lbnQgaGVyZSBtaWdodCBiZSB3YXJyYW50 ZWQgdGhhdCB3ZSBhcmUgaGVyZSBkdWUgdG8gcmVzZXQgd2FrZXVwLAp3aGljaCBkaWQgY2xlYXIg dGhlIHdhaXQgcXVldWUuIE9yIHBlcmhhcCByZW5hbWUgdG8KcmVhZGRfdG9fcmVzZXRfd2FpdF9x dWV1ZS4KClJldmlld2VkLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNv bT4KCj4gKwkJCWNvbnRpbnVlOwo+ICsJCX0KPiArCj4gIAkJLyogT25seSBzcGluIGlmIHdlIGtu b3cgdGhlIEdQVSBpcyBwcm9jZXNzaW5nIHRoaXMgcmVxdWVzdCAqLwo+ICAJCWlmIChpOTE1X3Nw aW5fcmVxdWVzdChyZXEsIHN0YXRlLCAyKSkKPiAgCQkJYnJlYWs7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCj4gaW5kZXggZWQxNzJkN2JlZWNiLi4yYzdjYjUwNDE1MTEgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKPiBAQCAtMjUyMSw3ICsyNTIxLDkgQEAgc3RhdGljIHZvaWQgaTkxNV9y ZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCSAq IHBlbmRpbmcgc3RhdGUgYW5kIG5vdCBwcm9wZXJseSBkcm9wIGxvY2tzLCByZXN1bHRpbmcgaW4K PiAgCSAqIGRlYWRsb2NrcyB3aXRoIHRoZSByZXNldCB3b3JrLgo+ICAJICovCj4gKwltdXRleF9s b2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7Cj4gIAlyZXQgPSBpOTE1X3Jlc2V0KGRl dl9wcml2KTsKPiArCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwo+ ICAKPiAgCWludGVsX2ZpbmlzaF9yZXNldChkZXZfcHJpdik7Cj4gIAo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKPiBpbmRleCBlYWUyNjFlNjJiOGIuLmUwNGI1OGE4YWEw YSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKPiBAQCAtMjIy OSw5ICsyMjI5LDYgQEAgc3RhdGljIGludCB3YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwgaW50IGJ5dGVzKQo+ICAJaWYgKHJldCkKPiAgCQlyZXR1cm4gcmV0 Owo+ICAKPiAtCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZ0YXJnZXQtPmk5MTUtPmdwdV9l cnJvcikpCj4gLQkJcmV0dXJuIC1FQUdBSU47Cj4gLQo+ICAJaTkxNV9nZW1fcmVxdWVzdF9yZXRp cmVfdXB0byh0YXJnZXQpOwo+ICAKPiAgCWludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmcpOwo+ IC0tIAo+IDIuOS4zCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=