From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 05/20] drm/i915: Separate GPU hang waitqueue from advance Date: Fri, 1 Jul 2016 15:54:47 +0100 Message-ID: <57768437.4090203@linux.intel.com> References: <1467372140-30422-1-git-send-email-chris@chris-wilson.co.uk> <1467372140-30422-6-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" 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 38C516EABE for ; Fri, 1 Jul 2016 14:54:49 +0000 (UTC) In-Reply-To: <1467372140-30422-6-git-send-email-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 Ck9uIDAxLzA3LzE2IDEyOjIyLCBDaHJpcyBXaWxzb24gd3JvdGU6Cj4gQ3VycmVudGx5IF9faTkx NV93YWl0X3JlcXVlc3QgdXNlcyBhIHBlci1lbmdpbmUgd2FpdF9xdWV1ZV90IGZvciB0aGUgZHVh bAo+IHB1cnBvc2Ugb2Ygd2FraW5nIGFmdGVyIHRoZSBHUFUgYWR2YW5jZXMgb3IgZm9yIHdha2lu ZyBhZnRlciBhbiBlcnJvci4KPiBJbiB0aGUgZnV0dXJlLCB3ZSBtYXkgYWRkIGV2ZW4gbW9yZSB3 YWtlIHNvdXJjZXMgYW5kIHJlcXVpcmUgZ3JlYXRlcgo+IHNlcGFyYXRpb24sIGJ1dCBmb3Igbm93 IHdlIGNhbiBjb25jZXB0dWFsbHkgc2ltcGxpZnkgd2FrZXVwcyBieSBzZXBhcmF0aW5nCj4gdGhl IHR3byBzb3VyY2VzLiBJbiBwYXJ0aWN1bGFyLCB0aGlzIGFsbG93cyB1cyB0byB1c2UgZGlmZmVy ZW50IHdhaXQtcXVldWVzCj4gKGUuZy4gb25lIG9uIHRoZSBlbmdpbmUgYWR2YW5jZW1lbnQsIGEg Z2xvYmFsIG9uZSBmb3IgZXJyb3JzIGFuZCBvbmUgb24KPiBlYWNoIHJlcXVlc3RzKSB3aXRob3V0 IGFueSBoYXNzbGUuCj4KPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg fCAgNiArKysrKysKPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAgNSArKysr Kwo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyB8IDE5ICsrKystLS0tLS0tLS0t LS0tLS0KPiAgIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25z KC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCA0OTQ4YzkwYzliZDQuLjBkMGU0 YWM0ZGFkYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0xNDEwLDYgKzE0MTAs MTIgQEAgc3RydWN0IGk5MTVfZ3B1X2Vycm9yIHsKPiAgICNkZWZpbmUgSTkxNV9XRURHRUQJCQko MSA8PCAzMSkKPgo+ICAgCS8qKgo+ICsJICogV2FpdHF1ZXVlIHRvIHNpZ25hbCB3aGVuIGEgaGFu ZyBpcyBkZXRlY3RlZC4gVXNlZCB0byBmb3Igd2FpdGVycwo+ICsJICogdG8gcmVsZWFzZSB0aGUg c3RydWN0X211dGV4IGZvciB0aGUgcmVzZXQgdG8gcHJvY2VkZS4KPiArCSAqLwo+ICsJd2FpdF9x dWV1ZV9oZWFkX3Qgd2FpdF9xdWV1ZTsKPiArCj4gKwkvKioKPiAgIAkgKiBXYWl0cXVldWUgdG8g c2lnbmFsIHdoZW4gdGhlIHJlc2V0IGhhcyBjb21wbGV0ZWQuIFVzZWQgYnkgY2xpZW50cwo+ICAg CSAqIHRoYXQgd2FpdCBmb3IgZGV2X3ByaXYtPm1tLndlZGdlZCB0byBzZXR0bGUuCj4gICAJICov Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggMzRmNzI0Y2M0MGI4Li5iNjA3NDkzYThk M2EgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAtMTQ1NSw2ICsxNDU1LDcgQEAg aW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEs Cj4gICAJY29uc3QgYm9vbCBpcnFfdGVzdF9pbl9wcm9ncmVzcyA9Cj4gICAJCUFDQ0VTU19PTkNF KGRldl9wcml2LT5ncHVfZXJyb3IudGVzdF9pcnFfcmluZ3MpICYgaW50ZWxfZW5naW5lX2ZsYWco ZW5naW5lKTsKPiAgIAlpbnQgc3RhdGUgPSBpbnRlcnJ1cHRpYmxlID8gVEFTS19JTlRFUlJVUFRJ QkxFIDogVEFTS19VTklOVEVSUlVQVElCTEU7Cj4gKwlERUZJTkVfV0FJVChyZXNldCk7Cj4gICAJ REVGSU5FX1dBSVQod2FpdCk7Cj4gICAJdW5zaWduZWQgbG9uZyB0aW1lb3V0X2V4cGlyZTsKPiAg IAlzNjQgYmVmb3JlID0gMDsgLyogT25seSB0byBzaWxlbmNlIGEgY29tcGlsZXIgd2FybmluZy4g Ki8KPiBAQCAtMTQ5OSw2ICsxNTAwLDcgQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4gICAJCWdvdG8gb3V0Owo+ICAgCX0KPgo+ICsJ YWRkX3dhaXRfcXVldWUoJmRldl9wcml2LT5ncHVfZXJyb3Iud2FpdF9xdWV1ZSwgJnJlc2V0KTsK PiAgIAlmb3IgKDs7KSB7Cj4gICAJCXN0cnVjdCB0aW1lcl9saXN0IHRpbWVyOwo+Cj4gQEAgLTE1 NTEsNiArMTU1Myw4IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxLAo+ICAgCQkJZGVzdHJveV90aW1lcl9vbl9zdGFjaygmdGltZXIpOwo+ ICAgCQl9Cj4gICAJfQo+ICsJcmVtb3ZlX3dhaXRfcXVldWUoJmRldl9wcml2LT5ncHVfZXJyb3Iu d2FpdF9xdWV1ZSwgJnJlc2V0KTsKPiArCj4gICAJaWYgKCFpcnFfdGVzdF9pbl9wcm9ncmVzcykK PiAgIAkJZW5naW5lLT5pcnFfcHV0KGVuZ2luZSk7Cj4KPiBAQCAtNTI4MSw2ICs1Mjg1LDcgQEAg aTkxNV9nZW1fbG9hZF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gICAJCQkgIGk5MTVf Z2VtX3JldGlyZV93b3JrX2hhbmRsZXIpOwo+ICAgCUlOSVRfREVMQVlFRF9XT1JLKCZkZXZfcHJp di0+bW0uaWRsZV93b3JrLAo+ICAgCQkJICBpOTE1X2dlbV9pZGxlX3dvcmtfaGFuZGxlcik7Cj4g Kwlpbml0X3dhaXRxdWV1ZV9oZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndhaXRfcXVldWUpOwo+ ICAgCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfcXVldWUp Owo+Cj4gICAJZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlID0gSTkxNV9FWEVDX0NP TlNUQU5UU19SRUxfR0VORVJBTDsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiBpbmRleCA4M2Y0 MGJhZWIxZjMuLjZjMTc1OTZkNzVkZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IEBA IC0yNDg4LDExICsyNDg4LDggQEAgc3RhdGljIGlycXJldHVybl90IGdlbjhfaXJxX2hhbmRsZXIo aW50IGlycSwgdm9pZCAqYXJnKQo+ICAgCXJldHVybiByZXQ7Cj4gICB9Cj4KPiAtc3RhdGljIHZv aWQgaTkxNV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK PiAtCQkJICAgICAgIGJvb2wgcmVzZXRfY29tcGxldGVkKQo+ICtzdGF0aWMgdm9pZCBpOTE1X2Vy cm9yX3dha2VfdXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICAgewo+IC0J c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwo+IC0KPiAgIAkvKgo+ICAgCSAqIE5vdGlm eSBhbGwgd2FpdGVycyBmb3IgR1BVIGNvbXBsZXRpb24gZXZlbnRzIHRoYXQgcmVzZXQgc3RhdGUg aGFzCj4gICAJICogYmVlbiBjaGFuZ2VkLCBhbmQgdGhhdCB0aGV5IG5lZWQgdG8gcmVzdGFydCB0 aGVpciB3YWl0IGFmdGVyCj4gQEAgLTI1MDEsMTggKzI0OTgsMTAgQEAgc3RhdGljIHZvaWQgaTkx NV9lcnJvcl93YWtlX3VwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgIAkg Ki8KPgo+ICAgCS8qIFdha2UgdXAgX193YWl0X3NlcW5vLCBwb3RlbnRpYWxseSBob2xkaW5nIGRl di0+c3RydWN0X211dGV4LiAqLwo+IC0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYp Cj4gLQkJd2FrZV91cF9hbGwoJmVuZ2luZS0+aXJxX3F1ZXVlKTsKPiArCXdha2VfdXBfYWxsKCZk ZXZfcHJpdi0+Z3B1X2Vycm9yLndhaXRfcXVldWUpOwo+Cj4gICAJLyogV2FrZSB1cCBpbnRlbF9j cnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMsIGhvbGRpbmcgY3J0Yy0+bXV0ZXguICovCj4gICAJ d2FrZV91cF9hbGwoJmRldl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUpOwo+IC0KPiAtCS8qCj4g LQkgKiBTaWduYWwgdGFza3MgYmxvY2tlZCBpbiBpOTE1X2dlbV93YWl0X2Zvcl9lcnJvciB0aGF0 IHRoZSBwZW5kaW5nCj4gLQkgKiByZXNldCBzdGF0ZSBpcyBjbGVhcmVkLgo+IC0JICovCj4gLQlp ZiAocmVzZXRfY29tcGxldGVkKQo+IC0JCXdha2VfdXBfYWxsKCZkZXZfcHJpdi0+Z3B1X2Vycm9y LnJlc2V0X3F1ZXVlKTsKPiAgIH0KPgo+ICAgLyoqCj4gQEAgLTI1NzcsNyArMjU2Niw3IEBAIHN0 YXRpYyB2b2lkIGk5MTVfcmVzZXRfYW5kX3dha2V1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gICAJCSAqIE5vdGU6IFRoZSB3YWtlX3VwIGFsc28gc2VydmVzIGFzIGEgbWVt b3J5IGJhcnJpZXIgc28gdGhhdAo+ICAgCQkgKiB3YWl0ZXJzIHNlZSB0aGUgdXBkYXRlIHZhbHVl IG9mIHRoZSByZXNldCBjb3VudGVyIGF0b21pY190Lgo+ICAgCQkgKi8KPiAtCQlpOTE1X2Vycm9y X3dha2VfdXAoZGV2X3ByaXYsIHRydWUpOwo+ICsJCXdha2VfdXBfYWxsKCZkZXZfcHJpdi0+Z3B1 X2Vycm9yLnJlc2V0X3F1ZXVlKTsKPiAgIAl9Cj4gICB9Cj4KPiBAQCAtMjcxNCw3ICsyNzAzLDcg QEAgdm9pZCBpOTE1X2hhbmRsZV9lcnJvcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCj4gICAJCSAqIGVuc3VyZSB0aGF0IHRoZSB3YWl0ZXJzIHNlZSB0aGUgdXBkYXRlZCB2YWx1 ZSBvZiB0aGUgcmVzZXQKPiAgIAkJICogY291bnRlciBhdG9taWNfdC4KPiAgIAkJICovCj4gLQkJ aTkxNV9lcnJvcl93YWtlX3VwKGRldl9wcml2LCBmYWxzZSk7Cj4gKwkJaTkxNV9lcnJvcl93YWtl X3VwKGRldl9wcml2KTsKPiAgIAl9Cj4KPiAgIAlpOTE1X3Jlc2V0X2FuZF93YWtldXAoZGV2X3By aXYpOwo+CgpMb29rcyBvayB0byBtZS4KClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZy dGtvLnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK